X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Facic_procedural%2FproceduralTypes.mli;h=c493873ff2b0fd736c56d5fc26082f9acb811b48;hb=54522577365be23b788d66c851ae5c78aebe5ffb;hp=97ca7fdbb98bd21518673169db3d2d97fcd4f2f0;hpb=8ae990161006978a019f0afda4ff8d56a78d1fd0;p=helm.git

diff --git a/helm/software/components/acic_procedural/proceduralTypes.mli b/helm/software/components/acic_procedural/proceduralTypes.mli
index 97ca7fdbb..c493873ff 100644
--- a/helm/software/components/acic_procedural/proceduralTypes.mli
+++ b/helm/software/components/acic_procedural/proceduralTypes.mli
@@ -25,23 +25,22 @@
 
 (* 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 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    = (name * name) option
+type where    = (hyp * name) option
 type inferred = Cic.annterm
 type pattern  = Cic.annterm
 
@@ -50,19 +49,23 @@ type step = Note of note
           | Qed of note
 	  | Id of note
 	  | Intros of count option * name list * note
-          | Cut of name * what * note
-          | LetIn of name * what * 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
-	  | Change of inferred * what * where * pattern * note
-	  | ClearBody of name * 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, inferred, [> `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, inferred, '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