X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Fng_refiner%2FnCicRefiner.ml;h=eb7b136c28f3ba948c9048a5f247241614181499;hb=e1ffde2ba67b8a2f7d4d97898ba28afd65d96ea7;hp=cae9cf54fcec9e0590eae6032077715bf8d8c504;hpb=5c7b30c4b1033352578c6e38e4fcff4eb0930c44;p=helm.git

diff --git a/helm/software/components/ng_refiner/nCicRefiner.ml b/helm/software/components/ng_refiner/nCicRefiner.ml
index cae9cf54f..eb7b136c2 100644
--- a/helm/software/components/ng_refiner/nCicRefiner.ml
+++ b/helm/software/components/ng_refiner/nCicRefiner.ml
@@ -18,6 +18,18 @@ 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
@@ -26,30 +38,36 @@ let wrap_exc msg = function
 ;;
 
 let exp_implicit metasenv context expty =
+ let foo x = match expty with Some t -> `WithType t | None -> x in
  function      
-  | `Closed -> NCicMetaSubst.mk_meta metasenv [] expty
-  | `Type | `Term -> NCicMetaSubst.mk_meta metasenv context expty
+  | `Closed -> NCicMetaSubst.mk_meta metasenv [] (foo `Type)
+  | `Type -> NCicMetaSubst.mk_meta metasenv context (foo `Type)
+  | `Term -> NCicMetaSubst.mk_meta metasenv context (foo `Term)
+  | _ -> assert false
+;;
+
+let force_to_sort metasenv subst context t =
+  match NCicReduction.whd ~subst context t with
+  | C.Meta (_,(_,(C.Irl 0 | C.Ctx []))) as 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
+     let metasenv, subst, _ = 
+       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 
   | _ -> assert false
 ;;
 
 let sort_of_prod 
   localise metasenv subst context orig_s orig_t (name,s) t (t1, t2) 
 =
-   let restrict metasenv subst = function
-     | C.Meta (_,(_,(C.Irl 0 | C.Ctx []))) as 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
-        let metasenv, subst, _ = 
-          NCicMetaSubst.restrict metasenv subst i (HExtlib.list_seq 1 len) 
-        in
-        metasenv, subst, t
-     | t -> metasenv, subst, t 
-   in
-   let t1 = NCicReduction.whd ~subst context t1 in
-   let t2 = NCicReduction.whd ~subst ((name,C.Decl s)::context) t2 in
-   let metasenv, subst, t1 = restrict metasenv subst t1 in
-   let metasenv, subst, t2 = restrict metasenv subst t2 in
+   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
    match t1, t2 with
    | C.Sort _, C.Sort C.Prop -> metasenv, subst, t2
    | C.Sort (C.Type u1), C.Sort (C.Type u2) ->
@@ -76,39 +94,44 @@ 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
+     pp (lazy(NCicPp.ppterm ~subst ~metasenv ~context arity1 ^ " ... " ^
+        NCicPp.ppterm ~subst ~metasenv ~context arity2 ^ "\nNEV:"^
+NCicPp.ppmetasenv ~subst metasenv
+));
      match arity1 with
      | C.Prod (name,so1,de1) (* , t ==?== C.Prod _ *) ->
         let metasenv, meta, _ = 
-          NCicMetaSubst.mk_meta metasenv ((name,C.Decl so1)::context) None 
+          NCicMetaSubst.mk_meta metasenv ((name,C.Decl so1)::context) `Type 
         in
         let metasenv, subst = 
           try NCicUnification.unify metasenv subst context 
-                (C.Prod (name, so1, meta)) arity2 
+                arity2 (C.Prod (name, so1, meta)) 
           with exc -> raise (wrap_exc (lazy (localise orig, Printf.sprintf
             "expected %s, found %s" (* XXX localizzare meglio *)
-            (NCicPp.ppterm ~subst ~metasenv ~context arity1)
+            (NCicPp.ppterm ~subst ~metasenv ~context (C.Prod (name, so1, meta)))
             (NCicPp.ppterm ~subst ~metasenv ~context arity2))) exc)
         in
         aux metasenv subst ((name, C.Decl so1)::context)
          (mkapp (NCicSubstitution.lift 1 ind) (C.Rel 1)) de1 meta
      | C.Sort _ (* , t ==?== C.Prod _ *) ->
-        let metasenv, meta, _ = 
-          NCicMetaSubst.mk_meta metasenv (("_",C.Decl ind)::context) None 
-        in
+        let metasenv, meta, _ = NCicMetaSubst.mk_meta metasenv [] `Type in
         let metasenv, subst = 
           try NCicUnification.unify metasenv subst context 
