X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_refiner%2FnCicUnification.ml;h=8e84c015dbed4c19508b876409678e03e523f22e;hb=89e21dbecca75a5320f50ecb53a39699f8ace8f1;hp=d95415d99d64d42c6e5565eb0b33bdd996fafb3a;hpb=30f0cf11c54154787e259c01bb99595c4a92ab1c;p=helm.git

diff --git a/helm/software/components/ng_refiner/nCicUnification.ml b/helm/software/components/ng_refiner/nCicUnification.ml
index d95415d99..8e84c015d 100644
--- a/helm/software/components/ng_refiner/nCicUnification.ml
+++ b/helm/software/components/ng_refiner/nCicUnification.ml
@@ -15,6 +15,9 @@ exception UnificationFailure of string Lazy.t;;
 exception Uncertain of string Lazy.t;;
 exception AssertFailure of string Lazy.t;;
 exception KeepReducing of string Lazy.t;;
+exception KeepReducingThis of 
+  string Lazy.t * (NCicReduction.machine * bool) * 
+                  (NCicReduction.machine * bool) ;;
 
 let (===) x y = Pervasives.compare x y = 0 ;;
 
@@ -74,23 +77,35 @@ module Ref = NReference;;
 
 let debug = ref false;;
 let indent = ref "";;
+let times = ref [];;
 let pp s =
  if !debug then
   prerr_endline (Printf.sprintf "%-20s" !indent ^ " " ^ Lazy.force s)
- else 
-  ()
 ;;
 let inside c =
- indent := !indent ^ String.make 1 c;
- if !debug then prerr_endline ("{{{" ^ !indent ^ " ")
+ if !debug then
+  begin
+   let time1 = Unix.gettimeofday () in
+   indent := !indent ^ String.make 1 c;
+   times := time1 :: !times;
+   prerr_endline ("{{{" ^ !indent ^ " ")
+  end
 ;;
-let outside ok =
- if !debug then prerr_endline "}}}";
- if not ok then pp (lazy "exception raised!");
- try
-  indent := String.sub !indent 0 (String.length !indent -1)
- with
-  Invalid_argument _ -> indent := "??"; ()
+let outside exc_opt =
+ if !debug then
+  begin
+   let time2 = Unix.gettimeofday () in
+   let time1 =
+    match !times with time1::tl -> times := tl; time1 | [] -> assert false in
+   prerr_endline ("}}} " ^ string_of_float (time2 -. time1));
+   (match exc_opt with
+   | Some e ->  prerr_endline ("exception raised: " ^ Printexc.to_string e)
+   | None -> ());
+   try
+    indent := String.sub !indent 0 (String.length !indent -1)
+   with
+    Invalid_argument _ -> indent := "??"; ()
+  end
 ;;
 
 let ppcontext ~metasenv ~subst c = 
@@ -146,47 +161,26 @@ let rec could_reduce =
   | C.Appl [] | C.LetIn _ | C.Implicit _ -> assert false
 ;;
 
-let rec lambda_intros rdb metasenv subst context t args =
- let tty = NCicTypeChecker.typeof ~metasenv ~subst context t in
- let argsty =
-  List.map
-  (fun arg -> arg, NCicTypeChecker.typeof ~metasenv ~subst context arg) args in
- let context_of_args = context in
- let rec mk_lambda metasenv subst context n processed_args = function
-   | [] ->
+let rec lambda_intros rdb metasenv subst context argsno ty =
+ pp (lazy ("LAMBDA INTROS: " ^ NCicPp.ppterm ~metasenv ~subst ~context ty));
+ match argsno with
+    0 -> 
        let metasenv, _, bo, _ = 
-         NCicMetaSubst.mk_meta metasenv context 
-           (`WithType (NCicSubstitution.lift n tty))
+         NCicMetaSubst.mk_meta metasenv context (`WithType ty)
        in
