X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_unification%2FcicMetaSubst.mli;h=4f055f1f876631fbd8f282b849b0ab9f2acbea87;hb=fb0f22004d533abca8d157ed89665dbf1041e0e2;hp=60228fe08cd5f1c9f3aafdedc13c51c7ec734a67;hpb=136fb0fde826e200ee8a0e902dbb6278b2afdeb8;p=helm.git

diff --git a/helm/ocaml/cic_unification/cicMetaSubst.mli b/helm/ocaml/cic_unification/cicMetaSubst.mli
index 60228fe08..4f055f1f8 100644
--- a/helm/ocaml/cic_unification/cicMetaSubst.mli
+++ b/helm/ocaml/cic_unification/cicMetaSubst.mli
@@ -23,39 +23,44 @@
  * http://helm.cs.unibo.it/
  *)
 
-exception AssertFailure of string
 exception MetaSubstFailure of string
+exception Uncertain of string
+exception AssertFailure of string
 
 (* The entry (i,t) in a substitution means that *)
 (* (META i) have been instantiated with t.      *)
 type substitution = (int * Cic.term) list
 
-val delift : 
-  int -> substitution -> Cic.context -> Cic.metasenv ->
-  (Cic.term option) list -> Cic.term ->
-    Cic.term * Cic.metasenv * substitution
-
 (* apply_subst subst t                     *)
 (* applies the substitution [subst] to [t] *)
 (* [subst] must be already unwinded        *)
 val apply_subst : substitution -> Cic.term -> Cic.term
 
-(* apply_subst_reducing subst (Some (mtr,reductions_no)) t              *)
-(* performs as (apply_subst subst t) until it finds an application of   *)
-(* (META [mtr]) that, once unwinding is performed, creates a new        *)
-(* beta-redex; in this case up to [reductions_no] consecutive           *)
-(* beta-reductions are performed.                                       *)
-(* Hint: this function is usually called when [reductions_no]           *)
-(*  eta-expansions have been performed and the head of the new          *)
-(*  application has been unified with (META [meta_to_reduce]):          *)
-(*  during the unwinding the eta-expansions are undone.                 *)
-(* [subst] must be already unwinded                                     *)
-val apply_subst_reducing :
- (int * int) option -> substitution -> Cic.term -> Cic.term
-
 val apply_subst_context : substitution -> Cic.context -> Cic.context
 val apply_subst_metasenv: substitution -> Cic.metasenv -> Cic.metasenv
 
+(* {2 Kernel wrappers}
+ * From now on we recreate a kernel abstraction where substitutions are part of
+ * the calculus *)
+
+val lift : substitution -> int -> Cic.term -> Cic.term
+val subst: substitution -> Cic.term -> Cic.term -> Cic.term
+val whd: substitution -> Cic.context -> Cic.term -> Cic.term
+val are_convertible: substitution -> Cic.context -> Cic.term -> Cic.term -> bool
+
+val type_of_aux':
+  Cic.metasenv -> substitution -> Cic.context -> Cic.term -> Cic.term
+
+val tempi_type_of_aux : float ref
+val tempi_type_of_aux_subst : float ref
+
+(*** delifting ***)
+
+val delift : 
+  int -> substitution -> Cic.context -> Cic.metasenv ->
+  (Cic.term option) list -> Cic.term ->
+    Cic.term * Cic.metasenv * substitution
+
 (** {2 Pretty printers} *)
 
 val ppsubst: substitution -> string
@@ -75,15 +80,3 @@ val fppsubst: Format.formatter -> substitution -> unit
 val fppterm: Format.formatter -> Cic.term -> unit
 val fppmetasenv: Format.formatter -> Cic.metasenv -> unit
 
-(* {2 Kernel wrappers}
- * From now on we recreate a kernel abstraction where substitutions are part of
- * the calculus *)
-
-val lift : substitution -> int -> Cic.term -> Cic.term
-val subst: substitution -> Cic.term -> Cic.term -> Cic.term
-val whd: substitution -> Cic.context -> Cic.term -> Cic.term
-val are_convertible: substitution -> Cic.context -> Cic.term -> Cic.term -> bool
-
-val type_of_aux':
-  Cic.metasenv -> substitution -> Cic.context -> Cic.term -> Cic.term
-