X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Fng_tactics%2FnTacStatus.ml;h=2b310ff38a09d0574957d3d086349f7e65cdceca;hb=86dbca4f0bfda375bdf036ec5ce3bf44678415f2;hp=0bb0d846e9fedc5c3b9bc2a7da01f8b3701e66c5;hpb=8b1a49bbee9eea86eb74c040defe701370ca5893;p=helm.git

diff --git a/helm/software/components/ng_tactics/nTacStatus.ml b/helm/software/components/ng_tactics/nTacStatus.ml
index 0bb0d846e..2b310ff38 100644
--- a/helm/software/components/ng_tactics/nTacStatus.ml
+++ b/helm/software/components/ng_tactics/nTacStatus.ml
@@ -40,10 +40,10 @@ let pp_status status =
   prerr_endline (NCicPp.ppobj status#obj)
 ;;
 
-type cic_term = NCic.conjecture (* name, context, term *)
-let ctx_of (_,c,_) = c ;;
+type cic_term = NCic.context * NCic.term
+let ctx_of (c,_) = c ;;
 
-let relocate status destination (name,source,t as orig) =
+let relocate status destination (source,t as orig) =
  if source == destination then status, orig else
   let u, d, metasenv, subst, o = status#obj in 
   let rec lcp ctx j i = function
@@ -90,18 +90,18 @@ let relocate status destination (name,source,t as orig) =
      metasenv subst source 0 lc t
   in
   let status = status#set_obj (u, d, metasenv, subst, o) in
-  status, (name, destination, t)
+  status, (destination, t)
 ;;
 let relocate a b c = wrap (relocate a b) c;;
 
 let term_of_cic_term s t c = 
-  let s, (_,_,t) = relocate s c t in
+  let s, (_,t) = relocate s c t in
   s, t
 ;;
 
 let ppterm status t =
  let uri,height,metasenv,subst,obj = status#obj in
- let _,context,t = t in
+ let context,t = t in
   NCicPp.ppterm ~metasenv ~subst ~context t
 ;;
 
@@ -110,80 +110,83 @@ let disambiguate status t ty context =
    match ty with 
    | None -> status, None 
    | Some ty -> 
-       let status, (_,_,x) = relocate status context ty in status, Some x 
+       let status, (_,x) = relocate status context ty in status, Some x 
  in
  let uri,height,metasenv,subst,obj = status#obj in
  let metasenv, subst, status, t = 
    GrafiteDisambiguate.disambiguate_nterm expty status context metasenv subst t 
  in
  let new_pstatus = uri,height,metasenv,subst,obj in
-  status#set_obj new_pstatus, (None, context, t) 
+  status#set_obj new_pstatus, (context, t) 
 ;;
 let disambiguate a b c d = wrap (disambiguate a b c) d;;
 
 let typeof status ctx t =
-  let status, (_,_,t) = relocate status ctx t in
+  let status, (_,t) = relocate status ctx t in
   let _,_,metasenv,subst,_ = status#obj in
   let ty = NCicTypeChecker.typeof ~subst ~metasenv ctx t in
-  status, (None, ctx, ty)
+  status, (ctx, ty)
 ;;
 let typeof a b c = wrap (typeof a b) c;;
   
 let whd status ?delta ctx t =
-  let status, (name,_,t) = relocate status ctx t in
+  let status, (_,t) = relocate status ctx t in
   let _,_,_,subst,_ = status#obj in
   let t = NCicReduction.whd ~subst ?delta ctx t in
-  status, (name, ctx, t)
+  status, (ctx, t)
 ;;
   
 let normalize status ?delta ctx t =
-  let status, (name,_,t) = relocate status ctx t in
+  let status, (_,t) = relocate status ctx t in
   let _,_,_,subst,_ = status#obj in
   let t = NCicTacReduction.normalize ~subst ?delta ctx t in
-  status, (name, ctx, t)
+  status, (ctx, t)
 ;;
   
 let unify status ctx a b =
-  let status, (_,_,a) = relocate status ctx a in
-  let status, (_,_,b) = relocate status ctx b in
+  let status, (_,a) = relocate status ctx a in
+  let status, (_,b) = relocate status ctx b in
   let n,h,metasenv,subst,o = status#obj in
   let metasenv, subst = NCicUnification.unify status metasenv subst ctx a b in
    status#set_obj (n,h,metasenv,subst,o)
 ;;
 let unify a b c d = wrap (unify a b c) d;;
 
-let fix_sorts (name,ctx,t) =
+let fix_sorts (ctx,t) =
  let f () =
   let t = NCicUnification.fix_sorts t in
-   name,ctx,t
+   ctx,t
  in
   wrap f ()
 ;;
 
 let refine status ctx term expty =
-  let status, (nt,_,term) = relocate status ctx term in
-  let status, ne, expty = 
-    match expty with None -> status, None, None 
+  let status, (_,term) = relocate status ctx term in
+  let status, expty = 
+    match expty with
+      None -> status, None 
     | Some e -> 
-        let status, (n,_, e) = relocate status ctx e in status, n, Some e
+        let status, (_, e) = relocate status ctx e in status, Some e
   in
   let name,height,metasenv,subst,obj = status#obj in
   let metasenv,subst,t,ty = 
    NCicRefiner.typeof status metasenv subst ctx term expty
   in
-   status#set_obj (name,height,metasenv,subst,obj), (nt,ctx,t), (ne,ctx,ty)
+   status#set_obj (name,height,metasenv,subst,obj), (ctx,t), (ctx,ty)
 ;;
 let refine a b c d = wrap (refine a b c) d;;
 
 let get_goalty status g =
  let _,_,metasenv,_,_ = status#obj in
- List.assoc g metasenv
+ let _, a, b = List.assoc g metasenv in
+ a, b
 ;;
 
 let instantiate status i t =
- let (gname, context, _ as gty) = get_goalty status i in
- let status, (_,_,t), (_,_,ty) = 
-   refine status (ctx_of gty) t (Some gty) 
+ 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 name,height,metasenv,subst,obj = status#obj in
@@ -192,34 +195,34 @@ let instantiate status i t =
   status#set_obj (name,height,metasenv,subst,obj)
 ;;
 
-let mk_meta status ?name ctx bo_or_ty =
+let mk_meta status ?(attrs=[]) ctx bo_or_ty =
   match bo_or_ty with
   | `Decl ty ->
-      let status, (_,_,ty) = relocate status ctx ty in
+      let status, (_,ty) = relocate status ctx ty in
       let n,h,metasenv,subst,o = status#obj in
       let metasenv, _, instance, _ = 
-        NCicMetaSubst.mk_meta ?name metasenv ctx (`WithType ty)
+        NCicMetaSubst.mk_meta ~attrs metasenv ctx (`WithType ty)
       in
       let status = status#set_obj (n,h,metasenv,subst,o) in
-      status, (None,ctx,instance)
+      status, (ctx,instance)
   | `Def bo ->
-      let status, (_,_,bo_ as bo) = relocate status ctx bo in
-      let status, (_,_,ty) = typeof status ctx bo in
+      let status, (_,bo_ as bo) = relocate status ctx bo in
+      let status, (_,ty) = typeof status ctx bo in
       let n,h,metasenv,subst,o = status#obj in
       let metasenv, metano, instance, _ = 
-        NCicMetaSubst.mk_meta ?name metasenv ctx (`WithType ty) in
+        NCicMetaSubst.mk_meta ~attrs metasenv ctx (`WithType ty) in
       let metasenv = List.filter (fun j,_ -> j <> metano) metasenv in
-      let subst = (metano, (name, ctx, bo_, ty)) :: subst in
+      let subst = (metano, (attrs, ctx, bo_, ty)) :: subst in
       let status = status#set_obj (n,h,metasenv,subst,o) in
-      status, (None,ctx,instance)
+      status, (ctx,instance)
 ;;
 
-let mk_in_scope status t = 
-  mk_meta status ~name:NCicMetaSubst.in_scope_tag (ctx_of t) (`Def t)
+let mk_in_scope status t =
+  mk_meta status ~attrs:[`InScope] (ctx_of t) (`Def t)
 ;;
 
 let mk_out_scope n status t = 
-  mk_meta status ~name:(NCicMetaSubst.out_scope_tag n) (ctx_of t) (`Def t)
+  mk_meta status ~attrs:[`OutScope n] (ctx_of t) (`Def t)
 ;;
 
 (* the following unification problem will be driven by 
@@ -233,11 +236,11 @@ let mk_out_scope n status t =
  *  postprocess is called on the entire term after selection
  *)
 let select_term 
-  low_status ~found ~postprocess (name,context,term) (wanted,path) 
+  low_status ~found ~postprocess (context,term) (wanted,path) 
 =
   let is_found status ctx t wanted =
     (* we could lift wanted step-by-step *)
-    try true, unify status ctx (None, ctx, t) wanted
+    try true, unify status ctx (ctx, t) wanted
     with 
     | Error (_, Some (NCicUnification.UnificationFailure _))
     | Error (_, Some (NCicUnification.Uncertain _)) -> false, status
@@ -246,7 +249,7 @@ let select_term
     let rec aux ctx (status,already_found) t =
       let b, status = is_found status ctx t wanted in
       if b then
-         let status , (_,_,t) = found status (None, ctx, t) in 
+         let status , (_,t) = found status (ctx, t) in 
          (status,true),t
       else
         let _,_,_,subst,_ = status#obj in
@@ -313,7 +316,7 @@ let select_term
              let (status',found), t' = match_term status' ctx wanted t in
               if found then status',t' else status,t
         | None ->
-           let (status,_),t = match_term status ctx (None,ctx,t) t in
+           let (status,_),t = match_term status ctx (ctx,t) t in
             status,t)
     | NCic.Implicit _, t -> status, t
     | _,t -> 
@@ -322,7 +325,7 @@ let select_term
           NCicPp.ppterm ~metasenv:[] ~subst:[] ~context:[] t))
   in
   let status, term = select low_status context path term in
