new implementation of delift_type_wrt_term, that call delift directly

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

diff --git a/helm/software/components/ng_refiner/nCicUnification.ml b/helm/software/components/ng_refiner/nCicUnification.ml
index 2f6332d51d748ad0c90ecf71c81c5219ccd79cec..ce109f2af906353375c4504c07eea230a4de5611 100644 (file)
--- a/helm/software/components/ng_refiner/nCicUnification.ml
+++ b/helm/software/components/ng_refiner/nCicUnification.ml
@@ -98,11 +98,13 @@ let pp s =
 
 let pp _ = ();;
 
-let ppcontext = NCicPp.ppcontext;;
-let ppmetasenv = NCicPp.ppmetasenv;;
+let ppcontext ~metasenv ~subst c = 
+      "\nctx:\n"^ NCicPp.ppcontext ~metasenv ~subst c
+;;
+let ppmetasenv ~subst m = "\nmenv:\n" ^ NCicPp.ppmetasenv ~subst m;;
 
-let ppcontext ~metasenv:_metasenv ~subst:_subst _context = "...";;
-let ppmetasenv ~subst:_subst _metasenv = "...";;
+let ppcontext ~metasenv:_metasenv ~subst:_subst _context = "";;
+let ppmetasenv ~subst:_subst _metasenv = "";;
 
 let fix_sorts swap exc t =
   let rec aux () = function
@@ -152,10 +154,16 @@ let rec lambda_intros rdb metasenv subst context t args =
        in
        metasenv, subst, bo
    | (arg,ty)::tail ->
+       pp(lazy("arg{ " ^ 
+         NCicPp.ppterm ~metasenv ~subst ~context:context_of_args arg ^  ":" ^
+         NCicPp.ppterm ~metasenv ~subst ~context:context_of_args ty));
        let metasenv, subst, telescopic_ty = 
-         delift_term_wrt_terms rdb metasenv subst context_of_args ty 
+         if processed_args = [] then metasenv, subst, ty else
+         let _ = pp(lazy("delift")) in
+         delift_type_wrt_terms rdb metasenv subst context_of_args ty 
            (List.rev processed_args)
        in
+       pp(lazy("arg}"));
        let name = "HBeta"^string_of_int n in
        let metasenv, subst, bo =
         mk_lambda metasenv subst ((name,NCic.Decl telescopic_ty)::context) (n+1)
@@ -163,7 +171,13 @@ let rec lambda_intros rdb metasenv subst context t args =
        in
         metasenv, subst, NCic.Lambda (name, telescopic_ty, bo)
  in
-   mk_lambda metasenv subst context 0 [] argsty
+ pp(lazy("LAMBDA_INTROS{ " ^ 
+   NCicPp.ppterm ~metasenv ~subst ~context t ^  ":" ^
+   NCicPp.ppterm ~metasenv ~subst ~context tty ^ " over " ^ 
+   String.concat "," (List.map (NCicPp.ppterm ~metasenv ~subst ~context)args)));
+ let rc = mk_lambda metasenv subst context 0 [] argsty in
+ pp(lazy("LAMBDA_INTROS}"));
+ rc
 
 and instantiate rdb test_eq_only metasenv subst context n lc t swap =
  (*D*)  inside 'I'; try let rc =  
@@ -181,8 +195,8 @@ and instantiate rdb test_eq_only metasenv subst context n lc t swap =
          (* fix_sorts swap metasenv subst context (NCic.Meta(n,lc)) t *)
     | _ ->
        pp (lazy (
-         "typeof: " ^ NCicPp.ppterm ~metasenv ~subst ~context t ^ "\nctx:\n"^
-          ppcontext ~metasenv ~subst context ^ "\nmenv:\n"^
+               "typeof: " ^ NCicPp.ppterm ~metasenv ~subst ~context t ^
+          ppcontext ~metasenv ~subst context ^ 
           ppmetasenv ~subst metasenv));
        let exc_to_be = fail_exc metasenv subst context (NCic.Meta (n,lc)) t in
        let t, ty_t = 