-       metasenv, subst, bo
-   | (arg,ty)::tail ->
-       pp(lazy("arg{ " ^ 
-         NCicPp.ppterm ~metasenv ~subst ~context:context_of_args arg ^  " : " ^
-         NCicPp.ppterm ~metasenv ~subst ~context:context_of_args ty));
-       let metasenv, subst, telescopic_ty = 
-         if processed_args = [] then metasenv, subst, ty else
-         let _ = pp(lazy("delift")) in
-         delift_type_wrt_terms rdb metasenv subst context 
-           (NCicSubstitution.lift n ty)
-           (List.map (NCicSubstitution.lift n) (List.rev processed_args))
-       in
-       pp(lazy("arg} "^NCicPp.ppterm ~metasenv ~subst ~context telescopic_ty));
-       let name = "HBeta"^string_of_int n in
-       let metasenv, subst, bo =
-        mk_lambda metasenv subst ((name,NCic.Decl telescopic_ty)::context) (n+1)
-         (arg::processed_args) tail
-       in
-        metasenv, subst, NCic.Lambda (name, telescopic_ty, bo)
- in
- pp(lazy("LAMBDA_INTROS{ " ^ 
-   NCicPp.ppterm ~metasenv ~subst ~context t ^  ":" ^
-   NCicPp.ppterm ~metasenv ~subst ~context tty ^ " over " ^ 
-   String.concat "," (List.map (NCicPp.ppterm ~metasenv ~subst ~context)args)));
- let rc = mk_lambda metasenv subst context 0 [] argsty in
- pp(lazy("LAMBDA_INTROS}"));
- rc
-
-and instantiate rdb test_eq_only metasenv subst context n lc t swap =
+       metasenv, bo
+  | _ ->
+     (match NCicReduction.whd ~subst context ty with
+         C.Prod (n,so,ta) ->
+          let metasenv,bo =
+           lambda_intros rdb metasenv subst
+            ((n,C.Decl so)::context) (argsno - 1) ta
+          in
+           metasenv,C.Lambda (n,so,bo)
+       | _ -> assert false)
+;;
+
+let rec 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));
@@ -271,8 +265,9 @@ and instantiate rdb test_eq_only metasenv subst context n lc t swap =
            let metasenv = List.filter (fun x,_ -> i <> x) metasenv in
            metasenv, subst, m, j 
     | NCic.Appl (NCic.Meta _ as hd :: args) as t -> 
-           let metasenv, subst, lambda_Mj =
-             lambda_intros rdb metasenv subst context t args
+           let metasenv, lambda_Mj =
+             lambda_intros rdb metasenv subst context (List.length args)
+              (NCicTypeChecker.typeof ~metasenv ~subst context hd)
            in
            let metasenv,subst= unify true metasenv subst context hd lambda_Mj in
            let t = NCicReduction.whd ~subst context t in
@@ -348,7 +343,7 @@ and instantiate rdb test_eq_only metasenv subst context n lc t swap =
       List.filter (fun (m,_) -> not (n = m)) metasenv 
     in
     metasenv, subst
- (*D*)  in outside true; rc with exn -> outside false; raise exn 
+ (*D*)  in outside None; rc with exn -> outside (Some exn); raise exn 
 
 and unify rdb test_eq_only metasenv subst context t1 t2 =
  (*D*) inside 'U'; try let rc =
