ported to cicMetaSubst

diff --git a/helm/ocaml/cic_unification/cicRefine.mli b/helm/ocaml/cic_unification/cicRefine.mli
index 338f50663dba12ac272dcbbc2ce9246e9cbb7074..2d4c0214a88992d499b3f5ecd6e653c116279117 100644 (file)
--- a/helm/ocaml/cic_unification/cicRefine.mli
+++ b/helm/ocaml/cic_unification/cicRefine.mli
@@ -37,4 +37,4 @@ exception FreeMetaFound of int;;
 (* The substitution returned is already unwinded             *)
 val type_of_aux':
  Cic.metasenv -> Cic.context -> Cic.term ->
-  Cic.term * Cic.term * CicUnification.substitution * Cic.metasenv
+  Cic.term * Cic.term * CicMetaSubst.substitution * Cic.metasenv

diff --git a/helm/ocaml/tactics/primitiveTactics.ml b/helm/ocaml/tactics/primitiveTactics.ml
index b060e009e067f012d8e4dd7e1ee469e7fdfb93c9..c1297a0e555eb0cd6cb3bc47dcf76b87fb749096 100644 (file)
--- a/helm/ocaml/tactics/primitiveTactics.ml
+++ b/helm/ocaml/tactics/primitiveTactics.ml
@@ -54,7 +54,9 @@ let lambda_abstract context newmeta ty mk_fresh_name =
        in
         (context',ty,C.LetIn(n,s,bo))
     | _ as t ->
-      let irl = identity_relocation_list_for_metavariable context in
+      let irl =
+        CicMkImplicit.identity_relocation_list_for_metavariable context
+      in
        context, t, (C.Meta (newmeta,irl))
   in
    collect_context context ty
@@ -158,7 +160,9 @@ let new_metasenv_for_apply newmeta proof context ty =
    function
       C.Cast (he,_) -> aux newmeta he
     | C.Prod (name,s,t) ->
-       let irl = identity_relocation_list_for_metavariable context in
+       let irl =
+         CicMkImplicit.identity_relocation_list_for_metavariable context
+       in
         let newargument = C.Meta (newmeta,irl) in
          let (res,newmetasenv,arguments,lastmeta) =
           aux (newmeta + 1) (S.subst newargument t)
@@ -197,7 +201,9 @@ let
                CicSubstitution.subst_vars !exp_named_subst_diff ty
             | _ -> raise (WrongUriToVariable (UriManager.string_of_uri uri))
           in
-           let irl = identity_relocation_list_for_metavariable context in
+           let irl =
+             CicMkImplicit.identity_relocation_list_for_metavariable context
+           in
            let subst_item = uri,C.Meta (!next_fresh_meta,irl) in
             newmetasenvfragment :=
              (!next_fresh_meta,context,ty)::!newmetasenvfragment ;
@@ -224,7 +230,7 @@ let apply_tac ~term ~status:(proof, goal) =
  let module C = Cic in
   let (_,metasenv,_,_) = proof in
   let metano,context,ty = List.find (function (m,_,_) -> m=goal) metasenv in
-  let newmeta = new_meta ~proof in
+  let newmeta = new_meta_of_proof ~proof in
    let exp_named_subst_diff,newmeta',newmetasenvfragment,term' =
     match term with
        C.Var (uri,exp_named_subst) ->
@@ -273,10 +279,10 @@ prerr_endline ("^^^^^TERMTY: " ^ CicPp.ppterm termty) ;
        CicUnification.fo_unif newmetasenv context consthead ty
       in
        let in_subst_domain i = List.exists (function (j,_) -> i=j) subst in
-       let apply_subst = CicUnification.apply_subst subst in
+       let apply_subst = CicMetaSubst.apply_subst subst in
         let old_uninstantiatedmetas,new_uninstantiatedmetas =
          (* subst_in doesn't need the context. Hence the underscore. *)
-         let subst_in _ = CicUnification.apply_subst subst in
+         let subst_in _ = CicMetaSubst.apply_subst subst in
           classify_metas newmeta in_subst_domain subst_in newmetasenv'
         in
          let bo' =
@@ -290,7 +296,7 @@ prerr_endline ("^^^^^TERMTY: " ^ CicPp.ppterm termty) ;
 prerr_endline ("XXXX " ^ CicPp.ppterm (if List.length newmetas = 0 then term' else Cic.Appl (term'::arguments)) ^ " |>>> " ^ CicPp.ppterm bo') ;
           let newmetasenv'' = new_uninstantiatedmetas@old_uninstantiatedmetas in
           let (newproof, newmetasenv''') =
-           let subst_in = CicUnification.apply_subst ((metano,bo')::subst) in
+           let subst_in = CicMetaSubst.apply_subst ((metano,bo')::subst) in
             subst_meta_and_metasenv_in_proof
               proof metano subst_in newmetasenv''
           in
@@ -302,7 +308,7 @@ let apply_tac ~term ~status =
   try
     apply_tac ~term ~status
       (* TODO cacciare anche altre eccezioni? *)
-  with CicUnification.UnificationFailed as e ->
+  with CicUnification.UnificationFailure _ as e ->
     raise (Fail (Printexc.to_string e))
 
 let intros_tac
@@ -313,7 +319,7 @@ let intros_tac
  let module R = CicReduction in
   let (_,metasenv,_,_) = proof in
   let metano,context,ty = List.find (function (m,_,_) -> m=goal) metasenv in
-   let newmeta = new_meta ~proof in
+   let newmeta = new_meta_of_proof ~proof in
     let (context',ty',bo') =
      lambda_abstract context newmeta ty mk_fresh_name_callback
     in
@@ -329,15 +335,19 @@ let cut_tac
  let module C = Cic in
   let curi,metasenv,pbo,pty = proof in
   let metano,context,ty = List.find (function (m,_,_) -> m=goal) metasenv in
-   let newmeta1 = new_meta ~proof in
+   let newmeta1 = new_meta_of_proof ~proof in
    let newmeta2 = newmeta1 + 1 in
    let fresh_name =
     mk_fresh_name_callback context (Cic.Name "Hcut") ~typ:term in
    let context_for_newmeta1 =
     (Some (fresh_name,C.Decl term))::context in
    let irl1 =
-    identity_relocation_list_for_metavariable context_for_newmeta1 in
-   let irl2 = identity_relocation_list_for_metavariable context in
+    CicMkImplicit.identity_relocation_list_for_metavariable
+     context_for_newmeta1
+   in
+   let irl2 =
+     CicMkImplicit.identity_relocation_list_for_metavariable context
+   in
     let newmeta1ty = CicSubstitution.lift 1 ty in
     let bo' =
      C.Appl
@@ -358,13 +368,15 @@ let letin_tac
   let curi,metasenv,pbo,pty = proof in
   let metano,context,ty = List.find (function (m,_,_) -> m=goal) metasenv in
    let _ = CicTypeChecker.type_of_aux' metasenv context term in
-    let newmeta = new_meta ~proof in
+    let newmeta = new_meta_of_proof ~proof in
     let fresh_name =
      mk_fresh_name_callback context (Cic.Name "Hletin") ~typ:term in
     let context_for_newmeta =
      (Some (fresh_name,C.Def (term,None)))::context in
     let irl =
-     identity_relocation_list_for_metavariable context_for_newmeta in
+     CicMkImplicit.identity_relocation_list_for_metavariable
+      context_for_newmeta
+    in
      let newmetaty = CicSubstitution.lift 1 ty in
      let bo' = C.LetIn (fresh_name,term,C.Meta (newmeta,irl)) in
       let (newproof, _) =
@@ -428,7 +440,7 @@ let elim_tac ~term ~status:(proof, goal) =
     in
      let eliminator_ref = C.Const (eliminator_uri,exp_named_subst) in
       let ety = T.type_of_aux' metasenv context eliminator_ref in
-      let newmeta = new_meta ~proof in
+      let newmeta = new_meta_of_proof ~proof in
        let (econclusion,newmetas,arguments,lastmeta) =
          new_metasenv_for_apply newmeta proof context ety
        in
@@ -441,7 +453,8 @@ let elim_tac ~term ~status:(proof, goal) =
           List.find (function (m,_,_) -> m=(lastmeta - 1)) newmetas
          in
           let irl =
-           identity_relocation_list_for_metavariable canonical_context
+           CicMkImplicit.identity_relocation_list_for_metavariable
+            canonical_context
           in
            Cic.Meta (lastmeta - 1, irl)
         in
@@ -449,7 +462,7 @@ let elim_tac ~term ~status:(proof, goal) =
         let subst1,newmetasenv' =
          CicUnification.fo_unif newmetasenv context term meta_of_corpse
         in
-         let ueconclusion = CicUnification.apply_subst subst1 econclusion in
+         let ueconclusion = CicMetaSubst.apply_subst subst1 econclusion in
           (* The conclusion of our elimination principle is *)
           (*  (?i farg1 ... fargn)                         *)
           (* The conclusion of our goal is ty. So, we can   *)
@@ -463,7 +476,7 @@ let elim_tac ~term ~status:(proof, goal) =
             | C.Meta (emeta,_) -> emeta,[]
             | _ -> raise NotTheRightEliminatorShape
           in
-           let ty' = CicUnification.apply_subst subst1 ty in
+           let ty' = CicMetaSubst.apply_subst subst1 ty in
            let eta_expanded_ty =
 (*CSC: newmetasenv' era metasenv ??????????? *)
             List.fold_left (eta_expand newmetasenv' context) ty' fargs
@@ -484,8 +497,8 @@ da subst1!!!! Dovrei rimuoverle o sono innocue?*)
               (* beta-reduction. apply_subst doesn't need the context. Hence *)
               (* the underscore.                                             *)
               let apply_subst _ t =
-               let t' = CicUnification.apply_subst subst1 t in
-                CicUnification.apply_subst_reducing
+               let t' = CicMetaSubst.apply_subst subst1 t in
+                CicMetaSubst.apply_subst_reducing
                  subst2 (Some (emeta,List.length fargs)) t'
               in
                 let old_uninstantiatedmetas,new_uninstantiatedmetas =
@@ -506,8 +519,8 @@ da subst1!!!! Dovrei rimuoverle o sono innocue?*)
                      (*CSC: Nota: sostituire nuovamente subst1 e' superfluo, *)
                      (*CSC: no?                                              *)
                      let apply_subst' t =
-                      let t' = CicUnification.apply_subst subst1 t in
-                       CicUnification.apply_subst_reducing
+                      let t' = CicMetaSubst.apply_subst subst1 t in
+                       CicMetaSubst.apply_subst_reducing
                         ((metano,bo')::subst2)
                         (Some (emeta,List.length fargs)) t'
                      in