some more work for ng-coercions

[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..927c288a0543766830a730ee0df60ac39d33b773 100644 (file)
--- a/helm/software/components/ng_refiner/nCicMetaSubst.ml
+++ b/helm/software/components/ng_refiner/nCicMetaSubst.ml
@@ -215,8 +215,6 @@ let rec flexible_arg subst = function
   | _ -> 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,7 +254,7 @@ 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 ->
@@ -266,23 +264,16 @@ let delift ~unify metasenv subst context n l t =
           (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 -> 
@@ -413,10 +404,6 @@ 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
    try aux (context,0,0) (metasenv,subst) t
    with NotInTheList ->
@@ -435,7 +422,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