(* functions to be moved ****************************************************)
-val list_map2_filter: ('a -> 'b -> 'c option) -> 'a list -> 'b list -> 'c list
+val list_rev_map2: ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
-val list_split: int -> 'a list -> 'a list * 'a list
+val list_map2_filter: ('a -> 'b -> 'c option) -> 'a list -> 'b list -> 'c list
val mk_arel: int -> string -> Cic.annterm
-val is_atomic:Cic.annterm -> bool
-
(****************************************************************************)
-type name = string
-type what = Cic.annterm
-type how = bool
-type using = Cic.annterm
-type count = int
-type note = string
-type where = (name * name) option
+type name = string option
+type hyp = string
+type what = Cic.annterm
+type how = bool
+type using = Cic.annterm
+type count = int
+type note = string
+type where = (hyp * name) option
+type inferred = Cic.annterm
+type pattern = Cic.annterm
type step = Note of note
| Theorem of name * what * note
| Qed of note
| Id of note
| Intros of count option * name list * note
- | Cut of name * what * note
- | LetIn of name * what * note
- | Rewrite of how * what * where * note
- | Elim of what * using option * note
+ | Cut of name * what * note
+ | LetIn of name * what * note
+ | Rewrite of how * what * where * pattern * note
+ | Elim of what * using option * pattern * note
| Apply of what * note
- | Whd of count * note
+ | Change of inferred * what * where * pattern * note
+ | Clear of hyp list * note
+ | ClearBody of hyp * note
| Branch of step list list * note
val render_steps:
- (what, 'a, [> `Whd] as 'b, what CicNotationPt.obj, name) GrafiteAst.statement list ->
+ (what, inferred, [> `Whd] as 'b, what CicNotationPt.obj, hyp) GrafiteAst.statement list ->
step list ->
- (what, 'a, 'b, what CicNotationPt.obj, name) GrafiteAst.statement list
+ (what, inferred, 'b, what CicNotationPt.obj, hyp) GrafiteAst.statement list
val count_steps:
int -> step list -> int
+
+val count_nodes:
+ int -> step list -> int