annot_formula:
| CNF LPAREN
- name COMMA formula_type COMMA formula formula_source formula_infos
+ name COMMA formula_type COMMA formula formula_source_and_infos
RPAREN DOT {
- AnnotatedFormula ($3,$5,$7,$8,$9)
+ AnnotatedFormula ($3,$5,$7,fst $8,snd $8)
}
;
| QSTRING { rm_q $1 }
;
- formula_source:
- | { NoSource }
+ formula_source_and_infos:
+ | { NoSource, [NoInfo] }
| COMMA { assert false }
;
- formula_infos:
- | { [NoInfo] }
- | COMMA { assert false }
- ;
-
include_:
| INCLUSION LPAREN QSTRING selection_of_formulae RPAREN DOT {
let fname = rm_q $3 in