X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_unification%2FcicMetaSubst.mli;h=6ebd5a5b9e7ec788dd37eac817ef85503f2aa0cf;hb=3bb4ce11fb9d4c6375483a80344beb94c4517dd7;hp=2ee78a7a443d4989973728c2f062b87041beafdf;hpb=bf60fc57745fba8a2a22215ed1286eceae0f7700;p=helm.git

diff --git a/helm/ocaml/cic_unification/cicMetaSubst.mli b/helm/ocaml/cic_unification/cicMetaSubst.mli
index 2ee78a7a4..6ebd5a5b9 100644
--- a/helm/ocaml/cic_unification/cicMetaSubst.mli
+++ b/helm/ocaml/cic_unification/cicMetaSubst.mli
@@ -27,40 +27,23 @@ 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 
+
+  (** @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 :
- (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 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 Kernel wrappers}
  * From now on we recreate a kernel abstraction where substitutions are part of
  * the calculus *)
@@ -74,6 +57,7 @@ val type_of_aux':
   Cic.metasenv -> substitution -> Cic.context -> Cic.term -> Cic.term
 
 val tempi_type_of_aux : float ref
+val tempi_subst : float ref
 val tempi_type_of_aux_subst : float ref
 
 (*** delifting ***)
@@ -82,6 +66,18 @@ 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
@@ -92,3 +88,13 @@ val delift :
 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
+*)