X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_unification%2FcicMetaSubst.mli;h=6ebd5a5b9e7ec788dd37eac817ef85503f2aa0cf;hb=fd648e40eb2c9c5b29cfa4408459511a74898d1d;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..6ebd5a5b9 100644
--- a/helm/ocaml/cic_unification/cicMetaSubst.mli
+++ b/helm/ocaml/cic_unification/cicMetaSubst.mli
@@ -23,61 +23,78 @@
  * http://helm.cs.unibo.it/
  *)
 
-exception AssertFailure of string
 exception MetaSubstFailure of string
+exception Uncertain of string
+exception AssertFailure of string
+
+exception SubstNotFound of int
 
 (* The entry (i,t) in a substitution means that *)
 (* (META i) have been instantiated with t.      *)
-type substitution = (int * Cic.term) list
+type substitution = (int * (Cic.context * 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
+  (** @raise SubstNotFound *)
+val lookup_subst: int -> substitution -> Cic.context * Cic.term
 
 (* 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 :
- substitution -> (int * int) option -> 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 whd: Cic.metasenv -> substitution -> Cic.context -> Cic.term -> Cic.term
+val type_of_aux':
+  Cic.metasenv -> substitution -> Cic.context -> Cic.term -> Cic.term
 
-val are_convertible:
-  Cic.metasenv -> substitution -> Cic.context -> Cic.term -> Cic.term ->
-    bool
+val tempi_type_of_aux : float ref
+val tempi_subst : float ref
+val tempi_type_of_aux_subst : float ref
 
-val type_of_aux':
-  Cic.metasenv -> substitution -> Cic.context -> Cic.term ->
-    Cic.term
+(*** delifting ***)
+
+val delift : 
+  int -> substitution -> Cic.context -> Cic.metasenv ->
+  (Cic.term option) list -> Cic.term ->
+    Cic.term * Cic.metasenv * substitution
+val restrict :
+  substitution -> (int * int) list -> Cic.metasenv -> 
+  Cic.metasenv * substitution 
+(** {2 Pretty printers} *)
+
+val ppsubst_unfolded: substitution -> string
+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
+
+(*
+(* DEBUG *)
+val print_counters: unit -> unit
+val reset_counters: unit -> unit
+*)
 
+(* val clean_up_meta :
+  substitution -> Cic.metasenv -> Cic.term -> Cic.term
+*)