X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_tactics%2FnTacStatus.ml;h=b58eb5558a8d95a2f6ce5564a0ea7ab228f19f2f;hb=3ca99dabf7d136ebd58fa61e7a2d7134c8dc365c;hp=f51f4d2d79b7f06c013de46310a37e882122fafd;hpb=f00757144b2cd7e6457fed55dbc1309d11a542dc;p=helm.git

diff --git a/helm/software/components/ng_tactics/nTacStatus.ml b/helm/software/components/ng_tactics/nTacStatus.ml
index f51f4d2d7..b58eb5558 100644
--- a/helm/software/components/ng_tactics/nTacStatus.ml
+++ b/helm/software/components/ng_tactics/nTacStatus.ml
@@ -49,6 +49,7 @@ let pp_status status =
 
 type cic_term = NCic.context * NCic.term
 let ctx_of (c,_) = c ;;
+let mk_cic_term c t = c,t ;;
 
 let ppterm status t =
  let uri,height,metasenv,subst,obj = status#obj in
@@ -138,7 +139,7 @@ let term_of_cic_term s t c =
   s, t
 ;;
 
-let disambiguate status t ty context =
+let disambiguate status context t ty =
  let status, expty = 
    match ty with 
    | None -> status, None 
@@ -193,10 +194,13 @@ let unify status ctx a b =
 ;;
 let unify a b c d = wrap "unify" (unify a b c) d;;
 
-let fix_sorts (ctx,t) =
+let fix_sorts status (ctx,t) =
  let f () =
-  let t = NCicUnification.fix_sorts t in
-   ctx,t
+  let name,height,metasenv,subst,obj = status#obj in
+  let metasenv, t = 
+    NCicUnification.fix_sorts metasenv subst t in
+  let status = status#set_obj (name,height,metasenv,subst,obj) in
+   status, (ctx,t)
  in
   wrap "fix_sorts" f ()
 ;;
@@ -225,26 +229,39 @@ let get_goalty status g =
  with NCicUtils.Meta_not_found _ as exn -> fail ~exn (lazy "get_goalty")
 ;;
 
-let instantiate status i t =
- let _,_,metasenv,_,_ = status#obj in
- let gname, context, gty = List.assoc i metasenv in
- let status, (_,t), (_,ty) = 
-   refine status context t (Some (context,gty)) 
- in
+let get_subst status =
+  let _,_,_,subst,_ = status#obj in subst
+;;
 
+let to_subst status i entry =
  let name,height,metasenv,subst,obj = status#obj in
  let metasenv = List.filter (fun j,_ -> j <> i) metasenv in
- let subst = (i, (gname, context, t, ty)) :: subst in
+ let subst = (i, entry) :: subst in
   status#set_obj (name,height,metasenv,subst,obj)
 ;;
 
-let mk_meta status ?(attrs=[]) ctx bo_or_ty =
+let instantiate status i t =
+ let _,_,metasenv,_,_ = status#obj in
+ let gname, context, gty = List.assoc i metasenv in
+ let status, (_,t), (_,ty) = refine status context t (Some (context,gty)) in
+  to_subst status i (gname,context,t,ty)
+;;
+
+let instantiate_with_ast status i t =
+ let _,_,metasenv,_,_ = status#obj in
+ let gname, context, gty = List.assoc i metasenv in
+ let ggty = mk_cic_term context gty in
+ let status, (_,t) = disambiguate status context t (Some ggty) in
+  to_subst status i (gname,context,t,gty)
+;;
+
+let mk_meta status ?(attrs=[]) ctx bo_or_ty kind =
   match bo_or_ty with
   | `Decl ty ->
       let status, (_,ty) = relocate status ctx ty in
       let n,h,metasenv,subst,o = status#obj in
       let metasenv, _, instance, _ = 
-        NCicMetaSubst.mk_meta ~attrs metasenv ctx (`WithType ty)
+        NCicMetaSubst.mk_meta ~attrs metasenv ctx ~with_type:ty kind
       in
       let status = status#set_obj (n,h,metasenv,subst,o) in
       status, (ctx,instance)
@@ -253,7 +270,8 @@ let mk_meta status ?(attrs=[]) ctx bo_or_ty =
       let status, (_,ty) = typeof status ctx bo in
       let n,h,metasenv,subst,o = status#obj in
       let metasenv, metano, instance, _ = 
-        NCicMetaSubst.mk_meta ~attrs metasenv ctx (`WithType ty) in
+        NCicMetaSubst.mk_meta ~attrs metasenv ctx ~with_type:ty kind in
+      let attrs,_,_ = NCicUtils.lookup_meta metano metasenv in
       let metasenv = List.filter (fun j,_ -> j <> metano) metasenv in
       let subst = (metano, (attrs, ctx, bo_, ty)) :: subst in
       let status = status#set_obj (n,h,metasenv,subst,o) in
@@ -261,11 +279,11 @@ let mk_meta status ?(attrs=[]) ctx bo_or_ty =
 ;;
 
 let mk_in_scope status t =
-  mk_meta status ~attrs:[`InScope] (ctx_of t) (`Def t)
+  mk_meta status ~attrs:[`InScope] (ctx_of t) (`Def t) `IsTerm
 ;;
 
 let mk_out_scope n status t = 
-  mk_meta status ~attrs:[`OutScope n] (ctx_of t) (`Def t)
+  mk_meta status ~attrs:[`OutScope n] (ctx_of t) (`Def t) `IsTerm
 ;;
 
 (* the following unification problem will be driven by 
@@ -356,7 +374,7 @@ let select_term
     | NCic.Implicit `Hole, t -> 
         (match wanted with
         | Some wanted -> 
-             let status', wanted = disambiguate status wanted None ctx in
+             let status', wanted = disambiguate status ctx wanted None in
              pp(lazy("wanted: "^ppterm status' wanted));
              let (status',found), t' = match_term status' ctx wanted t in
               if found then status',t' else status,t
@@ -391,14 +409,17 @@ let analyse_indty status ty =
  status, (ref, consno, left, right)
 ;;
 
-let mk_cic_term c t = c,t ;;
-
 let apply_subst status ctx t =
  let status, (_,t) = relocate status ctx t in
  let _,_,_,subst,_ = status#obj in
   status, (ctx, NCicUntrusted.apply_subst subst ctx t)
 ;;
 
+let metas_of_term status (context,t) =
+ let _,_,_,subst,_ = status#obj in
+ NCicUntrusted.metas_of_term subst context t
+;;
+
 (* ============= move this elsewhere ====================*)
 
 class ['stack] status =
@@ -437,6 +458,8 @@ let ppelem = function
   | Dead -> "Dead"
 ;;
 
+let string_of_path l = String.concat "." (List.map ppelem l) ;;
+
 let path_string_of (ctx,t) =
   let len_ctx = List.length ctx in
   let rec aux arity = function
@@ -455,7 +478,9 @@ let path_string_of (ctx,t) =
     | NCic.Const (NReference.Ref (u,_)) -> [Constant (u, arity)]
     | NCic.Match _ -> [Dead]
   in 
-    aux 0 t
+  let path = aux 0 t in
+(*   prerr_endline (string_of_path path); *)
+  path
 ;;
 
 let compare e1 e2 =
@@ -466,7 +491,6 @@ let compare e1 e2 =
   | e1,e2 -> Pervasives.compare e1 e2
 ;;
 
-let string_of_path l = String.concat "." (List.map ppelem l) ;;
 
 end