X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_refiner%2FnCicMetaSubst.ml;h=f63aa9a30759d4a36acae98f99f892738e444dfd;hb=57a360d659425ce1ee9a69516b66a4d3c7b8eb62;hp=432f3e4bf064786df54d371ddaefdf140f73dac5;hpb=88a0b266486e0e6d2f8263a1cd643ba235442959;p=helm.git

diff --git a/helm/software/components/ng_refiner/nCicMetaSubst.ml b/helm/software/components/ng_refiner/nCicMetaSubst.ml
index 432f3e4bf..f63aa9a30 100644
--- a/helm/software/components/ng_refiner/nCicMetaSubst.ml
+++ b/helm/software/components/ng_refiner/nCicMetaSubst.ml
@@ -11,12 +11,46 @@
 
 (* $Id$ *)
 
+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)
+;;
+let inside c =
+ if !debug then
+  begin
+   let time1 = Unix.gettimeofday () in
+   indent := !indent ^ String.make 1 c;
+   times := time1 :: !times;
+   prerr_endline ("{{{" ^ !indent ^ " ")
+  end
+;;
+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
+;;
+
 exception MetaSubstFailure of string Lazy.t
 exception Uncertain of string Lazy.t
 
-let newmeta = 
+let newmeta,maxmeta = 
   let maxmeta = ref 0 in
-  fun () -> incr maxmeta; !maxmeta
+  (fun () -> incr maxmeta; !maxmeta),
+  (fun () -> !maxmeta)
 ;;
 
 exception NotInTheList;;
@@ -71,31 +105,36 @@ let rec force_does_not_occur metasenv subst restrictions t =
         in
         if amount > 0 then ms, NCic.Rel (r - amount) else ms, orig
     | NCic.Meta (n, (shift,lc as l)) as orig ->
