- new implementation of the apply case in fo_unif using beta expansion

[helm.git] / helm / ocaml / cic_unification / cicMetaSubst.mli

diff --git a/helm/ocaml/cic_unification/cicMetaSubst.mli b/helm/ocaml/cic_unification/cicMetaSubst.mli
index 6034853da84dac5e612ec67946e90579aa43fcec..546a71deacce2cc44b7ef50d4815a00da8086f79 100644 (file)
--- a/helm/ocaml/cic_unification/cicMetaSubst.mli
+++ b/helm/ocaml/cic_unification/cicMetaSubst.mli
@@ -23,8 +23,9 @@
  * 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.      *)
@@ -35,31 +36,9 @@ type substitution = (int * Cic.term) list
 (* [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 *)
@@ -73,6 +52,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 +62,15 @@ val delift :
   (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
@@ -91,3 +80,4 @@ val delift :
 val fppsubst: Format.formatter -> substitution -> unit
 val fppterm: Format.formatter -> Cic.term -> unit
 val fppmetasenv: Format.formatter -> Cic.metasenv -> unit
+