X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_tactics%2FnTacStatus.ml;h=6d5df31963f70f2b49da8c63ee53a3ca480b7292;hb=88efee4c688d660d2205c5933d302770acb5b407;hp=ce7ca8216d7b81edc56cbbf8316c67943cfe4c87;hpb=2f67829c12dea538114bb848e0275d220dba601b;p=helm.git

diff --git a/helm/software/components/ng_tactics/nTacStatus.ml b/helm/software/components/ng_tactics/nTacStatus.ml
index ce7ca8216..6d5df3196 100644
--- a/helm/software/components/ng_tactics/nTacStatus.ml
+++ b/helm/software/components/ng_tactics/nTacStatus.ml
@@ -11,6 +11,11 @@
 
 (* $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))
 
@@ -26,88 +31,123 @@ let wrap fname f x =
   | NCicMetaSubst.MetaSubstFailure _ as exn -> fail ~exn (lazy fname)
 ;;
 
+class type g_pstatus =
+ object
+  inherit NEstatus.g_status
+  method obj: NCic.obj
+ end
+
 class pstatus =
  fun (o: NCic.obj) ->
-  object
+ object (self)
    inherit NEstatus.status
    val obj = o
    method obj = obj
    method set_obj o = {< obj = o >}
+   method set_pstatus : 'status. #g_pstatus as 'status -> 'self
+   = fun o -> (self#set_estatus o)#set_obj o#obj
   end
 
 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 mk_cic_term c t = c,t ;;
 
-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" (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 disambiguate status t ty context =
+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 context t ty =
  let status, expty = 
    match ty with 
    | None -> status, None 
@@ -131,13 +171,13 @@ let typeof status ctx t =
 ;;
 let typeof a b c = wrap "typeof" (typeof a b) c;;
 
-let saturate status (ctx,t) =
+let saturate status ?delta (ctx,t) =
   let n,h,metasenv,subst,k = status#obj in
-  let t, metasenv, args = NCicMetaSubst.saturate metasenv subst ctx t 0 in
+  let t,metasenv,args = NCicMetaSubst.saturate ?delta 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 saturate a ?delta b = wrap "saturate" (saturate a ?delta) b;;
   
 let whd status ?delta ctx t =
   let status, (_,t) = relocate status ctx t in
@@ -162,10 +202,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 ()
 ;;
@@ -194,26 +237,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)
@@ -222,7 +278,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
@@ -230,11 +287,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 
@@ -252,6 +309,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 _))
@@ -324,7 +382,8 @@ 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
         | None ->
@@ -336,8 +395,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
 ;;
 
@@ -356,23 +417,34 @@ 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 type ['stack] g_status =
+ object
+  inherit g_pstatus
+  method stack: 'stack
+ end
+
 class ['stack] status =
  fun (o: NCic.obj) (s: 'stack) ->
-  object
+ object (self)
    inherit (pstatus o)
    val stack = s
    method stack = stack
    method set_stack s = {< stack = s >}
+   method set_status : 'status. 'stack #g_status as 'status -> 'self
+   = fun o -> (self#set_pstatus o)#set_stack o#stack
   end
 
 class type lowtac_status = [unit] status
@@ -402,6 +474,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
@@ -420,7 +494,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 =
@@ -431,7 +507,6 @@ let compare e1 e2 =
   | e1,e2 -> Pervasives.compare e1 e2
 ;;
 
-let string_of_path l = String.concat "." (List.map ppelem l) ;;
 
 end