X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_refiner%2FnCicUnification.ml;h=13ddac96d9be7e7995ae4ddc1b1aa105e6d701c6;hb=00d66d5ac17cc72d525d8b2cd089a963e1fef3bf;hp=59bc5d7e72ef9f11ee048545d11c616d367e2820;hpb=1b70a1f66be53f76e475383e86d63c2b5c1fbcaa;p=helm.git

diff --git a/helm/software/components/ng_refiner/nCicUnification.ml b/helm/software/components/ng_refiner/nCicUnification.ml
index 59bc5d7e7..13ddac96d 100644
--- a/helm/software/components/ng_refiner/nCicUnification.ml
+++ b/helm/software/components/ng_refiner/nCicUnification.ml
@@ -84,7 +84,13 @@ let outside () = indent := String.sub !indent 0 (String.length !indent -1);;
 
 let pp s = 
   prerr_endline (Printf.sprintf "%-20s" !indent ^ " " ^ Lazy.force s)
-;;  
+;;
+
+let ppcontext = NCicPp.ppcontext;;
+let ppmetasenv = NCicPp.ppmetasenv;;
+
+(*let ppcontext ~metasenv ~subst context = "...";;
+let ppmetasenv ~subst metasenv = "...";;*)
 
 let pp _ = ();;
 
@@ -134,13 +140,13 @@ let rec lambda_intros metasenv subst context t args =
  in
    mk_lambda context 0 argsty
 
-and instantiate hdb test_eq_only metasenv subst context n lc t swap =
+and instantiate rdb test_eq_only metasenv subst context n lc t swap =
  (*D*)  inside 'I'; try let rc =  
          pp (lazy(string_of_int n ^ " :=?= "^
            NCicPp.ppterm ~metasenv ~subst ~context t));
   let unify test_eq_only m s c t1 t2 = 
-    if swap then unify hdb test_eq_only m s c t2 t1 
-    else unify hdb test_eq_only m s c t1 t2
+    if swap then unify rdb test_eq_only m s c t2 t1 
+    else unify rdb test_eq_only m s c t1 t2
   in
   let name, ctx, ty = NCicUtils.lookup_meta n metasenv in
   let metasenv, subst, t = 
@@ -151,8 +157,8 @@ and instantiate hdb test_eq_only metasenv subst context n lc t swap =
     | _ ->
        pp (lazy (
          "typeof: " ^ NCicPp.ppterm ~metasenv ~subst ~context t ^ "\nctx:\n"^
-          NCicPp.ppcontext ~metasenv ~subst context ^ "\nmenv:\n"^
-          NCicPp.ppmetasenv ~subst metasenv));
+          ppcontext ~metasenv ~subst context ^ "\nmenv:\n"^
+          ppmetasenv ~subst metasenv));
        let t, ty_t = 
          try t, NCicTypeChecker.typeof ~subst ~metasenv context t 
          with 
@@ -163,8 +169,8 @@ and instantiate hdb test_eq_only metasenv subst context n lc t swap =
              (prerr_endline ( ("ILLTYPED: " ^ 
                 NCicPp.ppterm ~metasenv ~subst ~context t
             ^ "\nBECAUSE:" ^ Lazy.force msg ^ "\nCONTEXT:\n" ^
-            NCicPp.ppcontext ~metasenv ~subst context ^ "\nMENV:\n" ^
-            NCicPp.ppmetasenv ~subst metasenv
+            ppcontext ~metasenv ~subst context ^ "\nMENV:\n" ^
+            ppmetasenv ~subst metasenv
             ));
                      assert false)
            else
@@ -214,7 +220,7 @@ and instantiate hdb test_eq_only metasenv subst context n lc t swap =
   in
          pp (lazy(string_of_int n ^ " := 222 = "^
            NCicPp.ppterm ~metasenv ~subst ~context:ctx t
-         ^ "\n" ^ NCicPp.ppmetasenv ~subst metasenv));
+         ^ "\n" ^ ppmetasenv ~subst metasenv));
   (* Unifying the types may have already instantiated n. *)
   try
     let _, _,oldt,_ = NCicUtils.lookup_subst n subst in
