improved check in delift for flexible lc entries.

[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 927c288a0543766830a730ee0df60ac39d33b773..60abe85c37c08879ea80d01ededa27c158d0192f 100644 (file)
--- a/helm/software/components/ng_refiner/nCicMetaSubst.ml
+++ b/helm/software/components/ng_refiner/nCicMetaSubst.ml
@@ -206,12 +206,29 @@ 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 _ -> assert false
+      | Invalid_argument _ -> assert false)
   | _ -> false
 ;;
 
@@ -258,8 +275,8 @@ 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 -> t, flexible_arg context subst t) l in
          HExtlib.list_findopt
           (fun (li,flexible) i ->
             if flexible || i < in_scope then None else