-       (* we ignore the subst since restrict will take care of already
-        * instantiated/restricted metavariabels *)
-       let (metasenv,subst as ms), restrictions_for_n, l' =
-         let l = NCicUtils.expand_local_context lc in
-
-         let ms, _, restrictions_for_n, l =
-          List.fold_right
-            (fun t (ms, i, restrictions_for_n, l) ->
-              try 
-                let ms, t = aux (k-shift) ms t in
-                ms, i-1, restrictions_for_n, t::l
-              with Occur ->
-                ms, i-1, i::restrictions_for_n, l)
-            l (ms, List.length l, [], [])
-         in
-             
-          ms, restrictions_for_n, pack_lc (shift, NCic.Ctx l)
-       in
-       if restrictions_for_n = [] then
-         ms, if l = l' then orig else NCic.Meta (n, l')
-       else
-         let metasenv, subst, newmeta = 
-           restrict metasenv subst n restrictions_for_n 
-         in
-           (metasenv, subst), NCic.Meta (newmeta, l')
+       (try
+         let _,_,bo,_ = NCicUtils.lookup_subst n subst in
+          aux k ms (NCicSubstitution.subst_meta l bo)
+        with
+         NCicUtils.Subst_not_found _ ->
+          (* we ignore the subst since restrict will take care of already
+           * instantiated/restricted metavariabels *)
+          let (metasenv,subst as ms), restrictions_for_n, l' =
+            let l = NCicUtils.expand_local_context lc in
+         
+            let ms, _, restrictions_for_n, l =
+             List.fold_right
+               (fun t (ms, i, restrictions_for_n, l) ->
+                 try 
+                   let ms, t = aux (k-shift) ms t in
+                   ms, i-1, restrictions_for_n, t::l
+                 with Occur ->
+                   ms, i-1, i::restrictions_for_n, l)
+               l (ms, List.length l, [], [])
+            in
+                
+             ms, restrictions_for_n, pack_lc (shift, NCic.Ctx l)
+          in
+          if restrictions_for_n = [] then
+            ms, if l = l' then orig else NCic.Meta (n, l')
+          else
+            let metasenv, subst, newmeta = 
+              restrict metasenv subst n restrictions_for_n 
+            in
+              (metasenv, subst), NCic.Meta (newmeta, l'))
     | t -> NCicUntrusted.map_term_fold_a (fun _ k -> k+1) k aux ms t
  in
    aux 0 (metasenv,subst) t 
@@ -195,28 +234,46 @@ and restrict metasenv subst i restrictions =
     | NCicUtils.Meta_not_found _ -> assert false
 ;;
 
-let rec flexible_arg subst = function 
-  | NCic.Meta (i,_) | NCic.Appl (NCic.Meta (i,_) :: _)-> 
+let rec flexible_arg context subst = function 
+  | NCic.Meta (i,_) ->
       (try 
         let _,_,t,_ = List.assoc i subst in
-        flexible_arg subst t
+        flexible_arg context subst t
       with Not_found -> true)
+  | NCic.Appl (NCic.Meta (i,_) :: args)-> 
+      (try 
+        let _,_,t,_ = List.assoc i subst in
+        flexible_arg context subst 
+          (NCicReduction.head_beta_reduce ~delta:max_int 
+            (NCic.Appl (t :: args)))
+      with Not_found -> true)
+   (* this is a cheap whd, it only performs zeta-reduction.
+    * 
+    * it works when the **omissis** disambiguation algorithm
+    * is run on `let x := K a b in t`, K is substituted for a 
+    * ? and thus in t metavariables have a flexible Rel
+    *)
+  | NCic.Rel i ->
+      (try
+         match List.nth context (i-1)
+         with 
+         | _,NCic.Def (bo,_) ->
+               flexible_arg context subst
+                 (NCicSubstitution.lift i bo)
+         | _ -> false
+      with 
+      | Failure _ -> 
+          prerr_endline (Printf.sprintf "Rel %d inside context:\n%s" i  
+            (NCicPp.ppcontext ~subst ~metasenv:[] context));
+          assert false
+      | Invalid_argument _ -> assert false)
   | _ -> false
 ;;
 
-let flexible subst l = List.exists (flexible_arg subst) l;;
-
-let in_scope_tag  = "tag:in_scope" ;;
-let out_scope_tag_prefix = "tag:out_scope:" 
-let out_scope_tag n = out_scope_tag_prefix ^ string_of_int n ;;
-let is_out_scope_tag tag =
-   String.length tag > String.length out_scope_tag_prefix &&
-   String.sub tag 0 (String.length out_scope_tag_prefix) = out_scope_tag_prefix 
-;;
+let is_out_scope = function `OutScope _ -> true | _ -> false;;
+let is_out_scope_tag = List.exists is_out_scope;;
 let int_of_out_scope_tag tag = 
-  int_of_string
-   (String.sub tag (String.length out_scope_tag_prefix)
-     (String.length tag - (String.length out_scope_tag_prefix)))
+ match List.filter is_out_scope tag with [`OutScope n] -> n | _ -> assert false
 ;;
 
 
@@ -226,11 +283,12 @@ exception Found;;
    otherwise the occur check does not make sense in case of unification
    of ?n with ?n *)
 let delift ~unify metasenv subst context n l t =