@@ -234,12 +240,12 @@ and instantiate hdb test_eq_only metasenv subst context n lc t swap =
     metasenv, subst
  (*D*)  in outside(); rc with exn -> outside (); raise exn 
 
-and unify hdb test_eq_only metasenv subst context t1 t2 =
+and unify rdb test_eq_only metasenv subst context t1 t2 =
  (*D*) inside 'U'; try let rc =
    let fo_unif test_eq_only metasenv subst t1 t2 =
     (*D*) inside 'F'; try let rc =  
      pp (lazy("  " ^ NCicPp.ppterm ~metasenv ~subst ~context t1 ^ " ==?== " ^ 
-         NCicPp.ppterm ~metasenv ~subst ~context t2 ^ "\n" ^ NCicPp.ppmetasenv
+         NCicPp.ppterm ~metasenv ~subst ~context t2 ^ "\n" ^ ppmetasenv
          ~subst metasenv));
      if t1 === t2 then
        metasenv, subst
@@ -261,13 +267,13 @@ and unify hdb test_eq_only metasenv subst context t1 t2 =
 
        | (C.Lambda (name1,s1,t1), C.Lambda(_,s2,t2)) 
        | (C.Prod (name1,s1,t1), C.Prod(_,s2,t2)) ->
-           let metasenv, subst = unify hdb true metasenv subst context s1 s2 in
-           unify hdb test_eq_only metasenv subst ((name1, C.Decl s1)::context) t1 t2
+           let metasenv, subst = unify rdb true metasenv subst context s1 s2 in
+           unify rdb test_eq_only metasenv subst ((name1, C.Decl s1)::context) t1 t2
        | (C.LetIn (name1,ty1,s1,t1), C.LetIn(_,ty2,s2,t2)) ->
-           let metasenv,subst=unify hdb test_eq_only metasenv subst context ty1 ty2 in
-           let metasenv,subst=unify hdb test_eq_only metasenv subst context s1 s2 in
+           let metasenv,subst=unify rdb test_eq_only metasenv subst context ty1 ty2 in
+           let metasenv,subst=unify rdb test_eq_only metasenv subst context s1 s2 in
            let context = (name1, C.Def (s1,ty1))::context in
