X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_refiner%2FnCicMetaSubst.ml;h=12fe977083ec04a2c9ee309c116e2cb22419929b;hb=04c05cf08605156ba8c6fa7225b4a90496c03698;hp=b5a4646baba5160bbe940c44d84c38ca8e194b4f;hpb=ee2bbb5aa3f13fbea8cd758e69347d9f1f5ed6bb;p=helm.git

diff --git a/helm/software/components/ng_refiner/nCicMetaSubst.ml b/helm/software/components/ng_refiner/nCicMetaSubst.ml
index b5a4646ba..12fe97708 100644
--- a/helm/software/components/ng_refiner/nCicMetaSubst.ml
+++ b/helm/software/components/ng_refiner/nCicMetaSubst.ml
@@ -155,7 +155,7 @@ exception NotInTheList;;
 let position n (shift, lc) =
   match lc with
   | NCic.Irl len when n <= shift || n > shift + len -> raise NotInTheList
-  | NCic.Irl len -> n - shift
+  | NCic.Irl _ -> n - shift
   | NCic.Ctx tl ->
       let rec aux k = function 
          | [] -> raise NotInTheList
@@ -178,11 +178,13 @@ let pack_lc orig =
   | _ -> orig
 ;;
 
-let mk_restricted_irl shift len restrictions =
+
+
+let mk_perforated_irl shift len restrictions =
   let rec aux n =
     if n = 0 then [] else
-      if List.mem (n+shift) restrictions then aux (n-1)
-      else (NCic.Rel n)::aux (n-1)
+     if List.mem (n+shift) restrictions then aux (n-1)
+     else (NCic.Rel n) :: aux (n-1)
   in
     pack_lc (shift, NCic.Ctx (List.rev (aux len)))
 ;;
@@ -190,30 +192,29 @@ let mk_restricted_irl shift len restrictions =
 exception Occur;;
 
 let rec force_does_not_occur metasenv subst restrictions t =
- let rec aux k (metasenv, subst as  ms) = function
+ let rec aux k ms = function
     | NCic.Rel r when List.mem (r - k) restrictions -> raise Occur
