X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_tactics%2FnTacStatus.ml;h=8d47439c04ea163336f1e0df709a650c6f4d8353;hb=d40ad33ad3d075c5dd74b6a67131683b0ebe32d6;hp=41319b4739d6c44f08f75fa39e70dc201debd9fc;hpb=275449f6cc7da843aae2e0455edc38fda8571aec;p=helm.git

diff --git a/helm/software/components/ng_tactics/nTacStatus.ml b/helm/software/components/ng_tactics/nTacStatus.ml
index 41319b473..8d47439c0 100644
--- a/helm/software/components/ng_tactics/nTacStatus.ml
+++ b/helm/software/components/ng_tactics/nTacStatus.ml
@@ -11,19 +11,24 @@
 
 (* $Id: nCic.ml 9058 2008-10-13 17:42:30Z tassi $ *)
 
+let debug = ref false;;
+let pp x = 
+ if !debug then prerr_endline (Lazy.force x) else ()
+;;
+
 exception Error of string lazy_t * exn option
 let fail ?exn msg = raise (Error (msg,exn))
 
 module NRef = NReference
 
-let wrap f x =
+let wrap fname f x =
   try f x 
   with 
   | MultiPassDisambiguator.DisambiguationError _ 
   | NCicRefiner.RefineFailure _ 
   | NCicUnification.UnificationFailure _ 
   | NCicTypeChecker.TypeCheckerFailure _ 
-  | NCicMetaSubst.MetaSubstFailure _ as exn -> fail ~exn (lazy "")
+  | NCicMetaSubst.MetaSubstFailure _ as exn -> fail ~exn (lazy fname)
 ;;
 
 class pstatus =
@@ -39,74 +44,100 @@ type tactic_term = CicNotationPt.term Disambiguate.disambiguator_input
 type tactic_pattern = GrafiteAst.npattern Disambiguate.disambiguator_input
 
 let pp_status status = 