-           unify hdb test_eq_only metasenv subst context t1 t2
+           unify rdb test_eq_only metasenv subst context t1 t2
 
        | (C.Meta (n1,(s1,l1 as lc1)),C.Meta (n2,(s2,l2 as lc2))) when n1 = n2 ->
           (try 
@@ -278,7 +284,7 @@ and unify hdb test_eq_only metasenv subst context t1 t2 =
              (fun t1 t2 (metasenv, subst, to_restrict, i) -> 
                 try 
                   let metasenv, subst = 
-                   unify hdb test_eq_only metasenv subst context 
+                   unify rdb test_eq_only metasenv subst context 
                     (NCicSubstitution.lift s1 t1) (NCicSubstitution.lift s2 t2)
                   in
                   metasenv, subst, to_restrict, i-1  
@@ -299,7 +305,7 @@ and unify hdb test_eq_only metasenv subst context t1 t2 =
                 let _,_,term,_ = NCicUtils.lookup_subst n1 subst in
                 let term1 = NCicSubstitution.subst_meta lc1 term in
                 let term2 = NCicSubstitution.subst_meta lc2 term in
-                  unify hdb test_eq_only metasenv subst context term1 term2
+                  unify rdb test_eq_only metasenv subst context term1 term2
               with NCicUtils.Subst_not_found _-> raise (UnificationFailure msg))
        
        | _, NCic.Meta (n, _) when is_locked n subst ->
@@ -311,7 +317,7 @@ and unify hdb test_eq_only metasenv subst context t1 t2 =
                  let metasenv, lambda_Mj =
                    lambda_intros metasenv subst context t1 args
                  in
-                   unify hdb test_eq_only metasenv subst context 
+                   unify rdb test_eq_only metasenv subst context 
                     (C.Meta (i,l)) lambda_Mj,
                    i
               | NCic.Meta (i,_) -> (metasenv, subst), i
@@ -322,7 +328,21 @@ and unify hdb test_eq_only metasenv subst context t1 t2 =
                 match t1 with NCic.Meta (j,l) -> j, l | _ -> assert false
               in
               let metasenv, subst = 
-                instantiate hdb test_eq_only metasenv subst context j lj t2 true
+                instantiate rdb test_eq_only metasenv subst context j lj t2 true
+              in
+              (* We need to remove the out_scope_tags to avoid propagation of
+                 them that triggers again the ad-hoc case *)
+              let subst =
+               List.map (fun (i,(tag,ctx,bo,ty)) ->
+                let tag =
+                 match tag with
+                    Some tag when
+                        tag = NCicMetaSubst.in_scope_tag
+                     || NCicMetaSubst.is_out_scope_tag tag -> None
+                  | _ -> tag
+                in
+                  i,(tag,ctx,bo,ty)
+                ) subst
               in
               (try
                 let name, ctx, term, ty = NCicUtils.lookup_subst i subst in
@@ -335,30 +355,30 @@ and unify hdb test_eq_only metasenv subst context t1 t2 =
            (try 
              let _,_,term,_ = NCicUtils.lookup_subst n subst in
              let term = NCicSubstitution.subst_meta lc term in
-               unify hdb test_eq_only metasenv subst context term t
+               unify rdb test_eq_only metasenv subst context term t
            with NCicUtils.Subst_not_found _-> 
-             instantiate hdb test_eq_only metasenv subst context n lc 
+             instantiate rdb test_eq_only metasenv subst context n lc 
                (NCicReduction.head_beta_reduce ~subst t) false)
 
        | t, C.Meta (n,lc) -> 
            (try 
              let _,_,term,_ = NCicUtils.lookup_subst n subst in
              let term = NCicSubstitution.subst_meta lc term in
-               unify hdb test_eq_only metasenv subst context t term
+               unify rdb test_eq_only metasenv subst context t term
            with NCicUtils.Subst_not_found _-> 
-             instantiate hdb test_eq_only metasenv subst context n lc 
+             instantiate rdb test_eq_only metasenv subst context n lc 
               (NCicReduction.head_beta_reduce ~subst t) true)
 
        | NCic.Appl (NCic.Meta (i,l)::args), _ when List.mem_assoc i subst ->
             let _,_,term,_ = NCicUtils.lookup_subst i subst in
             let term = NCicSubstitution.subst_meta l term in
-              unify hdb test_eq_only metasenv subst context 
+              unify rdb test_eq_only metasenv subst context 
                 (mk_appl ~upto:(List.length args) term args) t2
 
        | _, NCic.Appl (NCic.Meta (i,l)::args) when List.mem_assoc i subst ->
             let _,_,term,_ = NCicUtils.lookup_subst i subst in
             let term = NCicSubstitution.subst_meta l term in
-              unify hdb test_eq_only metasenv subst context t1 
+              unify rdb test_eq_only metasenv subst context t1 
                 (mk_appl ~upto:(List.length args) term args)
 
        |  NCic.Appl (NCic.Meta (i,_)::_ as l1),
@@ -366,7 +386,7 @@ and unify hdb test_eq_only metasenv subst context t1 t2 =
             (try
               List.fold_left2 
                 (fun (metasenv, subst) t1 t2 ->
-                  unify hdb test_eq_only metasenv subst context t1 t2)
+                  unify rdb test_eq_only metasenv subst context t1 t2)
                 (metasenv,subst) l1 l2
             with Invalid_argument _ -> 
               raise (fail_exc metasenv subst context t1 t2))
@@ -379,11 +399,11 @@ and unify hdb test_eq_only metasenv subst context t1 t2 =
                 lambda_intros metasenv subst context t1 args
               in
               let metasenv, subst = 
-                unify hdb test_eq_only metasenv subst context 
+                unify rdb test_eq_only metasenv subst context 
                   (C.Meta (i,l)) lambda_Mj
               in
               let metasenv, subst = 
-                unify hdb test_eq_only metasenv subst context t1 t2 
+                unify rdb test_eq_only metasenv subst context t1 t2 
               in
               (try
                 let name, ctx, term, ty = NCicUtils.lookup_subst i subst in
@@ -398,11 +418,11 @@ and unify hdb test_eq_only metasenv subst context t1 t2 =
                 lambda_intros metasenv subst context t2 args
               in
               let metasenv, subst =
-                unify hdb test_eq_only metasenv subst context 
+                unify rdb test_eq_only metasenv subst context 
                  lambda_Mj (C.Meta (i,l))
               in
               let metasenv, subst = 
-                unify hdb test_eq_only metasenv subst context t1 t2 
+                unify rdb test_eq_only metasenv subst context t1 t2 
               in
               (try
                 let name, ctx, term, ty = NCicUtils.lookup_subst i subst in
@@ -431,7 +451,7 @@ and unify hdb test_eq_only metasenv subst context t1 t2 =
                     let b, relevance = 
                       match relevance with b::tl -> b,tl | _ -> true, [] in
                     let metasenv, subst = 
-                      try unify hdb test_eq_only metasenv subst context t1 t2
+                      try unify rdb test_eq_only metasenv subst context t1 t2
                       with UnificationFailure _ | Uncertain _ when not b ->
                         metasenv, subst
                     in
@@ -463,16 +483,16 @@ and unify hdb test_eq_only metasenv subst context t1 t2 =
              raise (uncert_exc metasenv subst context t1 t2) 
            else
              let metasenv, subst = 
-              unify hdb test_eq_only metasenv subst context outtype1 outtype2 in
+              unify rdb test_eq_only metasenv subst context outtype1 outtype2 in
              let metasenv, subst = 
-               try unify hdb test_eq_only metasenv subst context term1 term2 
+               try unify rdb test_eq_only metasenv subst context term1 term2 
                with UnificationFailure _ | Uncertain _ when is_prop -> 
                  metasenv, subst
              in
              (try
               List.fold_left2 
                (fun (metasenv,subst) -> 
-                  unify hdb test_eq_only metasenv subst context)
+                  unify rdb test_eq_only metasenv subst context)
                (metasenv, subst) pl1 pl2
              with Invalid_argument _ -> 
                raise (uncert_exc metasenv subst context t1 t2))
@@ -490,7 +510,7 @@ and unify hdb test_eq_only metasenv subst context t1 t2 =
         NCicPp.ppterm ~metasenv ~subst ~context t2);
 *)
       let candidates = 
-        NCicUnifHint.look_for_hint hdb metasenv subst context t1 t2
+        NCicUnifHint.look_for_hint rdb metasenv subst context t1 t2
       in
       let rec cand_iter = function
         | [] -> None (* raise exc *)
@@ -514,7 +534,7 @@ and unify hdb test_eq_only metasenv subst context t1 t2 =
               let metasenv,subst = 
                 List.fold_left 
                   (fun (metasenv, subst) (x,y) ->
-                     unify hdb test_eq_only metasenv subst context x y)
+                     unify rdb test_eq_only metasenv subst context x y)
                   (metasenv, subst) premises
               in
               Some (metasenv, subst)
@@ -615,6 +635,6 @@ pp (lazy (string_of_bool norm1 ^ " ?? " ^ string_of_bool norm2));
  (*D*)  in outside(); rc with exn -> outside (); raise exn 
 ;;
 
-let unify hdb ?(test_eq_only=false) = 
+let unify rdb ?(test_eq_only=false) = 
   indent := "";      
-  unify hdb test_eq_only;;
+  unify rdb test_eq_only;;