@@ -194,8 +208,8 @@ and instantiate rdb test_eq_only metasenv subst context n lc t swap =
            if ft == t then 
              (prerr_endline ( ("ILLTYPED: " ^ 
                 NCicPp.ppterm ~metasenv ~subst ~context t
-            ^ "\nBECAUSE:" ^ Lazy.force msg ^ "\nCONTEXT:\n" ^
-            ppcontext ~metasenv ~subst context ^ "\nMENV:\n" ^
+            ^ "\nBECAUSE:" ^ Lazy.force msg ^ 
+            ppcontext ~metasenv ~subst context ^ 
             ppmetasenv ~subst metasenv
             ));
                      assert false)
@@ -251,7 +265,7 @@ and instantiate rdb test_eq_only metasenv subst context n lc t swap =
   in
          pp (lazy(string_of_int n ^ " := 222 = "^
            NCicPp.ppterm ~metasenv ~subst ~context:ctx t
-         ^ "\n" ^ ppmetasenv ~subst metasenv));
+         ^ ppmetasenv ~subst metasenv));
   (* Unifying the types may have already instantiated n. *)
   try
     let _, _,oldt,_ = NCicUtils.lookup_subst n subst in
@@ -276,7 +290,7 @@ and unify rdb test_eq_only metasenv subst context t1 t2 =
    let fo_unif test_eq_only metasenv subst t1 t2 =
     (*D*) inside 'F'; try let rc =  
      pp (lazy("  " ^ NCicPp.ppterm ~metasenv ~subst ~context t1 ^ " ==?== " ^ 
-         NCicPp.ppterm ~metasenv ~subst ~context t2 ^ "\n" ^ ppmetasenv
+         NCicPp.ppterm ~metasenv ~subst ~context t2 ^ ppmetasenv
          ~subst metasenv));
      if t1 === t2 then
        metasenv, subst
@@ -661,18 +675,21 @@ pp (lazy (string_of_bool norm1 ^ " ?? " ^ string_of_bool norm2));
           | Uncertain _ -> raise exn
  (*D*)  in outside(); rc with exn -> outside (); raise exn 
 
-and delift_term_wrt_terms rdb metasenv subst context t args =
-  let metasenv, _, instance, _ =
-    NCicMetaSubst.mk_meta metasenv context `Term in
-  let meta_applied = NCicUntrusted.mk_appl instance args in
-  let metasenv,subst,meta_applied,_ =
-    !refiner_typeof ((rdb:> NRstatus.status)#set_coerc_db NCicCoercion.empty_db)
-      metasenv subst context meta_applied None
+and delift_type_wrt_terms rdb metasenv subst context t args =
+  let (metasenv, subst), t =
+   try
+    NCicMetaSubst.delift 
+      ~unify:(fun m s c t1 t2 -> 
+         let ind = !indent in
+         let res = 
+           try Some (unify rdb false m s c t1 t2 )
+           with UnificationFailure _ | Uncertain _ -> None
+         in
+         indent := ind; res)
+      metasenv subst context 0 (0,NCic.Ctx (args @ 
+        List.rev (mk_irl (List.length context)))) t
+   with NCicMetaSubst.MetaSubstFailure _ -> (metasenv, subst), t
   in
-  let metasenv, subst =
-   unify rdb true metasenv subst context meta_applied t in
-  let t = NCicSubstitution.lift (List.length args) instance in
-  let t = NCicUntrusted.mk_appl t (mk_irl (List.length args)) in
    metasenv, subst, t
 ;;
 
@@ -681,4 +698,4 @@ let unify rdb ?(test_eq_only=false) =
   indent := "";      
   unify rdb test_eq_only;;
 
-let fix_sorts = fix_sorts false (UnificationFailure (lazy "no sup"));;
+let fix_sorts = fix_sorts true (UnificationFailure (lazy "no sup"));;