-  prerr_endline (NCicPp.ppobj status#obj)
+  pp (lazy (NCicPp.ppobj status#obj))
 ;;
 
 type cic_term = NCic.context * NCic.term
 let ctx_of (c,_) = c ;;
 
-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
-    | (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) 
-      (List.rev destination, List.rev source)
-  in
-  let lc = (0,NCic.Ctx (List.rev lc)) in
-  let (metasenv, subst), t =
-    NCicMetaSubst.delift 
-       ~unify:(fun m s c t1 t2 -> 
-         try Some (NCicUnification.unify status m s c t1 t2)
-         with 
-          | NCicUnification.UnificationFailure _ 
-          | NCicUnification.Uncertain _ -> None) 
-     metasenv subst source 0 lc t
-  in
-  let status = status#set_obj (u, d, metasenv, subst, o) in
-  status, (destination, t)
+let ppterm status t =
+ let uri,height,metasenv,subst,obj = status#obj in
+ let context,t = t in
+  NCicPp.ppterm ~metasenv ~subst ~context 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
-  s, t
+let ppcontext status c =
+ let uri,height,metasenv,subst,obj = status#obj in
+  NCicPp.ppcontext ~metasenv ~subst c
 ;;
 
-let ppterm status t =
+let ppterm_and_context status t =
  let uri,height,metasenv,subst,obj = status#obj in
  let context,t = t in
+  NCicPp.ppcontext ~metasenv ~subst context ^ "\n ⊢ "^ 
   NCicPp.ppterm ~metasenv ~subst ~context t
 ;;
 
+let relocate status destination (source,t as orig) =
+ pp(lazy("relocate:\n" ^ ppterm_and_context status orig));
+ pp(lazy("relocate in:\n" ^ ppcontext status destination));
+ let rc = 
+   if source == destination then status, orig else
+    let _, _, metasenv, subst, _ = status#obj in
+    let rec compute_ops ctx = function (* destination, source *)
+      | (n1, NCic.Decl t1 as e)::cl1 as ex, (n2, NCic.Decl t2)::cl2 ->
+          if n1 = n2 && 
+             NCicReduction.are_convertible ctx ~subst ~metasenv t1 t2 then
+            compute_ops (e::ctx) (cl1,cl2)
+          else
+            [ `Delift ctx; `Lift (List.rev ex) ]
+      | (n1, NCic.Def (b1,t1) as e)::cl1 as ex, (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
+            compute_ops (e::ctx) (cl1,cl2)
+          else
+            [ `Delift ctx; `Lift (List.rev ex) ]
+      | (n1, NCic.Def (b1,t1) as e)::cl1 as ex, (n2, NCic.Decl t2)::cl2 ->
+          if n1 = n2 && 
+             NCicReduction.are_convertible ctx ~subst ~metasenv t1 t2 then
+            compute_ops (e::ctx) (cl1,cl2)
+          else
+            [ `Delift ctx; `Lift (List.rev ex) ]
+      | (n1, NCic.Decl _)::cl1 as ex, (n2, NCic.Def _)::cl2 -> 
+            [ `Delift ctx; `Lift (List.rev ex) ]
+      | _::_ as ex, [] -> [ `Lift (List.rev ex) ]
+      | [], _::_ -> [ `Delift ctx ]
+      | [],[] -> []
+    in
+    let ops = compute_ops [] (List.rev destination, List.rev source) in
+    let rec mk_irl i j = if i > j then [] else NCic.Rel i :: mk_irl (i+1) j in
+    List.fold_left 
+     (fun (status, (source,t)) -> function 
+      | `Lift extra_ctx -> 
+           let len = List.length extra_ctx in
+           status, (extra_ctx@source, NCicSubstitution.lift len t)
+      | `Delift ctx -> 
+            let len_ctx = List.length ctx in
+            let irl = mk_irl 1 (List.length ctx) in
+            let lc = List.length source - len_ctx, NCic.Ctx irl in
+            let u, d, metasenv, subst, o = status#obj in
+            pp(lazy("delifting as " ^ 
+              NCicPp.ppterm ~metasenv ~subst ~context:source 
+               (NCic.Meta (0,lc))));
+            let (metasenv, subst), t =
+              NCicMetaSubst.delift 
+                 ~unify:(fun m s c t1 t2 -> 
+                   try Some (NCicUnification.unify status m s c t1 t2)
+                   with 
+                    | NCicUnification.UnificationFailure _ 
+                    | NCicUnification.Uncertain _ -> None) 
+               metasenv subst source 0 lc t
+            in
+            let status = status#set_obj (u, d, metasenv, subst, o) in
+            status, (ctx,t))
+       (status,orig) ops
+ in
+ pp(lazy("relocated: " ^ ppterm (fst rc) (snd rc)));
+ rc
+;;
+let relocate a b c = wrap "relocate" (relocate a b) c;;
+
+let term_of_cic_term s t c = 
+  let s, (_,t) = relocate s c t in
+  s, t
+;;
+
 let disambiguate status t ty context =
  let status, expty = 
    match ty with 
@@ -121,7 +152,7 @@ let disambiguate status t ty context =
  let new_pstatus = uri,height,metasenv,subst,obj in
   status#set_obj new_pstatus, (context, t) 
 ;;
-let disambiguate a b c d = wrap (disambiguate a b c) d;;
+let disambiguate a b c d = wrap "disambiguate" (disambiguate a b c) d;;
 
 let typeof status ctx t =
   let status, (_,t) = relocate status ctx t in
@@ -129,7 +160,15 @@ let typeof status ctx t =
   let ty = NCicTypeChecker.typeof ~subst ~metasenv ctx t in
   status, (ctx, ty)
 ;;
-let typeof a b c = wrap (typeof a b) c;;
+let typeof a b c = wrap "typeof" (typeof a b) c;;
+
+let saturate status (ctx,t) =
+  let n,h,metasenv,subst,k = status#obj in
+  let t, metasenv, args = NCicMetaSubst.saturate metasenv subst ctx t 0 in
+  let status = status#set_obj (n,h,metasenv,subst,k) in
+  status, (ctx,t), List.map (fun x -> ctx,x) args
+;;
+let saturate a b = wrap "saturate" (saturate a) b;;
   
 let whd status ?delta ctx t =
   let status, (_,t) = relocate status ctx t in
@@ -152,14 +191,14 @@ let unify status ctx a b =
   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 unify a b c d = wrap "unify" (unify a b c) d;;
 
 let fix_sorts (ctx,t) =
  let f () =
   let t = NCicUnification.fix_sorts t in
    ctx,t
  in
-  wrap f ()
+  wrap "fix_sorts" f ()
 ;;
 
 let refine status ctx term expty =
@@ -176,12 +215,14 @@ let refine status ctx term expty =
   in
    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 refine a b c d = wrap "refine" (refine a b c) d;;
 
 let get_goalty status g =
  let _,_,metasenv,_,_ = status#obj in
- let _, a, b = List.assoc g metasenv in
- a, b
+ try
+   let _, ctx, ty = NCicUtils.lookup_meta g metasenv in
+   ctx, ty
+ with NCicUtils.Meta_not_found _ as exn -> fail ~exn (lazy "get_goalty")
 ;;
 
 let instantiate status i t =
@@ -242,6 +283,7 @@ let select_term
 =
   let is_found status ctx t wanted =
     (* we could lift wanted step-by-step *)
+    pp(lazy("is_found: "^ppterm status (ctx,t)));
     try true, unify status ctx (ctx, t) wanted
     with 
     | Error (_, Some (NCicUnification.UnificationFailure _))
@@ -315,6 +357,7 @@ let select_term
         (match wanted with
         | Some wanted -> 
              let status', wanted = disambiguate status wanted None ctx 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
         | None ->
@@ -326,8 +369,10 @@ let select_term
           ~context:[] ~subst:[] pat ^ " against " ^ 
           NCicPp.ppterm ~metasenv:[] ~subst:[] ~context:[] t))
   in
+  pp(lazy ("select in: "^ppterm low_status (context,term)));
   let status, term = select low_status context path term in
   let term = (context, term) in
+  pp(lazy ("postprocess: "^ppterm low_status term));
   postprocess status term
 ;;
 
@@ -373,3 +418,66 @@ class type tac_status = [Continuationals.Stack.t] status
 
 type 'status tactic = #tac_status as 'status -> 'status
 
+module NCicInverseRelIndexable : Discrimination_tree.Indexable
+with type input = cic_term and type constant_name = NUri.uri = struct
+
+open Discrimination_tree
+
+type input = cic_term
+type constant_name = NUri.uri
+
+let ppelem = function
+  | Constant (uri,arity) -> 
+      "("^NUri.name_of_uri uri ^ "," ^ string_of_int arity^")"
+  | Bound (i,arity) -> 
+      "("^string_of_int i ^ "," ^ string_of_int arity^")"
+  | Variable -> "?"
+  | Proposition -> "Prop"
+  | Datatype -> "Type"
+  | Dead -> "Dead"
+;;
+
+let path_string_of (ctx,t) =
+  let len_ctx = List.length ctx in
+  let rec aux arity = function
+    | NCic.Appl ((NCic.Meta _|NCic.Implicit _)::_) -> [Variable]
+    | NCic.Appl (NCic.Lambda _ :: _) -> [Variable] (* maybe we should b-reduce *)
+    | NCic.Appl [] -> assert false
+    | NCic.Appl (hd::tl) ->
+        aux (List.length tl) hd @ List.flatten (List.map (aux 0) tl) 
+    | NCic.Lambda _ | NCic.Prod _ -> [Variable]
+        (* I think we should CicSubstitution.subst Implicit t *)
+    | NCic.LetIn _ -> [Variable] (* z-reduce? *)
+    | NCic.Meta _ | NCic.Implicit _ -> assert (arity = 0); [Variable]
+    | NCic.Rel i -> [Bound (len_ctx - i, arity)]
+    | NCic.Sort (NCic.Prop) -> assert (arity=0); [Proposition]
+    | NCic.Sort _ -> assert (arity=0); [Datatype]
+    | NCic.Const (NReference.Ref (u,_)) -> [Constant (u, arity)]
+    | NCic.Match _ -> [Dead]
+  in 
+    aux 0 t
+;;
+
+let compare e1 e2 =
+  match e1,e2 with
+  | Constant (u1,a1),Constant (u2,a2) -> 
+       let x = NUri.compare u1 u2 in
+       if x = 0 then Pervasives.compare a1 a2 else x
+  | e1,e2 -> Pervasives.compare e1 e2
+;;
+
+let string_of_path l = String.concat "." (List.map ppelem l) ;;
+
+end
+
+module Ncic_termOT : Set.OrderedType with type t = cic_term =
+ struct
+   type t = cic_term
+   let compare = Pervasives.compare
+ end
+
+module Ncic_termSet : Set.S with type elt = cic_term = Set.Make(Ncic_termOT)
+
+module InvRelDiscriminationTree = 
+   Discrimination_tree.Make(NCicInverseRelIndexable)(Ncic_termSet)
+