X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_tactics%2FnTacStatus.ml;h=29eee6b7bf09da98310c0049ea98f1c71f18b05d;hb=2b837ca9e298eb44eee95d9ca0e331c577785dcb;hp=4bc751f3a531249392750f03aba94f0195f4b11f;hpb=b438322c4140e3d2395d693e9c5f0e96934436a0;p=helm.git

diff --git a/helm/software/components/ng_tactics/nTacStatus.ml b/helm/software/components/ng_tactics/nTacStatus.ml
index 4bc751f3a..29eee6b7b 100644
--- a/helm/software/components/ng_tactics/nTacStatus.ml
+++ b/helm/software/components/ng_tactics/nTacStatus.ml
@@ -43,38 +43,76 @@ let pp_lowtac_status status =
 type cic_term = NCic.conjecture (* name, context, term *)
 let ctx_of (_,c,_) = c ;;
 
-let relocate context (name,ctx,t as term) =
-  let is_prefix l1 l2 =
-    let rec aux = function
-      | [],[] -> true
-      | x::xs, y::ys -> x=y && aux (xs,ys)
-      | _ -> false
-    in
-      aux (List.rev l1, List.rev l2)
+let relocate status destination (name,source,t as orig) =
+ if source == destination then status, orig else
+  let u, d, metasenv, subst, o = status.pstatus in 
+  let rec lcp ctx j i = function
+    | (n1, NCic.Decl t1 as e)::cl1, (n2, NCic.Decl t2)::cl2 ->
+        if n1 = n2 && 
+           NCicReduction.are_convertible ctx ~subst ~metasenv t1 t2 then
+          NCic.Rel i :: lcp (e::ctx)(j-1) (i-1) (cl1,cl2)
+        else
+          HExtlib.mk_list (NCic.Appl 
+            [NCic.Sort NCic.Prop; NCic.Sort NCic.Prop]) j
+    | (n1, NCic.Def (b1,t1) as e)::cl1, (n2, NCic.Def (b2,t2))::cl2 ->
+        if n1 = n2 && 
+           NCicReduction.are_convertible ctx ~subst ~metasenv t1 t2 &&
+           NCicReduction.are_convertible ctx ~subst ~metasenv b1 b2 then
+          NCic.Rel i :: lcp (e::ctx)(j-1) (i-1) (cl1,cl2)
+        else
+          HExtlib.mk_list (NCic.Appl 
+            [NCic.Sort NCic.Prop; NCic.Sort NCic.Prop]) j
+    | (n1, NCic.Def (b1,t1) as e)::cl1, (n2, NCic.Decl t2)::cl2 ->
+        if n1 = n2 && 
+           NCicReduction.are_convertible ctx ~subst ~metasenv t1 t2 then
+          NCic.Rel i :: lcp (e::ctx)(j-1) (i-1) (cl1,cl2)
+        else
+          HExtlib.mk_list (NCic.Appl 
+            [NCic.Sort NCic.Prop; NCic.Sort NCic.Prop]) j
+    | (n1, NCic.Decl _)::cl1, (n2, NCic.Def _)::cl2 -> assert false
+    | _::_, [] -> 
+          HExtlib.mk_list (NCic.Appl 
+            [NCic.Sort NCic.Prop; NCic.Sort NCic.Prop]) j
+    | _ -> []
   in
-  if ctx == context then term else 
-  if ctx = context then term else 
-  if is_prefix ctx context then 
-    (name, context, 
-      NCicSubstitution.lift (List.length context - List.length ctx) t)
-  else
-    assert false
+  let lc = 
+    lcp [] (List.length destination) (List.length source) 
+      (List.rev destination, List.rev source)
+  in
+  let lc = (0,NCic.Ctx (List.rev lc)) in
+  let db = NCicUnifHint.db () in (* XXX fixme *)
+  let (metasenv, subst), t =
+    NCicMetaSubst.delift 
+       ~unify:(fun m s c t1 t2 -> 
+         try Some (NCicUnification.unify db m s c t1 t2)
+         with 
+          | NCicUnification.UnificationFailure _ 
+          | NCicUnification.Uncertain _ -> None) 
+     metasenv subst source 0 lc t
+  in
+  let status = { status with pstatus = u, d, metasenv, subst, o } in
+  status, (name, destination, t)
 ;;
 
-let term_of_cic_term t c = 
-  let _,_,t = relocate c t in
-  t
+let term_of_cic_term s t c = 
+  let s, (_,_,t) = relocate s c t in
+  s, t
 ;;
 
-type ast_term = string * int * CicNotationPt.term
-
-let disambiguate (status : lowtac_status) (t : ast_term)  
-                 (ty : cic_term option) context =
+let ppterm status t =
  let uri,height,metasenv,subst,obj = status.pstatus in
