X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_refiner%2FnCicMetaSubst.mli;h=7bde2c1d6b2c7ea95e1a54ebd0c2d83880bae59f;hb=c22f39a5d5afc0ef55beb221e00e2e6703b13d90;hp=21ac5c3ccce704a8473cd7cc7f23f53c1d33d559;hpb=2b1eb6d5cd2d3ff5024e48615df4b99692008690;p=helm.git

diff --git a/helm/software/components/ng_refiner/nCicMetaSubst.mli b/helm/software/components/ng_refiner/nCicMetaSubst.mli
index 21ac5c3cc..7bde2c1d6 100644
--- a/helm/software/components/ng_refiner/nCicMetaSubst.mli
+++ b/helm/software/components/ng_refiner/nCicMetaSubst.mli
@@ -14,22 +14,12 @@
 exception MetaSubstFailure of string Lazy.t
 exception Uncertain of string Lazy.t
 
-(*
-exception AssertFailure of string Lazy.t
-exception DeliftingARelWouldCaptureAFreeVariable;;
-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 restrict :
-  Cic.substitution -> (int * int) list -> Cic.metasenv -> 
-  Cic.metasenv * Cic.substitution 
-*)
+(* the index of the last created meta *)
+val maxmeta: unit -> int
 
 (* the delift function takes in input a metavariable index, a local_context
- * and a term t, and substitutes every Rel in t with its position in
+ * and a term t, and substitutes every subterm t' of t with its position 
+ * (searched up-to unification) in
  * the local_context (which is the Rel moved to the canonical context).
  * Typically, the list of optional terms is the explicit
  * substitution that is applied to a metavariable occurrence and the result of
@@ -43,6 +33,8 @@ val restrict :
  * in the term (for occur check).
  *)
 val delift : 
+  unify:(NCic.metasenv -> NCic.substitution -> NCic.context ->
+    NCic.term -> NCic.term -> (NCic.metasenv * NCic.substitution) option) -> 
   NCic.metasenv -> NCic.substitution -> NCic.context -> 
   int -> NCic.local_context -> NCic.term ->
     (NCic.metasenv * NCic.substitution) * NCic.term
@@ -57,10 +49,17 @@ val mk_meta:
    ?name:string -> 
    NCic.metasenv -> NCic.context -> 
     [ `WithType of NCic.term | `Term | `Type | `Sort ] -> 
-    NCic.metasenv * NCic.term * NCic.term (* menv, instance, type *)
+    NCic.metasenv * int * NCic.term * NCic.term (* menv,metano,instance,type *)
 
 (* returns the resulting type, the metasenv and the arguments *)
 val saturate:
-    ?delta:int -> NCic.metasenv -> NCic.context -> NCic.term -> int ->
+    ?delta:int -> NCic.metasenv -> NCic.substitution -> 
+    NCic.context -> NCic.term -> int ->
        NCic.term * NCic.metasenv * NCic.term list
 
+val flexible: NCic.substitution -> NCic.term list -> bool
+
+val in_scope_tag : string
+val out_scope_tag : int -> string
+val is_out_scope_tag : string -> bool
+val int_of_out_scope_tag : string -> int