-  let term = (name, context, term) in
+  let term = (context, term) in
   postprocess status term
 ;;
 
@@ -330,9 +333,9 @@ let analyse_indty status ty =
  let status, reduct = whd status (ctx_of ty) ty in
  let ref, args =
   match reduct with
-   | _,_,NCic.Const ref -> ref, []
-   | _,_,NCic.Appl (NCic.Const ref :: args) -> ref, args
-   | _,_,_ -> fail (lazy ("not an inductive type")) in
+   | _,NCic.Const ref -> ref, []
+   | _,NCic.Appl (NCic.Const ref :: args) -> ref, args
+   | _,_ -> fail (lazy ("not an inductive type")) in
  let _,lno,tl,_,i = NCicEnvironment.get_checked_indtys ref in
  let _,_,_,cl = List.nth tl i in
  let consno = List.length cl in
@@ -340,12 +343,12 @@ let analyse_indty status ty =
  status, (ref, consno, left, right)
 ;;
 
-let mk_cic_term c t = None,c,t ;;
+let mk_cic_term c t = c,t ;;
 
 let apply_subst status ctx t =
- let status, (name,_,t) = relocate status ctx t in
+ let status, (_,t) = relocate status ctx t in
  let _,_,_,subst,_ = status#obj in
-  status, (name, ctx, NCicUntrusted.apply_subst subst ctx t)
+  status, (ctx, NCicUntrusted.apply_subst subst ctx t)
 ;;
 
 (* ============= move this elsewhere ====================*)