- let expty = 
+ let _,context,t = t in
+  NCicPp.ppterm ~metasenv ~subst ~context t
+;;
+
+let disambiguate status t ty context =
+ let status, expty = 
    match ty with 
-   | None -> None | Some ty -> let _,_,x = relocate context ty in Some x 
+   | None -> status, None 
+   | Some ty -> 
+       let status, (_,_,x) = relocate status context ty in status, Some x 
  in
+ let uri,height,metasenv,subst,obj = status.pstatus in
  let metasenv, subst, lexicon_status, t = 
    GrafiteDisambiguate.disambiguate_nterm expty
     status.lstatus context metasenv subst t 
@@ -84,23 +122,23 @@ let disambiguate (status : lowtac_status) (t : ast_term)
 ;;
 
 let typeof status ctx t =
+  let status, (_,_,t) = relocate status ctx t in
   let _,_,metasenv,subst,_ = status.pstatus in
-  let _,_,t = relocate ctx t in
   let ty = NCicTypeChecker.typeof ~subst ~metasenv ctx t in
-  None, ctx, ty
+  status, (None, ctx, ty)
 ;;
   
 let whd status ?delta ctx t =
-  let _,_,metasenv,subst,_ = status.pstatus in
-  let name,_,t = relocate ctx t in
+  let status, (name,_,t) = relocate status ctx t in
+  let _,_,_,subst,_ = status.pstatus in
   let t = NCicReduction.whd ~subst ?delta ctx t in
-  name, ctx, t
+  status, (name, 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 n,h,metasenv,subst,o = status.pstatus in
-  let _,_,a = relocate ctx a in
-  let _,_,b = relocate ctx b in
   let metasenv, subst = 
     NCicUnification.unify (NCicUnifHint.db ()) metasenv subst ctx a b
   in
@@ -108,10 +146,11 @@ let unify status ctx a b =
 ;;
 
 let refine status ctx term expty =
-  let nt,_,term = relocate ctx term in
-  let ne, expty = 
-    match expty with None -> None, None 
-    | Some e -> let n,_, e = relocate ctx e in n, Some e
+  let status, (nt,_,term) = relocate status ctx term in
+  let status, ne, expty = 
+    match expty with None -> status, None, None 
+    | Some e -> 
+        let status, (n,_, e) = relocate status ctx e in status, n, Some e
   in
   let name,height,metasenv,subst,obj = status.pstatus in
   let db = NCicUnifHint.db () in (* XXX fixme *)
@@ -120,7 +159,7 @@ let refine status ctx term expty =
   let metasenv, subst, t, ty = 
    NCicRefiner.typeof db ~look_for_coercion metasenv subst ctx term expty
   in
-  { status with pstatus = (name,height,metasenv,subst,obj) }, 
+  { status with pstatus = name,height,metasenv,subst,obj }, 
   (nt,ctx,t), (ne,ctx,ty)
 ;;
 
@@ -142,18 +181,19 @@ let instantiate status i t =
 ;;
 
 let mk_meta status ?name ctx bo_or_ty =
-  let n,h,metasenv,subst,o = status.pstatus in
   match bo_or_ty with
   | `Decl ty ->
-      let _,_,ty = relocate ctx ty in
+      let status, (_,_,ty) = relocate status ctx ty in
+      let n,h,metasenv,subst,o = status.pstatus in
       let metasenv, _, instance, _ = 
         NCicMetaSubst.mk_meta ?name metasenv ctx (`WithType ty)
       in
       let status = { status with pstatus = n,h,metasenv,subst,o } in
       status, (None,ctx,instance)
   | `Def bo ->
-      let _,_,bo_ as bo = relocate ctx bo in
-      let _,_,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.pstatus in
       let metasenv, metano, instance, _ = 
         NCicMetaSubst.mk_meta ?name metasenv ctx (`WithType ty) in
       let metasenv = List.filter (fun j,_ -> j <> metano) metasenv in
@@ -271,16 +311,23 @@ let select_term
 ;;
 
 let analyse_indty status ty = 
+ let status, reduct = whd status (ctx_of ty) ty in
  let ref, args =
-  match whd status (ctx_of ty) ty with
+  match reduct with
    | _,_,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
- let left, right = HExtlib.split_nth lno args in
- ref, consno, left, right
+ let left, right = HExtlib.split_nth "NTS 1" lno args in
+ status, (ref, consno, left, right)
 ;;
 
 let mk_cic_term c t = None,c,t ;;
+
+let apply_subst status ctx t =
+ let status, (name,_,t) = relocate status ctx t in
+ let _,_,_,subst,_ = status.pstatus in
+  status, (name, ctx, NCicUntrusted.apply_subst subst t)
+;;