-    | NCic.Meta (n, l) as orig ->
+    | NCic.Rel r as orig ->
+        let amount = 
+          List.length (List.filter (fun x -> x < r - k) restrictions) 
+        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' =
-         match l with
-         | shift, NCic.Irl len -> 
-             let restrictions = 
-               List.filter 
-                (fun i -> i > shift && i <= shift + len) restrictions in
-             ms, restrictions, mk_restricted_irl shift len restrictions
-         | shift, NCic.Ctx l ->
-            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)
+         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')
@@ -222,7 +223,7 @@ let rec force_does_not_occur metasenv subst restrictions t =
            restrict metasenv subst n restrictions_for_n 
          in
            (metasenv, subst), NCic.Meta (newmeta, l')
-    | t -> NCicUtils.map_term_fold_a (fun _ k -> k+1) k aux ms t
+    | t -> NCicUntrusted.map_term_fold_a (fun _ k -> k+1) k aux ms t
  in
    aux 0 (metasenv,subst) t 
 
@@ -271,13 +272,23 @@ and restrict metasenv subst i restrictions =
         let (metasenv, subst), newbo =  
           force_does_not_occur metasenv subst restrictions bo in
         let j = newmeta () in
-        let subst_entry_j = j, (name, newctx, newty, newbo) in
-        let reloc_irl = mk_restricted_irl 0 (List.length ctx) restrictions in
+        let subst_entry_j = j, (name, newctx, newbo, newty) in
+        let reloc_irl = mk_perforated_irl 0 (List.length ctx) restrictions in
         let subst_entry_i = i, (name, ctx, NCic.Meta (j, reloc_irl), ty) in
-        metasenv,
-        subst_entry_j :: List.map 
-          (fun (n,x) as orig -> if i = n then subst_entry_i else orig) subst,
-        j
+        let new_subst = 
+          subst_entry_j :: List.map 
+            (fun (n,_) as orig -> if i = n then subst_entry_i else orig) subst
+        in
+(*
+    prerr_endline ("restringo nella subst: " ^string_of_int i ^ " -> " ^ 
+      string_of_int j ^ "\n" ^ 
+      NCicPp.ppsubst ~metasenv [subst_entry_j] ^ "\n\n" ^
+      NCicPp.ppsubst ~metasenv [subst_entry_i] ^ "\n" ^
+      NCicPp.ppterm ~metasenv ~subst ~context:ctx bo ^ " ---- " ^
+      NCicPp.ppterm ~metasenv ~subst ~context:newctx newbo
+            );
+*)
+        metasenv, new_subst, j
       with Occur -> raise (MetaSubstFailure (lazy (Printf.sprintf
             ("Cannot restrict the context of the metavariable ?%d over "^^
             "the hypotheses %s since ?%d is already instantiated "^^
@@ -295,10 +306,11 @@ and restrict metasenv subst i restrictions =
           force_does_not_occur metasenv subst restrictions ty in
         let j = newmeta () in
         let metasenv_entry = j, (name, newctx, newty) in
-        let reloc_irl = mk_restricted_irl 0 (List.length ctx) restrictions in
+        let reloc_irl = 
+          mk_perforated_irl 0 (List.length ctx) restrictions in
         let subst_entry = i, (name, ctx, NCic.Meta (j, reloc_irl), ty) in
         List.map 
-          (fun (n,x) as orig -> if i = n then metasenv_entry else orig) 
+          (fun (n,_) as orig -> if i = n then metasenv_entry else orig) 
           metasenv,
         subst_entry :: subst, j
       with Occur -> raise (MetaSubstFailure (lazy (Printf.sprintf
@@ -328,6 +340,7 @@ let delift metasenv subst context n l t =
                   aux k ms (NCicSubstitution.lift n bo))
           | _,NCic.Decl _ -> ms, NCic.Rel ((position (n-k) l) + k)
         with Failure _ -> assert false) (*Unbound variable found in delift*)
+    | NCic.Meta (_,(_,(NCic.Irl 0| NCic.Ctx []))) as orig -> ms, orig
     | NCic.Meta (i,l1) as orig ->
         (try
            let _,_,t,_ = NCicUtils.lookup_subst i subst in
@@ -343,36 +356,78 @@ let delift metasenv subst context n l t =
            else
               let shift1,lc1 = l1 in
               let shift,lc = l in
+              let shift = shift + k in
               match lc, lc1 with
               | NCic.Irl len, NCic.Irl len1 
-                when shift1 < shift || len1 + shift1 > len + shift ->
-                  let restrictions = 
-                     HExtlib.list_seq 1 (shift - shift1) @
-                     HExtlib.list_seq (shift+len+1) (shift1+len1)
-                  in
+                when shift1 + len1 < shift || shift1 > shift + len ->
+                  let restrictions = HExtlib.list_seq 1 (len1 + 1) in
                   let metasenv, subst, newmeta = 
                      restrict metasenv subst i restrictions 
                   in
                   (metasenv, subst), 
-                  NCic.Meta(newmeta, mk_restricted_irl shift1 len1 restrictions)
-              | NCic.Irl len, NCic.Irl len1 when shift = 0 -> ms, orig
-              | NCic.Irl len, NCic.Irl len1 ->
-                   ms, NCic.Meta (i, (shift1 - shift, lc1))
-              | _ -> 
-                  let to_be_restricted = ref [] in
+                    NCic.Meta (newmeta, (0,NCic.Irl (max 0 (k-shift1))))
+              | NCic.Irl len, NCic.Irl len1 
+                when shift1 < shift || len1 + shift1 > len + shift ->
+                  (* C. Hoare. Premature optimization is the root of all evil*)
+                  let stop = shift + len in
+                  let stop1 = shift1 + len1 in
+                  let low_gap = max 0 (shift - shift1) in
+                  let high_gap = max 0 (stop1 - stop) in
+                  let restrictions = 
+                     HExtlib.list_seq (k+1-shift1) (low_gap + 1) @
+                     HExtlib.list_seq (len1 - high_gap + 1) (len1 + 1)
+                  in
+                    let metasenv, subst, newmeta = 
+                       restrict metasenv subst i restrictions 
+                    in
+(*
+                  prerr_endline ("RESTRICTIONS FOR: " ^ 
+                    NCicPp.ppterm ~metasenv ~subst ~context:[] 
+                    (NCic.Meta (i,l1))^" that was part of a term unified with "
+                    ^ NCicPp.ppterm ~metasenv ~subst ~context:[] (NCic.Meta
+                    (n,l)) ^ " ====> " ^ String.concat "," (List.map
+                    string_of_int restrictions) ^ "\nMENV:\n" ^
+                    NCicPp.ppmetasenv ~subst metasenv ^ "\nSUBST:\n" ^
+                    NCicPp.ppsubst subst ~metasenv);
+*)
+                  let newlc_len = 
+                    len1 - low_gap - high_gap + max 0 (k - shift1) in
+                  assert (if shift1 > k then 
+                    shift1 + low_gap - shift = 0 else true);
+                  let meta = 
+                     NCic.Meta(newmeta,(shift1 + low_gap - shift, 
+                       NCic.Irl newlc_len))
+                  in
+                  let _, cctx, _ = NCicUtils.lookup_meta newmeta metasenv in
+                  assert (List.length cctx = newlc_len);
+                    (metasenv, subst), meta
+                  
+              | NCic.Irl _, NCic.Irl _ when shift = 0 -> ms, orig
+              | NCic.Irl _, NCic.Irl _ ->
+                   ms, NCic.Meta (i, (max 0 (shift1 - shift), lc1))
+              | _ ->
                   let lc1 = NCicUtils.expand_local_context lc1 in
+                  let lc1 = List.map (NCicSubstitution.lift shift1) lc1 in
                   let rec deliftl tbr j ms = function
                     | [] -> ms, tbr, []
                     | t::tl ->
                         let ms, tbr, tl = deliftl tbr (j+1) ms tl in
                         try 
-                          let ms, t = aux (k-shift1) ms t in 
+                          let ms, t = aux k ms t in 
                           ms, tbr, t::tl
                         with
                         | NotInTheList | MetaSubstFailure _ -> ms, j::tbr, tl
                   in
                   let (metasenv, subst), to_be_r, lc1' = deliftl [] 1 ms lc1 in
-                  let l1 = pack_lc (shift, NCic.Ctx lc1') in
+(*
+                  prerr_endline ("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)));
+*)
                   if to_be_r = [] then
                     (metasenv, subst), 
                     (if lc1' = lc1 then orig else NCic.Meta (i,l1))
@@ -380,52 +435,34 @@ let delift metasenv subst context n l t =
                     let metasenv, subst, newmeta = 
                       restrict metasenv subst i to_be_r in
                     (metasenv, subst), NCic.Meta(newmeta,l1))
-    | t -> NCicUtils.map_term_fold_a (fun _ k -> k+1) k aux ms t
-  in
-    aux 0 (metasenv,subst) t
-;;
 
-(*
+    | t -> NCicUntrusted.map_term_fold_a (fun _ k -> k+1) k aux ms t
   in
-   let res =
-    try
-     deliftaux 0 t
-    with
-     NotInTheList ->
+   try aux 0 (metasenv,subst) t
+   with NotInTheList ->
       (* This is the case where we fail even first order unification. *)
       (* The reason is that our delift function is weaker than first  *)
       (* order (in the sense of alpha-conversion). See comment above  *)
       (* related to the delift function.                              *)
-(* debug_print (lazy "First Order UnificationFailure during delift") ;
-debug_print(lazy (sprintf
-        "Error trying to abstract %s over [%s]: the algorithm only tried to abstract over bound variables"
-        (ppterm subst t)
-        (String.concat "; "
-          (List.map
-            (function Some t -> ppterm subst t | None -> "_") l
-          )))); *)
-      let msg = (lazy (sprintf
-        "Error trying to abstract %s over [%s]: the algorithm only tried to abstract over bound variables"
-        (ppterm ~metasenv subst t)
-        (String.concat "; "
-          (List.map
-            (function Some t -> ppterm ~metasenv subst t | None -> "_")
-            l))))
+      let msg = (lazy (Printf.sprintf
+        ("Error trying to abstract %s over [%s]: the algorithm only tried to "^^
+        "abstract over bound variables") (NCicPp.ppterm ~metasenv ~subst
+        ~context 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))))))
       in
+      let shift, lc = l in
+      let lc = NCicUtils.expand_local_context lc in
+      let l = List.map (NCicSubstitution.lift shift) lc in
        if
          List.exists
-          (function
-              Some t -> CicUtil.is_meta_closed (apply_subst subst t)
-            | None -> true) l
+          (fun t -> NCicUntrusted.metas_of_term subst context t = [])
+            l
        then
         raise (Uncertain msg)
        else
         raise (MetaSubstFailure msg)
-   in
-   let (metasenv, subst) = restrict subst !to_be_restricted metasenv in
-    res, metasenv, subst
 ;;
-*)
 
 (*
 (* delifts a term t of n levels strating from k, that is changes (Rel m)
@@ -567,3 +604,48 @@ let delift_rels subst metasenv n t =
   delift_rels_from subst metasenv 1 n t
 *) 
 
+let mk_meta ?name metasenv context ty = 
+  match ty with
+  | `Typeless ->
+    let n = newmeta () in
+    let ty = NCic.Implicit (`Typeof n) in
+    let menv_entry = (n, (name, context, ty)) in
+    menv_entry :: metasenv,NCic.Meta (n, (0,NCic.Irl (List.length context))), ty
+  | `Type 
+  | `Term ->
+    let context_for_ty = if ty = `Type then [] else context in
+    let n = newmeta () in
+    let ty_menv_entry = (n, (name,context_for_ty, NCic.Implicit (`Typeof n))) in
+    let m = newmeta () in
+    let ty = NCic.Meta (n, (0,NCic.Irl (List.length context_for_ty))) in
+    let menv_entry = (m, (name, context, ty)) in
+    menv_entry :: ty_menv_entry :: metasenv, 
+      NCic.Meta (m, (0,NCic.Irl (List.length context))), ty
+  | `WithType ty ->
+    let n = newmeta () in
+    let len = List.length context in
+    let menv_entry = (n, (name, context, ty)) in
+    menv_entry :: metasenv, NCic.Meta (n, (0,NCic.Irl len)), ty
+;;
+
+let saturate ?(delta=0) metasenv context ty goal_arity =
+ assert (goal_arity >= 0);
+  let rec aux metasenv = function
+   | NCic.Prod (name,s,t) ->
+       let metasenv1, arg,_ = 
+          mk_meta ~name:name metasenv context (`WithType s) in            
+       let t, metasenv1, args, pno = 
+           aux metasenv1 (NCicSubstitution.subst arg t) 
+       in
+       if pno + 1 = goal_arity then
+         ty, metasenv, [], goal_arity+1
+       else
+         t, metasenv1, arg::args, pno+1
+   | ty ->
+        match NCicReduction.whd context ty ~delta with
+        | NCic.Prod _ as ty -> aux metasenv ty
+        | ty -> ty, metasenv, [], 0
+  in
+  let res, newmetasenv, arguments, _ = aux metasenv ty in
+  res, newmetasenv, arguments
+;;