+  (*D*)  inside 'D'; try let rc =  
   let is_in_scope_meta subst = function
     | NCic.Meta (i,_) ->
         (try 
            let tag, _, _, _ = NCicUtils.lookup_subst i subst in 
-           tag = Some in_scope_tag 
+            List.mem `InScope tag
         with NCicUtils.Subst_not_found _ -> false)
     | _ -> false
   in
@@ -249,12 +307,16 @@ let delift ~unify metasenv subst context n l t =
     match l with
     | _, NCic.Irl _ -> fun _ _ _ _ _ -> None
     | shift, NCic.Ctx l -> fun metasenv subst context k t ->
-       if flexible_arg subst t || contains_in_scope subst t then None else
-         let lb = List.map (fun t -> t, flexible_arg subst t) l in
+       if flexible_arg context subst t || contains_in_scope subst t then None else
+         let lb = 
+           List.map (fun t -> 
+            let t = NCicSubstitution.lift (k+shift) t in
+            t, flexible_arg context subst t) 
+           l 
+         in
          HExtlib.list_findopt
           (fun (li,flexible) i ->
             if flexible || i < in_scope then None else
-             let li = NCicSubstitution.lift (k+shift) li in
              match unify metasenv subst context li t with
              | Some (metasenv,subst) -> 
                  Some ((metasenv, subst), NCic.Rel (i+1+k))
@@ -269,7 +331,7 @@ let delift ~unify metasenv subst context n l t =
     | NCic.Rel n as t when n <= k -> ms, t
     | NCic.Rel n -> 
         (try
-          match List.nth context (n-k-1) with
+          match List.nth context (n-1) with
           | _,NCic.Def (bo,_) -> 
                 (try ms, NCic.Rel ((position in_scope (n-k) l) + k)
                  with NotInTheList ->
@@ -289,16 +351,15 @@ let delift ~unify metasenv subst context n l t =
         (try
            let tag,c,t,ty = NCicUtils.lookup_subst i subst in
            let in_scope, clear = 
-             match tag with 
-             | Some tag when tag = in_scope_tag -> 0, true
-             | Some tag when is_out_scope_tag tag->int_of_out_scope_tag tag,true
-             | _ -> in_scope, false
+            if List.mem `InScope tag then 0, true
+            else if is_out_scope_tag tag then int_of_out_scope_tag tag,true
+            else in_scope, false
            in
            let ms = 
              if not clear then ms
              else 
                metasenv, 
-               (i,(None,c,t,ty)) :: List.filter (fun j,_ -> i <> j) subst
+               (i,([],c,t,ty)) :: List.filter (fun j,_ -> i <> j) subst
            in
            aux (context,k,in_scope) ms (NCicSubstitution.subst_meta l1 t)
          with NCicUtils.Subst_not_found _ ->
@@ -375,15 +436,12 @@ let delift ~unify metasenv subst context n l t =
                         | NotInTheList | MetaSubstFailure _ -> ms, j::tbr, tl
                   in
                   let (metasenv, subst), to_be_r, lc1' = deliftl [] 1 ms lc1 in
-(*
-                  prerr_endline ("TO BE RESTRICTED: " ^ 
-                   (String.concat "," (List.map string_of_int to_be_r)));
-*)
+                  pp (lazy ("TO BE RESTRICTED: " ^ 
+                   (String.concat "," (List.map string_of_int to_be_r))));
                   let l1 = pack_lc (0, NCic.Ctx lc1') in
-(*
-                  prerr_endline ("newmeta:" ^ NCicPp.ppterm
-                   ~metasenv ~subst ~context (NCic.Meta (999,l1)));
-*)
+                  pp (lazy ("newmeta:" ^ NCicPp.ppterm
+                   ~metasenv ~subst ~context (NCic.Meta (999,l1))));
+                  pp (lazy (NCicPp.ppmetasenv ~subst metasenv));
                   if to_be_r = [] then
                     (metasenv, subst), 
                     (if lc1' = lc1 then orig else NCic.Meta (i,l1))
@@ -396,6 +454,15 @@ let delift ~unify metasenv subst context n l t =
         NCicUntrusted.map_term_fold_a 
           (fun e (c,k,s) -> (e::c,k+1,s)) (context,k,in_scope) aux ms t
   in
+(*
+  prerr_endline (
+    "DELIFTO " ^ NCicPp.ppterm ~metasenv ~subst ~context t ^ " w.r.t. " ^
+    String.concat ", " (List.map (NCicPp.ppterm ~metasenv ~subst ~context) ( 
+      let shift, lc = l in
+      (List.map (NCicSubstitution.lift shift) 
+        (NCicUtils.expand_local_context lc))
+  )));
+*)
    try aux (context,0,0) (metasenv,subst) t
    with NotInTheList ->
       (* This is the case where we fail even first order unification. *)
@@ -413,36 +480,39 @@ let delift ~unify metasenv subst context n l t =
       let lc = NCicUtils.expand_local_context lc in
       let l = List.map (NCicSubstitution.lift shift) lc in
        if
-         List.exists
-          (fun t -> 
-                  NCicUntrusted.metas_of_term subst context t = [])
-            l
+        List.exists (fun t-> NCicUntrusted.metas_of_term subst context t <> [])l
        then
         raise (Uncertain msg)
        else
         raise (MetaSubstFailure msg)
+ (*D*)  in outside None; rc with exn -> outside (Some exn); raise exn 
 ;;
 
-let mk_meta ?name metasenv context ty = 
-  let tyof = function Some s -> Some ("typeof_"^s) | None -> None in
-  let rec mk_meta name n metasenv context = function
-  | `WithType ty ->
-    let len = List.length context in
-    let menv_entry = (n, (name, context, ty)) in
-    menv_entry :: metasenv, n, NCic.Meta (n, (0,NCic.Irl len)), ty
-  | `Sort ->
-    let ty = NCic.Implicit (`Typeof n) in
-    mk_meta (tyof name) n metasenv [] (`WithType ty)
-  | `Type ->
-    let metasenv, _, ty, _ = 
-      mk_meta (tyof name) (newmeta ()) metasenv context `Sort in
-    mk_meta name n metasenv context (`WithType ty)
-  | `Term ->
-    let metasenv, _, ty, _ = 
-      mk_meta (tyof name) (newmeta ()) metasenv context `Type in
-    mk_meta name n metasenv context (`WithType ty)
-  in
-    mk_meta name (newmeta ()) metasenv context ty
+let mk_meta ?(attrs=[]) metasenv context ?with_type kind = 
+  assert(kind <> `IsSort || context = []);
+  let n = newmeta () in
+  let ty= match with_type with None-> NCic.Implicit (`Typeof n)| Some x ->x in
+  let len = List.length context in
+  let attrs = NCicUntrusted.set_kind kind attrs in
+  let menv_entry = (n, (attrs, context, ty)) in
+  menv_entry :: metasenv, n, NCic.Meta (n, (0,NCic.Irl len)), ty
+;;
+
+let extend_meta metasenv n =
+ try
+  let attrs,cc,ty = NCicUtils.lookup_meta n metasenv in 
+  (match ty with 
+  | NCic.Implicit (`Typeof _) -> 
+      let mk_meta context kind =
+        let metasenv, _, ty, _ = mk_meta metasenv context kind in
+        (n, (attrs, cc, ty)) :: List.filter (fun x,_ -> x <> n) metasenv, ty
+      in
+      (match NCicUntrusted.kind_of_meta attrs with
+       | `IsSort 
+       | `IsType -> mk_meta [] `IsSort
+       | `IsTerm -> mk_meta cc `IsType)
+  | ty -> metasenv, ty)
+ with NCicUtils.Meta_not_found _ -> assert false
 ;;
 
 let saturate ?(delta=0) metasenv subst context ty goal_arity =
@@ -450,7 +520,7 @@ let saturate ?(delta=0) metasenv subst context ty goal_arity =
   let rec aux metasenv = function
    | NCic.Prod (name,s,t) as ty ->
        let metasenv1, _, arg,_ = 
-          mk_meta ~name:name metasenv context (`WithType s) in            
+          mk_meta ~attrs:[`Name name] metasenv context ~with_type:s `IsTerm in
        let t, metasenv1, args, pno = 
            aux metasenv1 (NCicSubstitution.subst arg t) 
        in