some bug fixed

diff --git a/helm/software/components/ng_refiner/nCicRefiner.ml b/helm/software/components/ng_refiner/nCicRefiner.ml
index 36e9b3d24b3cc6c81e39cd3e86556f968f4dcab2..10eff13b41734ae7b192c0d3b3408139c3fc8090 100644 (file)
--- a/helm/software/components/ng_refiner/nCicRefiner.ml
+++ b/helm/software/components/ng_refiner/nCicRefiner.ml
@@ -18,6 +18,16 @@ exception AssertFailure of string Lazy.t;;
 module C = NCic
 module Ref = NReference
 
+let indent = ref "";;
+let inside c = indent := !indent ^ String.make 1 c;;
+let outside () = indent := String.sub !indent 0 (String.length !indent -1);;
+
+let pp s = 
+  prerr_endline (Printf.sprintf "%-20s" !indent ^ " " ^ Lazy.force s)
+;;  
+
+(* let pp _ = ();; *)
+
 let wrap_exc msg = function
   | NCicUnification.Uncertain _ -> Uncertain msg
   | NCicUnification.UnificationFailure _ -> RefineFailure msg
@@ -40,9 +50,10 @@ let force_to_sort metasenv subst context t =
      metasenv, subst, t
   | C.Meta (i,(_,lc)) as t ->
      let len = match lc with C.Irl len->len | C.Ctx l->List.length l in
-     prerr_endline "RESTRICT";
      let metasenv, subst, _ = 
-       NCicMetaSubst.restrict metasenv subst i (HExtlib.list_seq 1 len) 
+       if len > 0 then
+         NCicMetaSubst.restrict metasenv subst i (HExtlib.list_seq 1 (len+1)) 
+       else metasenv, subst, 0
      in
      metasenv, subst, t
   | C.Sort _ -> metasenv, subst, t 
@@ -55,8 +66,6 @@ let sort_of_prod
    let metasenv, subst, t1 = force_to_sort metasenv subst context t1 in
    let metasenv, subst, t2 = 
      force_to_sort metasenv subst ((name,C.Decl s)::context) t2 in
-   prerr_endline ("S1:"^NCicPp.ppterm ~metasenv ~subst ~context t1);
-   prerr_endline ("S2:"^NCicPp.ppterm ~metasenv ~subst ~context:((name,C.Decl s)::context) t2);
    match t1, t2 with
    | C.Sort _, C.Sort C.Prop -> metasenv, subst, t2
    | C.Sort (C.Type u1), C.Sort (C.Type u2) ->
@@ -83,6 +92,7 @@ let check_allowed_sort_elimination localise r orig =
      | t -> C.Appl [t;arg] in
    (* ctx, ind_type @ lefts, sort_of_ind_ty@lefts, outsort *)
    let rec aux metasenv subst context ind arity1 arity2 =
+     (*D*)inside 'S'; try let rc = 
      let arity1 = NCicReduction.whd ~subst context arity1 in
      match arity1 with
      | C.Prod (name,so1,de1) (* , t ==?== C.Prod _ *) ->
