- Grammar for all obj commands ported to NG (let recs and inductives still need

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

diff --git a/helm/software/components/ng_refiner/nCicRefiner.ml b/helm/software/components/ng_refiner/nCicRefiner.ml
index 1cd2e54b96614a37ae097022799f109a964d7765..d73b4fddb5345db76a5663bf717a63bff111ba47 100644 (file)
--- a/helm/software/components/ng_refiner/nCicRefiner.ml
+++ b/helm/software/components/ng_refiner/nCicRefiner.ml
@@ -60,7 +60,7 @@ let check_allowed_sort_elimination hdb localise r orig =
         NCicPp.ppmetasenv ~subst metasenv));
      match arity1 with
      | C.Prod (name,so1,de1) (* , t ==?== C.Prod _ *) ->
-        let metasenv, meta, _ = 
+        let metasenv, _, meta, _ = 
           NCicMetaSubst.mk_meta metasenv ((name,C.Decl so1)::context) `Type 
         in
         let metasenv, subst = 
@@ -74,7 +74,7 @@ let check_allowed_sort_elimination hdb localise r orig =
         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 [] `Type in
+        let metasenv, _, meta, _ = NCicMetaSubst.mk_meta metasenv [] `Type in
         let metasenv, subst = 
           try NCicUnification.unify hdb metasenv subst context 
                 arity2 (C.Prod ("_", ind, meta)) 
@@ -145,7 +145,7 @@ let rec typeof hdb
           NCicPp.ppterm ~subst ~metasenv ~context t)))
     | C.Sort _ -> metasenv,subst,t,(C.Sort (C.Type NCicEnvironment.type0))
     | C.Implicit infos -> 
-         let metasenv,t,ty = exp_implicit metasenv context expty infos in
+         let metasenv,_,t,ty = exp_implicit metasenv context expty infos in
          metasenv, subst, t, ty 
     | C.Meta (n,l) as t -> 
        let ty =
@@ -153,7 +153,11 @@ let rec typeof hdb
          let _,_,_,ty = NCicUtils.lookup_subst n subst in ty 
         with NCicUtils.Subst_not_found _ -> try
          let _,_,ty = NCicUtils.lookup_meta n metasenv in 
-         match ty with C.Implicit _ -> assert false | _ -> ty 
+         match ty with C.Implicit _ -> 
+                 prerr_endline (string_of_int n);
+                 prerr_endline (NCicPp.ppmetasenv ~subst metasenv);
+                 prerr_endline (NCicPp.ppsubst ~metasenv subst);
+                 assert false | _ -> ty 
         with NCicUtils.Meta_not_found _ ->
          raise (AssertFailure (lazy (Printf.sprintf
           "%s not found" (NCicPp.ppterm ~subst ~metasenv ~context t))))
@@ -259,6 +263,22 @@ let rec typeof hdb
       in 
       let metasenv, subst, outtype, outsort = 
         typeof_aux metasenv subst context None outtype in
+
+      (* next lines are to do a subst-expansion of the outtype, so
+         that when it becomes a beta-abstraction, the beta-redex is
+         fired during substitution *)
+      (*CSC: this is instantiate! should we move it from tactics to the
+             refiner? I think so! *)
+      let metasenv,metanoouttype,newouttype,metaoutsort =
+       NCicMetaSubst.mk_meta metasenv context `Term in
+      let metasenv,subst =
+       NCicUnification.unify hdb metasenv subst context outsort metaoutsort in
+      let metasenv =
+       List.filter (function (j,_) -> j <> metanoouttype) metasenv in
+      let subst =
+       (metanoouttype,(Some "outtype",context,outtype,metaoutsort))::subst in
+      let outtype = newouttype in
+
       (* let's control if the sort elimination is allowed: [(I q1 ... qr)|B] *)
       let ind =
         if parameters = [] then C.Const r
@@ -305,7 +325,7 @@ let rec typeof hdb
       let resty = C.Appl (outtype::arguments@[term]) in
       let resty = NCicReduction.head_beta_reduce ~subst resty in
       metasenv, subst, C.Match (r, outtype, term, List.rev pl_rev),resty
-    | C.Match _ as orig -> assert false
+    | C.Match _ -> assert false
     in
     pp (lazy (NCicPp.ppterm ~metasenv ~subst ~context t ^ " :: "^
          NCicPp.ppterm ~metasenv ~subst ~context infty ));
@@ -423,7 +443,7 @@ and eat_prods hdb
           let metasenv, subst, arg, ty_arg = 
             typeof hdb ~look_for_coercion ~localise 
               metasenv subst context arg None in
-          let metasenv, meta, _ = 
+          let metasenv, _, meta, _ = 
             NCicMetaSubst.mk_meta metasenv 
               (("_",C.Decl ty_arg) :: context) `Type
           in
@@ -582,7 +602,7 @@ let typeof_obj hdb
        uri, height, metasenv, subst, 
          C.Fixpoint (inductive, fl, attr)
 
-  | C.Inductive (ind, leftno, itl, attr) ->  assert false
+  | C.Inductive (_ind, _leftno, _itl, _attr) ->  assert false
 (*
   (* let's check if the arity of the inductive types are well formed *)
   List.iter (fun (_,_,x,_) -> ignore (typeof ~subst ~metasenv [] x)) tyl;