X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_unification%2FcicMetaSubst.mli;h=b1e34757ec6e0564b32f8d050215808f1dd65fe8;hb=5325734bc2e4927ed7ec146e35a6f0f2b49f50c1;hp=a81f50c1dd2c1527e662b0b49ff7e4ba9b416437;hpb=cf7fbeee5c21b86f70281f42cd09ee699e0c62b7;p=helm.git

diff --git a/helm/ocaml/cic_unification/cicMetaSubst.mli b/helm/ocaml/cic_unification/cicMetaSubst.mli
index a81f50c1d..b1e34757e 100644
--- a/helm/ocaml/cic_unification/cicMetaSubst.mli
+++ b/helm/ocaml/cic_unification/cicMetaSubst.mli
@@ -23,22 +23,14 @@
  * 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
-
-(* unwind_subst metasenv subst                         *)
-(* unwinds [subst] w.r.t. itself.                      *)
-(* It can restrict some metavariable in the [metasenv] *)
-val unwind_subst : Cic.metasenv -> substitution -> substitution * Cic.metasenv
-
 (* apply_subst subst t                     *)
 (* applies the substitution [subst] to [t] *)
 (* [subst] must be already unwinded        *)
@@ -55,29 +47,49 @@ val apply_subst : substitution -> Cic.term -> Cic.term
 (*  during the unwinding the eta-expansions are undone.                 *)
 (* [subst] must be already unwinded                                     *)
 val apply_subst_reducing :
- substitution -> (int * int) option -> Cic.term -> Cic.term
+ (int * int) option -> substitution -> Cic.term -> Cic.term
 
 val apply_subst_context : substitution -> Cic.context -> Cic.context
-
-(** {2 Pretty printers} *)
-
-val ppcontext: ?sep: string -> substitution -> Cic.context -> string
-val ppmetasenv: ?sep: string -> substitution -> Cic.metasenv -> string
-val ppsubst: substitution -> string
+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 : Cic.metasenv -> substitution -> int -> Cic.term -> Cic.term
+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 whd: Cic.metasenv -> substitution -> Cic.context -> Cic.term -> Cic.term
+val tempi_type_of_aux : float ref
+val tempi_type_of_aux_subst : float ref
 
-val are_convertible:
-  Cic.metasenv -> substitution -> Cic.context -> Cic.term -> Cic.term ->
-    bool
+(*** delifting ***)
 
-val type_of_aux':
-  Cic.metasenv -> substitution -> Cic.context -> Cic.term ->
-    Cic.term
+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
+val ppterm: substitution -> Cic.term -> string
+val ppcontext: ?sep: string -> substitution -> Cic.context -> string
+val ppterm_in_context:
+ substitution -> Cic.term -> (Cic.name option) list -> string
+val ppmetasenv: ?sep: string -> Cic.metasenv -> substitution -> string
+
+(** {2 Format-like pretty printers}
+ * As above with prototypes suitable for toplevel/ocamldebug printers. No
+ * subsitutions are applied here since such printers are required to be invoked
+ * with only one argument.
+ *)
+
+val fppsubst: Format.formatter -> substitution -> unit
+val fppterm: Format.formatter -> Cic.term -> unit
+val fppmetasenv: Format.formatter -> Cic.metasenv -> unit