@@ -101,10 +111,6 @@ let check_allowed_sort_elimination localise r orig =
          (mkapp (NCicSubstitution.lift 1 ind) (C.Rel 1)) de1 meta
      | C.Sort _ (* , t ==?== C.Prod _ *) ->
         let metasenv, meta, _ = NCicMetaSubst.mk_meta metasenv [] `Typeless in
-        prerr_endline (
-            (NCicPp.ppterm ~subst ~metasenv ~context (C.Prod ("_", ind, meta))) ^ " ==== " ^
-            (NCicPp.ppterm ~subst ~metasenv ~context arity2) ^ "\nMENV:\n"
-            ^ NCicPp.ppmetasenv ~subst metasenv);
         let metasenv, subst = 
           try NCicUnification.unify metasenv subst context 
                 (C.Prod ("_", ind, meta)) arity2 
@@ -119,6 +125,7 @@ let check_allowed_sort_elimination localise r orig =
         with exc -> raise (wrap_exc (lazy (localise orig, 
           "Sort elimination not allowed ")) exc))
      | _ -> assert false
+     (*D*)in outside(); rc with exc -> outside (); raise exc
    in
     aux
 ;;
@@ -126,16 +133,17 @@ let check_allowed_sort_elimination localise r orig =
 let rec typeof 
   ?(localise=fun _ -> Stdpp.dummy_loc) metasenv subst context term expty 
 =
-  let force_ty metasenv subst context orig t infty = function
+  let force_ty metasenv subst context orig t infty expty =
+    (*D*)inside 'F'; try let rc = 
+    match expty with
     | Some expty ->
        (match t with
        | C.Implicit _ 
        | C.Lambda _ -> metasenv, subst, t, expty
        | _ ->
-          prerr_endline ("F:" ^
+          pp (lazy (
           (NCicPp.ppterm ~metasenv ~subst ~context infty) ^  " === " ^
-          (NCicPp.ppterm ~metasenv ~subst ~context expty) ^ "\nMENV:\n" ^
-          NCicPp.ppmetasenv ~subst metasenv);
+          (NCicPp.ppterm ~metasenv ~subst ~context expty)));
          let metasenv, subst = 
            try NCicUnification.unify metasenv subst context infty expty
            with exc -> raise (wrap_exc (lazy (localise orig, Printf.sprintf
@@ -146,10 +154,12 @@ let rec typeof
          in
          metasenv, subst, t, expty)
     | None -> metasenv, subst, t, infty
+    (*D*)in outside(); rc with exc -> outside (); raise exc
   in
   let rec typeof_aux metasenv subst context expty = 
     fun t as orig -> 
-    prerr_endline ("R:"^NCicPp.ppterm ~metasenv ~subst ~context t);
+    (*D*)inside 'R'; try let rc = 
+    pp (lazy (NCicPp.ppterm ~metasenv ~subst ~context t));
     let metasenv, subst, t, infty = 
     match t with
     | C.Rel n ->
@@ -184,15 +194,15 @@ let rec typeof
        metasenv, subst, t, NCicSubstitution.subst_meta l ty
     | C.Const _ -> 
        metasenv, subst, t, NCicTypeChecker.typeof ~subst ~metasenv context t
-    | C.Prod (name,(s as orig_s),(t as orig_t)) as orig ->
+    | C.Prod (name,(s as orig_s),(t as orig_t)) ->
        let metasenv, subst, s, s1 = typeof_aux metasenv subst context None s in
-       let context = (name,(C.Decl s))::context in
-       let metasenv, subst, t, s2 = typeof_aux metasenv subst context None t in
+       let context1 = (name,(C.Decl s))::context in
+       let metasenv, subst, t, s2 = typeof_aux metasenv subst context1 None t in
        let metasenv, subst, ty = 
          sort_of_prod localise metasenv subst 
            context orig_s orig_t (name,s) t (s1,s2)
        in
-       metasenv, subst, orig, ty
+       metasenv, subst, NCic.Prod(name,s,t), ty
     | C.Lambda (n,(s as orig_s),t) ->
        let exp_s, exp_ty_t =
          match expty with
@@ -227,12 +237,12 @@ let rec typeof
        let metasenv, subst, _ = force_to_sort metasenv subst context ty_ty in
        let metasenv, subst, t, _ = 
          typeof_aux metasenv subst context (Some ty) t in
-       let context = (n, C.Def (t,ty)) :: context in
+       let context1 = (n, C.Def (t,ty)) :: context in
        let metasenv, subst, bo, bo_ty = 
-         typeof_aux metasenv subst context expty bo 
+         typeof_aux metasenv subst context1 None bo 
        in
-       metasenv, subst, C.LetIn (n, ty, t, bo), 
-        NCicSubstitution.subst ~avoid_beta_redexes:true t bo_ty
+       let bo_ty = NCicSubstitution.subst ~avoid_beta_redexes:true t bo_ty in
+       metasenv, subst, C.LetIn (n, ty, t, bo), bo_ty
     | C.Appl ((he as orig_he)::(_::_ as args)) ->
        let metasenv, subst, he, ty_he = 
          typeof_aux metasenv subst context None he in
@@ -289,10 +299,12 @@ let rec typeof
     | C.Match _ -> assert false
     in
       force_ty metasenv subst context orig t infty expty
+    (*D*)in outside(); rc with exc -> outside (); raise exc
   in
     typeof_aux metasenv subst context expty term
 
 and eat_prods localise metasenv subst context orig_he he ty_he args =
+  (*D*)inside 'E'; try let rc = 
   let rec aux metasenv subst args_so_far ty_he = function 
   | [] -> metasenv, subst, NCic.Appl (he :: List.rev args_so_far), ty_he
   | arg::tl ->
@@ -310,11 +322,11 @@ and eat_prods localise metasenv subst context orig_he he ty_he args =
               (("_",C.Decl ty_arg) :: context) `Type
           in
           let flex_prod = C.Prod ("_", ty_arg, meta) in
-          prerr_endline ("F:" ^
-          (NCicPp.ppterm ~metasenv ~subst ~context t) ^  " === " ^
-          (NCicPp.ppterm ~metasenv ~subst ~context flex_prod) ^ "\nMENV:\n" ^
-          NCicPp.ppmetasenv ~subst metasenv ^ "\nCTX:\n" ^
-          NCicPp.ppcontext ~metasenv ~subst context);
+          pp (lazy ( "UNIFICATION in CTX:\n"^ 
+            NCicPp.ppcontext ~metasenv ~subst context ^ "\nMENV:\n" ^
+            NCicPp.ppmetasenv ~subst metasenv ^ "\nOF: " ^
+            NCicPp.ppterm ~metasenv ~subst ~context t ^  " === " ^
+            NCicPp.ppterm ~metasenv ~subst ~context flex_prod ^ "\n"));
           let metasenv, subst = 
              try NCicUnification.unify metasenv subst context t flex_prod 
              with exc -> raise (wrap_exc (lazy (localise orig_he, Printf.sprintf
@@ -327,5 +339,6 @@ and eat_prods localise metasenv subst context orig_he he ty_he args =
           aux metasenv subst (arg :: args_so_far) meta tl
   in
    aux metasenv subst [] ty_he args
+  (*D*)in outside(); rc with exc -> outside (); raise exc
 ;;
 (* vim:set foldmethod=marker: *)