(****************************************************************************)
+type flavour = Cic.object_flavour
type name = string option
type hyp = string
type what = Cic.annterm
type where = (hyp * name) option
type inferred = Cic.annterm
type pattern = Cic.annterm
+type body = Cic.annterm option
type step = Note of note
- | Theorem of name * what * note
+ | Statement of flavour * name * what * body * note
| Qed of note
| Id of note
| Intros of count option * name list * note
let mk_thnote str a =
if str = "" then a else mk_note "" :: mk_note str :: a
-let mk_theorem name t =
+let mk_statement flavour name t v =
let name = match name with Some name -> name | None -> assert false in
- let obj = N.Theorem (`Theorem, name, t, None) in
+ let obj = N.Theorem (flavour, name, t, v) in
G.Executable (floc, G.Command (floc, G.Obj (floc, obj)))
let mk_qed =
let mk_rewrite direction what where pattern punctation =
let direction = if direction then `RightToLeft else `LeftToRight in
let pattern, rename = match where with
- | None -> (None, [], Some pattern), []
- | Some (premise, name) -> (None, [premise, pattern], None), [name]
+ | None -> (None, [], Some pattern), []
+ | Some (premise, Some name) -> (None, [premise, pattern], None), [Some name]
+ | Some (premise, None) -> (None, [premise, pattern], None), []
in
let tactic = G.Rewrite (floc, direction, what, pattern, rename) in
mk_tactic tactic punctation
mk_tactic tactic punctation
let mk_apply t punctation =
- let tactic = G.Apply (floc, t) in
+ let tactic = G.ApplyP (floc, t) in
mk_tactic tactic punctation
let mk_change t where pattern punctation =
(* rendering ****************************************************************)
let rec render_step sep a = function
- | Note s -> mk_notenote s a
- | Theorem (n, t, s) -> mk_theorem n t :: mk_thnote s a
- | Qed s -> mk_qed :: mk_tacnote s a
- | Id s -> mk_id sep :: mk_tacnote s a
- | Intros (c, ns, s) -> mk_intros c ns sep :: mk_tacnote s a
- | Cut (n, t, s) -> mk_cut n t sep :: mk_tacnote s a
- | LetIn (n, t, s) -> mk_letin n t sep :: mk_tacnote s a
- | Rewrite (b, t, w, e, s) -> mk_rewrite b t w e sep :: mk_tacnote s a
- | Elim (t, xu, e, s) -> mk_elim t xu e sep :: mk_tacnote s a
- | Apply (t, s) -> mk_apply t sep :: mk_tacnote s a
- | Change (t, _, w, e, s) -> mk_change t w e sep :: mk_tacnote s a
- | Clear (ns, s) -> mk_clear ns sep :: mk_tacnote s a
- | ClearBody (n, s) -> mk_clearbody n sep :: mk_tacnote s a
- | Branch ([], s) -> a
- | Branch ([ps], s) -> render_steps sep a ps
- | Branch (ps :: pss, s) ->
+ | Note s -> mk_notenote s a
+ | Statement (f, n, t, v, s) -> mk_statement f n t v :: mk_thnote s a
+ | Qed s -> mk_qed :: mk_tacnote s a
+ | Id s -> mk_id sep :: mk_tacnote s a
+ | Intros (c, ns, s) -> mk_intros c ns sep :: mk_tacnote s a
+ | Cut (n, t, s) -> mk_cut n t sep :: mk_tacnote s a
+ | LetIn (n, t, s) -> mk_letin n t sep :: mk_tacnote s a
+ | Rewrite (b, t, w, e, s) -> mk_rewrite b t w e sep :: mk_tacnote s a
+ | Elim (t, xu, e, s) -> mk_elim t xu e sep :: mk_tacnote s a
+ | Apply (t, s) -> mk_apply t sep :: mk_tacnote s a
+ | Change (t, _, w, e, s) -> mk_change t w e sep :: mk_tacnote s a
+ | Clear (ns, s) -> mk_clear ns sep :: mk_tacnote s a
+ | ClearBody (n, s) -> mk_clearbody n sep :: mk_tacnote s a
+ | Branch ([], s) -> a
+ | Branch ([ps], s) -> render_steps sep a ps
+ | Branch (ps :: pss, s) ->
let a = mk_ob :: mk_tacnote s a in
let a = List.fold_left (render_steps mk_vb) a (List.rev pss) in
mk_punctation sep :: render_steps mk_cb a ps
let rec count_step a = function
| Note _
- | Theorem _
+ | Statement _
| Qed _ -> a
| Branch (pps, _) -> List.fold_left count_steps a pps
| _ -> succ a
let rec count_node a = function
| Note _
- | Theorem _
+ | Statement _
| Qed _
| Id _
| Intros _