2 lift related bugs fixed!

[helm.git] / helm / software / components / ng_refiner / nCicMetaSubst.ml

diff --git a/helm/software/components/ng_refiner/nCicMetaSubst.ml b/helm/software/components/ng_refiner/nCicMetaSubst.ml
index a445d16be4cf6a99a8937c6026c322672454854c..52d2e45941ceb3fab8050431e82f67d655ad627a 100644 (file)
--- a/helm/software/components/ng_refiner/nCicMetaSubst.ml
+++ b/helm/software/components/ng_refiner/nCicMetaSubst.ml
@@ -206,17 +206,35 @@ and restrict metasenv subst i restrictions =
     | NCicUtils.Meta_not_found _ -> assert false
 ;;
 
-let rec flexible_arg subst = function 
+let rec flexible_arg context subst = function 
   | NCic.Meta (i,_) | NCic.Appl (NCic.Meta (i,_) :: _)-> 
       (try 
         let _,_,t,_ = List.assoc i subst in
-        flexible_arg subst t
+        flexible_arg context subst t
       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 ;;
@@ -256,38 +274,35 @@ let delift ~unify metasenv subst context n l t =
     in
     try aux () () t; false with Found -> true
   in
-  let unify_list ~alpha in_scope = 
+  let unify_list in_scope = 
     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
-              if alpha then
-               if NCicReduction.alpha_eq metasenv subst context li t then
-                Some ((metasenv,subst), NCic.Rel (i+1+k))
-               else
-                None
-              else
-               match unify metasenv subst context li t with
-               | Some (metasenv,subst) -> 
-                   Some ((metasenv, subst), NCic.Rel (i+1+k))
-               | None -> None)
+             match unify metasenv subst context li t with
+             | Some (metasenv,subst) -> 
+                 Some ((metasenv, subst), NCic.Rel (i+1+k))
+             | None -> None)
           lb
   in
   let rec aux (context,k,in_scope) (metasenv, subst as ms) t = 
-   match unify_list ~alpha:true in_scope metasenv subst context k t with
+   match unify_list in_scope metasenv subst context k t with
    | Some x -> x
    | None -> 
-   try
     match t with 
     | 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 ->
@@ -413,11 +428,16 @@ let delift ~unify metasenv subst context n l t =
     | t -> 
         NCicUntrusted.map_term_fold_a 
           (fun e (c,k,s) -> (e::c,k+1,s)) (context,k,in_scope) aux ms t
-   with NotInTheList ->
-    match unify_list ~alpha:false in_scope metasenv subst context k t with
-    | Some x -> x
-    | None -> raise NotInTheList
   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. *)
@@ -435,7 +455,7 @@ 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