@@ -434,9 +429,10 @@ and unify rdb test_eq_only metasenv subst context t1 t2 =
        | _, NCic.Meta (n, _) when is_locked n subst ->
            (let (metasenv, subst), i = 
               match NCicReduction.whd ~subst context t1 with
-              | NCic.Appl (NCic.Meta (i,l)::args) ->
-                 let metasenv, subst, lambda_Mj =
-                   lambda_intros rdb metasenv subst context t1 args
+              | NCic.Appl (NCic.Meta (i,l) as meta :: args) ->
+                 let metasenv, lambda_Mj =
+                   lambda_intros rdb metasenv subst context (List.length args)
+                    (NCicTypeChecker.typeof ~metasenv ~subst context meta)
                  in
                    unify rdb test_eq_only metasenv subst context 
                     (C.Meta (i,l)) lambda_Mj,
@@ -501,15 +497,16 @@ and unify rdb test_eq_only metasenv subst context t1 t2 =
           instantiate rdb test_eq_only metasenv subst context n lc 
            (NCicReduction.head_beta_reduce ~subst t) true
 
-       | NCic.Appl (NCic.Meta (i,l)::args), _ ->
-          let metasenv, subst, lambda_Mj =
-            lambda_intros rdb metasenv subst context t1 args
+       | NCic.Appl (NCic.Meta (i,l) as meta :: args), _ ->
+          let metasenv, lambda_Mj =
+            lambda_intros rdb metasenv subst context (List.length args)
+             (NCicTypeChecker.typeof ~metasenv ~subst context meta)
           in
           let metasenv, subst = 
            try
             unify rdb test_eq_only metasenv subst context 
               (C.Meta (i,l)) lambda_Mj
-           with UnificationFailure msg | Uncertain msg ->
+           with UnificationFailure msg | Uncertain msg when not norm2->
             (* failure: let's try again argument vs argument *)
             raise (KeepReducing msg)
           in
@@ -523,15 +520,16 @@ and unify rdb test_eq_only metasenv subst context t1 t2 =
             metasenv, ((i, (name, ctx, term, ty)) :: subst)
           with Not_found -> assert false)
 
-       | _, NCic.Appl (NCic.Meta (i,l)::args) ->
-         let metasenv, subst, lambda_Mj =
-           lambda_intros rdb metasenv subst context t2 args
+       | _, NCic.Appl (NCic.Meta (i,l) as meta :: args) ->
+         let metasenv, lambda_Mj =
+           lambda_intros rdb metasenv subst context (List.length args)
+             (NCicTypeChecker.typeof ~metasenv ~subst context meta)
          in
          let metasenv, subst =
           try
            unify rdb test_eq_only metasenv subst context 
             lambda_Mj (C.Meta (i,l))
-          with UnificationFailure msg | Uncertain msg ->
+          with UnificationFailure msg | Uncertain msg when not norm1 ->
            (* failure: let's try again argument vs argument *)
            raise (KeepReducing msg)
          in
@@ -549,15 +547,6 @@ and unify rdb test_eq_only metasenv subst context t1 t2 =
        | (C.Appl ((C.Const r1) as _hd1::tl1), C.Appl (C.Const r2::tl2)) 
          when Ref.eq r1 r2 ->
            let relevance = NCicEnvironment.get_relevance r1 in
-           let relevance = match r1 with
-             | Ref.Ref (_,Ref.Con (_,_,lno)) ->
-                 let relevance =
-                  try snd (HExtlib.split_nth lno relevance)
-                  with Failure _ -> []
-                 in
-                   HExtlib.mk_list false lno @ relevance
-             | _ -> relevance
-           in
            let metasenv, subst, _ = 
              try
                List.fold_left2 
@@ -576,6 +565,7 @@ and unify rdb test_eq_only metasenv subst context t1 t2 =
                  raise (Uncertain (mk_msg metasenv subst context t1 t2))
               | UnificationFailure _ | Uncertain _ when not (norm1 && norm2) ->
                  raise (KeepReducing (mk_msg metasenv subst context t1 t2))
+              | KeepReducing _ | KeepReducingThis _ -> assert false
            in 
              metasenv, subst
 
@@ -619,7 +609,7 @@ and unify rdb test_eq_only metasenv subst context t1 t2 =
            else
             raise (UnificationFailure (mk_msg metasenv subst context t1 t2))
        | _ -> raise (KeepReducing (mk_msg metasenv subst context t1 t2))
-     (*D*)  in outside true; rc with exn -> outside false; raise exn 
+     (*D*)  in outside None; rc with exn -> outside (Some exn); raise exn 
     in
     let try_hints metasenv subst (_,t1 as mt1) (_,t2 as mt2) (* exc*) =
     (*D*) inside 'H'; try let rc =  
@@ -655,12 +645,36 @@ and unify rdb test_eq_only metasenv subst context t1 t2 =
               in
               pp(lazy("FUNZIONA!"));
               Some (metasenv, subst)
-     (*D*)  in outside true; rc with exn -> outside false; raise exn 
+     (*D*)  in outside None; rc with exn -> outside (Some exn); raise exn 
             with
              KeepReducing _ | UnificationFailure _ | Uncertain _ -> cand_iter tl
+           | KeepReducingThis _ -> assert false
       in
         cand_iter candidates
-     (*D*)  in outside true; rc with exn -> outside false; raise exn 
+     (*D*)  in outside None; rc with exn -> outside (Some exn); raise exn 
+    in
+    let put_in_whd m1 m2 =
+      NCicReduction.reduce_machine ~delta:max_int ~subst context m1,
+      NCicReduction.reduce_machine ~delta:max_int ~subst context m2
+    in
+    let fo_unif_w_hints test_eq_only metasenv subst (xx1,t1 as m1) (xx2,t2 as m2) =
+      try fo_unif test_eq_only metasenv subst m1 m2
+      with 
+      | UnificationFailure _ as exn -> raise exn
+      | KeepReducing _ | Uncertain _ as exn ->
+        let (t1,norm1 as tm1),(t2,norm2 as tm2) =
+         put_in_whd (0,[],t1,[]) (0,[],t2,[])
+        in
+         match 
+           try_hints metasenv subst 
+            (norm1,NCicReduction.unwind t1) (norm2,NCicReduction.unwind t2)
+         with
+          | Some x -> x
+          | None -> 
+              match exn with 
+              | KeepReducing msg -> raise (KeepReducingThis (msg,tm1,tm2))
+              | Uncertain _ as exn -> raise exn
+              | _ -> assert false
     in
     let height_of = function
      | NCic.Const (Ref.Ref (_,Ref.Def h)) 
@@ -669,10 +683,6 @@ and unify rdb test_eq_only metasenv subst context t1 t2 =
      | NCic.Appl(NCic.Const(Ref.Ref(_,Ref.Fix (_,_,h)))::_) -> h
      | _ -> 0
     in
-    let put_in_whd m1 m2 =
-      NCicReduction.reduce_machine ~delta:max_int ~subst context m1,
-      NCicReduction.reduce_machine ~delta:max_int ~subst context m2
-    in
     let small_delta_step ~subst  
       ((_,_,t1,_ as m1, norm1) as x1) ((_,_,t2,_ as m2, norm2) as x2)
     =
@@ -698,7 +708,7 @@ and unify rdb test_eq_only metasenv subst context t1 t2 =
            " === " ^ 
            NCicPp.ppterm ~metasenv ~subst ~context 
              (NCicReduction.unwind (k2,e2,t2,s2))));