-                (C.Prod ("_", ind, meta)) arity2 
+                arity2 (C.Prod ("_", ind, meta)) 
           with exc -> raise (wrap_exc (lazy (localise orig, Printf.sprintf
             "expected %s, found %s" (* XXX localizzare meglio *)
-            (NCicPp.ppterm ~subst ~metasenv ~context arity1)
+            (NCicPp.ppterm ~subst ~metasenv ~context (C.Prod ("_", ind, meta)))
             (NCicPp.ppterm ~subst ~metasenv ~context arity2))) exc)
         in
         (try NCicTypeChecker.check_allowed_sort_elimination
-             ~metasenv ~subst r context ind arity1 arity2
+            ~metasenv ~subst r context ind arity1 arity2; 
+            metasenv, subst
         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
 ;;
@@ -116,12 +139,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
        | _ ->
+          pp (lazy (
+          (NCicPp.ppterm ~metasenv ~subst ~context infty) ^  " === " ^
+          (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
@@ -132,9 +160,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 (NCicPp.ppterm ~metasenv ~subst ~context t);*)
+    fun t as orig -> 
+    (*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 ->
@@ -169,15 +200,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
@@ -187,7 +218,9 @@ let rec typeof
              | C.Prod (_,s,t) -> Some s, Some t
              | _ -> None, None
        in
-       let metasenv, subst, s, _ = typeof_aux metasenv subst context None s in
+       let metasenv, subst, s, ty_s = 
+         typeof_aux metasenv subst context None s in
+       let metasenv, subst, _ = force_to_sort metasenv subst context ty_s in
        let (metasenv,subst), exp_ty_t = 
          match exp_s with 
          | Some exp_s -> 
@@ -205,15 +238,17 @@ let rec typeof
        in
        metasenv, subst, C.Lambda(n,s,t), C.Prod (n,s,ty_t)
     | C.LetIn (n,ty,t,bo) ->
-       let metasenv, subst, ty, _ = typeof_aux metasenv subst context None ty in
+       let metasenv, subst, ty, ty_ty = 
+         typeof_aux metasenv subst context None ty in
+       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
@@ -238,8 +273,10 @@ let rec typeof
         else C.Appl ((C.Const r)::parameters) in
       let metasenv, subst, ind, ind_ty = 
         typeof_aux metasenv subst context None ind in
-      check_allowed_sort_elimination localise r orig_term metasenv subst context
-       ind ind_ty outsort;
+      let metasenv, subst = 
+         check_allowed_sort_elimination localise r orig_term metasenv subst 
+           context ind ind_ty outsort 
+      in
       (* let's check if the type of branches are right *)
       if List.length pl <> constructorsno then
        raise (RefineFailure (lazy (localise orig, 
@@ -257,6 +294,9 @@ let rec typeof
               let ty_branch = 
                 NCicTypeChecker.type_of_branch 
                   ~subst context leftno outtype cons ty_cons in
+              pp (lazy ("TYPEOFBRANCH: " ^
+               NCicPp.ppterm ~metasenv ~subst ~context p ^ " ::: " ^
+               NCicPp.ppterm ~metasenv ~subst ~context ty_branch ));
               let metasenv, subst, p, _ = 
                 typeof_aux metasenv subst context (Some ty_branch) p in
               j+1, metasenv, subst, p :: branches)
@@ -268,10 +308,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 ->
@@ -286,9 +328,14 @@ and eat_prods localise metasenv subst context orig_he he ty_he args =
             typeof ~localise metasenv subst context arg None in
           let metasenv, meta, _ = 
             NCicMetaSubst.mk_meta metasenv 
-              (("_",C.Decl ty_arg) :: context) None
+              (("_",C.Decl ty_arg) :: context) `Type
           in
           let flex_prod = C.Prod ("_", ty_arg, meta) in
+          pp (lazy ( "UNIFICATION in CTX:\n"^ 
+            NCicPp.ppcontext ~metasenv ~subst context
+            ^ "\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
@@ -301,5 +348,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: *)