X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_tactics%2FnTacStatus.ml;h=cffda3b174376ea6921a58540bdb9f6cc4119f7e;hb=df1201e37d6f2631dc31ffc87b979a6c81180a3a;hp=545e5603bd3cb895b1cd05c2ecaa4ab2b0ebdeba;hpb=aefcb5f4e531c0318b7f495956c28eab971a4aa1;p=helm.git

diff --git a/helm/software/components/ng_tactics/nTacStatus.ml b/helm/software/components/ng_tactics/nTacStatus.ml
index 545e5603b..cffda3b17 100644
--- a/helm/software/components/ng_tactics/nTacStatus.ml
+++ b/helm/software/components/ng_tactics/nTacStatus.ml
@@ -16,7 +16,7 @@ let fail msg = raise (Error msg)
 
 type lowtac_status = {
         pstatus : NCic.obj;
-        lstatus : LexiconEngine.status
+        estatus : NEstatus.status;
 }
 
 type lowtactic = lowtac_status -> int -> lowtac_status 
@@ -45,29 +45,45 @@ let ctx_of (_,c,_) = c ;;
 
 let relocate status destination (name,source,t as orig) =
  if source == destination then status, orig else
-  let rec lcp j i = function
-    | (n1, t1)::cl1, (n2, t2)::cl2 ->
-        if n1 = n2 && t1 = t2 then
-          NCic.Rel i :: lcp (j-1) (i-1) (cl1,cl2)
+  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
   let lc = 
-    lcp (List.length destination) (List.length source) 
+    lcp [] (List.length destination) (List.length source) 
       (List.rev destination, List.rev source)
   in
   let lc = (0,NCic.Ctx (List.rev lc)) in
-  let u, d, metasenv, subst, o = status.pstatus 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)
+         try Some (NCicUnification.unify status.estatus m s c t1 t2)
          with 
           | NCicUnification.UnificationFailure _ 
           | NCicUnification.Uncertain _ -> None) 
@@ -82,10 +98,13 @@ let term_of_cic_term s t c =
   s, t
 ;;
 
-type ast_term = string * int * CicNotationPt.term
+let ppterm status t =
+ let uri,height,metasenv,subst,obj = status.pstatus in
+ let _,context,t = t in
+  NCicPp.ppterm ~metasenv ~subst ~context t
+;;
 
-let disambiguate (status : lowtac_status) (t : ast_term)  
-                 (ty : cic_term option) context =
+let disambiguate status t ty context =
  let status, expty = 
    match ty with 
    | None -> status, None 
@@ -93,12 +112,12 @@ let disambiguate (status : lowtac_status) (t : ast_term)
        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 = 
+ let metasenv, subst, estatus, t = 
    GrafiteDisambiguate.disambiguate_nterm expty
-    status.lstatus context metasenv subst t 
+    status.estatus context metasenv subst t 
  in
  let new_pstatus = uri,height,metasenv,subst,obj in
- { lstatus = lexicon_status; pstatus = new_pstatus }, (None, context, t) 
+ { estatus = estatus; pstatus = new_pstatus }, (None, context, t) 
 ;;
 
 let typeof status ctx t =
@@ -115,12 +134,19 @@ let whd status ?delta ctx t =
   status, (name, ctx, t)
 ;;
   
+let normalize status ?delta ctx t =
+  let status, (name,_,t) = relocate status ctx t in
+  let _,_,_,subst,_ = status.pstatus in
+  let t = NCicTacReduction.normalize ~subst ?delta ctx t in
+  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 metasenv, subst = 
-    NCicUnification.unify (NCicUnifHint.db ()) metasenv subst ctx a b
+    NCicUnification.unify status.estatus metasenv subst ctx a b
   in
   { status with pstatus = n,h,metasenv,subst,o }
 ;;
@@ -133,11 +159,9 @@ let refine status ctx term expty =
         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 *)
-  let coercion_db = NCicCoercion.db () in
-  let look_for_coercion = NCicCoercion.look_for_coercion coercion_db in
+  let rdb = status.estatus in
   let metasenv, subst, t, ty = 
-   NCicRefiner.typeof db ~look_for_coercion metasenv subst ctx term expty
+   NCicRefiner.typeof rdb metasenv subst ctx term expty
   in
   { status with pstatus = name,height,metasenv,subst,obj }, 
   (nt,ctx,t), (ne,ctx,ty)
@@ -211,22 +235,23 @@ let select_term
     | NCicUnification.Uncertain _ -> false, status
   in
   let match_term status ctx (wanted : cic_term) t =
-    let rec aux ctx status t =
+    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 
-         status, t
+         (status,true),t
       else
         let _,_,_,subst,_ = status.pstatus in
         match t with
         | NCic.Meta (i,lc) when List.mem_assoc i subst ->
             let _,_,t,_ = NCicUtils.lookup_subst i subst in
-            aux ctx status t
-        | NCic.Meta _ -> status, t
-        | _ ->      
-            NCicUntrusted.map_term_fold_a (fun e c -> e::c) ctx aux status t
+            aux ctx (status,already_found) t
+        | NCic.Meta _ -> (status,already_found),t
+        | _ ->
+          NCicUntrusted.map_term_fold_a (fun e c -> e::c) ctx aux
+           (status,already_found) t
      in 
-       aux ctx status t
+       aux ctx (status,false) t
   in 
   let _,_,_,subst,_ = low_status.pstatus in
   let rec select status ctx pat cic = 
@@ -276,9 +301,12 @@ let select_term
     | NCic.Implicit `Hole, t -> 
         (match wanted with
         | Some wanted -> 
-             let status, wanted = disambiguate status wanted None ctx in
-             match_term status ctx wanted t
-        | None -> match_term status ctx (None,ctx,t) t)
+             let status', wanted = disambiguate status wanted None ctx in
+             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
+            status,t)
     | NCic.Implicit _, t -> status, t
     | _,t -> 
         fail (lazy ("malformed pattern: " ^ NCicPp.ppterm ~metasenv:[]
@@ -305,3 +333,9 @@ let analyse_indty status ty =
 ;;
 
 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 ctx t)
+;;