-pp (lazy (string_of_bool norm1 ^ " ?? " ^ string_of_bool norm2));
+         pp (lazy (string_of_bool norm1 ^ " ?? " ^ string_of_bool norm2));
           let relevance = [] (* TO BE UNDERSTOOD 
             match t1 with
             | C.Const r -> NCicEnvironment.get_relevance r
@@ -723,13 +733,14 @@ pp (lazy (string_of_bool norm1 ^ " ?? " ^ string_of_bool norm2));
         let hh1,hh2,todo=check_stack (List.rev s1) (List.rev s2) relevance [] in
         try
          let metasenv,subst =
-          fo_unif test_eq_only metasenv subst (norm1,hh1) (norm2,hh2) in
+          fo_unif_w_hints test_eq_only metasenv subst (norm1,hh1) (norm2,hh2) in
          List.fold_left
           (fun (metasenv,subst) (x1,x2,r) ->
             unif_from_stack x1 x2 r metasenv subst
           ) (metasenv,subst) todo
         with
-         | KeepReducing _ ->
+         | KeepReducing _ -> assert false
+         | KeepReducingThis _ ->
             assert (not (norm1 && norm2));
 	    unif_machines metasenv subst (small_delta_step ~subst m1 m2)
          | UnificationFailure _ | Uncertain _ when (not (norm1 && norm2))
@@ -738,32 +749,20 @@ pp (lazy (string_of_bool norm1 ^ " ?? " ^ string_of_bool norm2));
            when could_reduce (NCicReduction.unwind (fst m1))
              || could_reduce (NCicReduction.unwind (fst m2))
            -> raise (Uncertain msg)
-      (*D*)  in outside true; rc with exn -> outside false; raise exn 
+      (*D*)  in outside None; rc with exn -> outside (Some exn); raise exn 
      in
-     try fo_unif test_eq_only metasenv subst (false,t1) (false,t2)
-     with 
-     | UnificationFailure _ as exn -> raise exn
-     | KeepReducing _ | Uncertain _ as exn ->
-       let (t1,norm1 as tm1),(t2,norm2 as tm2) =
-        put_in_whd (0,[],t1,[]) (0,[],t2,[])
-       in
-        (match 
-          try_hints metasenv subst 
-           (norm1,NCicReduction.unwind t1) (norm2,NCicReduction.unwind t2)
-         with
-          | Some x -> x
-          | None ->
-             match exn with
-              | KeepReducing msg ->
-                 (try 
-                   unif_machines metasenv subst (tm1,tm2)
-                  with 
-                  | UnificationFailure _ -> raise (UnificationFailure msg)
-                  | Uncertain _ -> raise (Uncertain msg)
-                  | KeepReducing _ -> assert false)
-              | Uncertain _ -> raise exn
-              | _ -> assert false)
- (*D*)  in outside true; rc with KeepReducing _ -> assert false | exn -> outside false; raise exn 
+     try fo_unif_w_hints test_eq_only metasenv subst (false,t1) (false,t2)
+     with
+      | KeepReducingThis (msg,tm1,tm2) ->
+         (try 
+           unif_machines metasenv subst (tm1,tm2)
+          with 
+          | UnificationFailure _ -> raise (UnificationFailure msg)
+          | Uncertain _ -> raise (Uncertain msg)
+          | KeepReducing _ -> assert false)
+      | KeepReducing _ -> assert false
+
+ (*D*)  in outside None; rc with KeepReducing _ -> assert false | exn -> outside (Some exn); raise exn 
 
 and delift_type_wrt_terms rdb metasenv subst context t args =
   let lc = List.rev args @ mk_irl (List.length context) (List.length args+1) in