X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_tactics%2FnTacStatus.ml;h=2b310ff38a09d0574957d3d086349f7e65cdceca;hb=86dbca4f0bfda375bdf036ec5ce3bf44678415f2;hp=323b1e6fc0ee1b744f77c1405c73a26d5d7430bc;hpb=1b70a1f66be53f76e475383e86d63c2b5c1fbcaa;p=helm.git

diff --git a/helm/software/components/ng_tactics/nTacStatus.ml b/helm/software/components/ng_tactics/nTacStatus.ml
index 323b1e6fc..2b310ff38 100644
--- a/helm/software/components/ng_tactics/nTacStatus.ml
+++ b/helm/software/components/ng_tactics/nTacStatus.ml
@@ -11,41 +11,41 @@
 
 (* $Id: nCic.ml 9058 2008-10-13 17:42:30Z tassi $ *)
 
-exception Error of string lazy_t
-let fail msg = raise (Error msg)
+exception Error of string lazy_t * exn option
+let fail ?exn msg = raise (Error (msg,exn))
 
-type lowtac_status = {
-        pstatus : NCic.obj;
-        lstatus : LexiconEngine.status
-}
-
-type lowtactic = lowtac_status -> int -> lowtac_status 
-
-type tac_status = {
-        gstatus : Continuationals.Stack.t; 
-        istatus : lowtac_status;
-} 
+let wrap f x =
+  try f x 
+  with 
+  | MultiPassDisambiguator.DisambiguationError _ 
+  | NCicRefiner.RefineFailure _ 
+  | NCicUnification.UnificationFailure _ 
+  | NCicTypeChecker.TypeCheckerFailure _ 
+  | NCicMetaSubst.MetaSubstFailure _ as exn -> fail ~exn (lazy "")
+;;
 
-type tactic = tac_status -> tac_status
+class pstatus =
+ fun (o: NCic.obj) ->
+  object
+   inherit NEstatus.status
+   val obj = o
+   method obj = obj
+   method set_obj o = {< obj = o >}
+  end
 
 type tactic_term = CicNotationPt.term Disambiguate.disambiguator_input
 type tactic_pattern = GrafiteAst.npattern Disambiguate.disambiguator_input
 
-let pp_tac_status status = 
-  prerr_endline (NCicPp.ppobj status.istatus.pstatus)
-;;
-
-let pp_lowtac_status status = 
-  prerr_endline "--------------------------------------------";
-  prerr_endline (NCicPp.ppobj status.pstatus)
+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.pstatus in 
+  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 && 
@@ -80,28 +80,28 @@ let relocate status destination (name,source,t as orig) =
       (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)
+         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 with pstatus = u, d, metasenv, subst, o } in
-  status, (name, destination, t)
+  let status = status#set_obj (u, d, metasenv, subst, o) in
+  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.pstatus in
- let _,context,t = t in
+ let uri,height,metasenv,subst,obj = status#obj in
+ let context,t = t in
   NCicPp.ppterm ~metasenv ~subst ~context t
 ;;
 
@@ -110,104 +110,119 @@ 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.pstatus in
- let metasenv, subst, lexicon_status, t = 
-   GrafiteDisambiguate.disambiguate_nterm expty
-    status.lstatus context metasenv subst t 
+ 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
- { lstatus = lexicon_status; pstatus = 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 _,_,metasenv,subst,_ = status.pstatus 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 _,_,_,subst,_ = status.pstatus 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, (_,t) = relocate status ctx t in
+  let _,_,_,subst,_ = status#obj in
+  let t = NCicTacReduction.normalize ~subst ?delta ctx t in
+  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 n,h,metasenv,subst,o = status.pstatus in
-  let metasenv, subst = 
-    NCicUnification.unify (NCicUnifHint.db ()) metasenv subst ctx a b
-  in
-  { status with pstatus = n,h,metasenv,subst,o }
+  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 (ctx,t) =
+ let f () =
+  let t = NCicUnification.fix_sorts t in
+   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.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 metasenv, subst, t, ty = 
-   NCicRefiner.typeof db ~look_for_coercion metasenv subst ctx term expty
+  let name,height,metasenv,subst,obj = status#obj in
+  let metasenv,subst,t,ty = 
+   NCicRefiner.typeof status metasenv subst ctx term expty
   in
-  { status with pstatus = 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 : lowtac_status) (g : int) =
- let _,_,metasenv,_,_ = status.pstatus in
- List.assoc g metasenv
+let get_goalty status g =
+ let _,_,metasenv,_,_ = status#obj in
+ 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.pstatus in
+ 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
- { status with pstatus = (name,height,metasenv,subst,obj) }
+  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 n,h,metasenv,subst,o = status.pstatus 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 with pstatus = n,h,metasenv,subst,o } in
-      status, (None,ctx,instance)
+      let status = status#set_obj (n,h,metasenv,subst,o) in
+      status, (ctx,instance)
   | `Def bo ->
-      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 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 status = { status with pstatus = n,h,metasenv,subst,o } in
-      status, (None,ctx,instance)
+      let subst = (metano, (attrs, ctx, bo_, ty)) :: subst in
+      let status = status#set_obj (n,h,metasenv,subst,o) in
+      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 
@@ -221,34 +236,35 @@ 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 
-    | NCicUnification.UnificationFailure _ 
-    | NCicUnification.Uncertain _ -> false, status
+    | Error (_, Some (NCicUnification.UnificationFailure _))
+    | Error (_, Some (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
+         let status , (_,t) = found status (ctx, t) in 
+         (status,true),t
       else
-        let _,_,_,subst,_ = status.pstatus in
+        let _,_,_,subst,_ = status#obj 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 _,_,_,subst,_ = low_status#obj in
   let rec select status ctx pat cic = 
     match pat, cic with
     | _, NCic.Meta (i,lc) when List.mem_assoc i subst ->
@@ -296,9 +312,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 (ctx,t) t in
+            status,t)
     | NCic.Implicit _, t -> status, t
     | _,t -> 
         fail (lazy ("malformed pattern: " ^ NCicPp.ppterm ~metasenv:[]
@@ -306,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
 ;;
 
@@ -314,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
@@ -324,10 +343,30 @@ 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 _,_,_,subst,_ = status.pstatus in
-  status, (name, ctx, NCicUntrusted.apply_subst subst t)
+ let status, (_,t) = relocate status ctx t in
+ let _,_,_,subst,_ = status#obj in
+  status, (ctx, NCicUntrusted.apply_subst subst ctx t)
 ;;
+
+(* ============= move this elsewhere ====================*)
+
+class ['stack] status =
+ fun (o: NCic.obj) (s: 'stack) ->
+  object
+   inherit (pstatus o)
+   val stack = s
+   method stack = stack
+   method set_stack s = {< stack = s >}
+  end
+
+class type lowtac_status = [unit] status
+
+type 'status lowtactic = #lowtac_status as 'status -> int -> 'status
+
+class type tac_status = [Continuationals.Stack.t] status
+
+type 'status tactic = #tac_status as 'status -> 'status
+