ocaml 3.09 transition

[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 b1e34757ec6e0564b32f8d050215808f1dd65fe8..96f87205f4723e715ce84c114c63c500d6cc094f 100644 (file)
--- a/helm/ocaml/cic_unification/cicMetaSubst.mli
+++ b/helm/ocaml/cic_unification/cicMetaSubst.mli
@@ -23,65 +23,53 @@
  * http://helm.cs.unibo.it/
  *)
 
-exception MetaSubstFailure of string
-exception Uncertain of string
-exception AssertFailure of string
+exception MetaSubstFailure of string Lazy.t
+exception Uncertain of string Lazy.t
+exception AssertFailure of string Lazy.t
+exception DeliftingARelWouldCaptureAFreeVariable;;
 
 (* 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 *)
 
 (* 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
+val apply_subst : Cic.substitution -> Cic.term -> Cic.term 
+val apply_subst_context : Cic.substitution -> Cic.context -> Cic.context 
+val apply_subst_metasenv: Cic.substitution -> Cic.metasenv -> Cic.metasenv 
 
 (*** delifting ***)
 
 val delift : 
-  int -> substitution -> Cic.context -> Cic.metasenv ->
+  int -> Cic.substitution -> Cic.context -> Cic.metasenv ->
   (Cic.term option) list -> Cic.term ->
-    Cic.term * Cic.metasenv * substitution
+    Cic.term * Cic.metasenv * Cic.substitution
+val restrict :
+  Cic.substitution -> (int * int) list -> Cic.metasenv -> 
+  Cic.metasenv * Cic.substitution 
 
+(** delifts the Rels in t of n
+ *  @raise DeliftingARelWouldCaptureAFreeVariable
+ *)
+val delift_rels :
+ Cic.substitution -> Cic.metasenv -> int -> Cic.term ->
+  Cic.term * Cic.substitution * Cic.metasenv
+ 
 (** {2 Pretty printers} *)
 
-val ppsubst: substitution -> string
-val ppterm: substitution -> Cic.term -> string
-val ppcontext: ?sep: string -> substitution -> Cic.context -> string
+val ppsubst_unfolded: Cic.substitution -> string
+val ppsubst: Cic.substitution -> string
+val ppterm: Cic.substitution -> Cic.term -> string
+val ppcontext: ?sep: string -> Cic.substitution -> Cic.context -> string
+val ppterm_in_name_context:
+ Cic.substitution -> Cic.term -> (Cic.name option) list -> string
 val ppterm_in_context:
- substitution -> Cic.term -> (Cic.name option) list -> string
-val ppmetasenv: ?sep: string -> Cic.metasenv -> substitution -> string
+ Cic.substitution -> Cic.term -> Cic.context -> string
+val ppmetasenv: ?sep: string -> Cic.substitution -> Cic.metasenv -> string
 
 (** {2 Format-like pretty printers}
  * As above with prototypes suitable for toplevel/ocamldebug printers. No
@@ -89,7 +77,16 @@ val ppmetasenv: ?sep: string -> Cic.metasenv -> substitution -> string
  * with only one argument.
  *)
 
-val fppsubst: Format.formatter -> substitution -> unit
+val fppsubst: Format.formatter -> Cic.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 :
+  Cic.substitution -> Cic.metasenv -> Cic.term -> Cic.term
+*)