X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fcomponents%2Fng_tactics%2FnTacStatus.mli;h=0dbcc5039718ede98b177126e2e8c05037ff4c3b;hb=bbf85ddcdfe0809fee0c6ca9812ce0da30c238af;hp=5616794573ed830c42ab14913de5a61501f90d78;hpb=2c01ff6094173915e7023076ea48b5804dca7778;p=helm.git

diff --git a/matita/components/ng_tactics/nTacStatus.mli b/matita/components/ng_tactics/nTacStatus.mli
index 561679457..0dbcc5039 100644
--- a/matita/components/ng_tactics/nTacStatus.mli
+++ b/matita/components/ng_tactics/nTacStatus.mli
@@ -14,79 +14,112 @@
 exception Error of string lazy_t * exn option
 val fail: ?exn:exn -> string lazy_t -> 'a
 
+type automation_cache = NDiscriminationTree.DiscriminationTree.t
+type unit_eq_cache = NCicParamod.state
+
+class type g_eq_status =
+ object
+   method eq_cache : unit_eq_cache 
+ end
+
+class eq_status :
+ object('self)
+  inherit g_eq_status
+  method set_eq_cache: unit_eq_cache -> 'self
+  method set_eq_status: #g_eq_status -> 'self
+ end
+
+class type g_auto_status =
+ object
+  method auto_cache : automation_cache
+ end
+
+class auto_status :
+ object('self)
+  inherit g_auto_status
+  method set_auto_cache: automation_cache -> 'self
+  method set_auto_status: #g_auto_status -> 'self
+ end
+
 class type g_pstatus =
  object
-  inherit NEstatus.g_status
+  inherit GrafiteDisambiguate.g_status
+  inherit g_auto_status
+  inherit g_eq_status
   method obj: NCic.obj
  end
 
-class pstatus :
+class virtual pstatus :
  NCic.obj ->
   object ('self)
-   inherit NEstatus.status
-   method obj: NCic.obj
+   inherit g_pstatus
+   inherit GrafiteDisambiguate.status
+   inherit auto_status
+   inherit eq_status
    method set_obj: NCic.obj -> 'self
    method set_pstatus: #g_pstatus -> 'self
   end
 
-type tactic_term = CicNotationPt.term Disambiguate.disambiguator_input
+type tactic_term = NotationPt.term Disambiguate.disambiguator_input
 type tactic_pattern = GrafiteAst.npattern Disambiguate.disambiguator_input
 
 type cic_term 
 val ctx_of : cic_term -> NCic.context
 val term_of_cic_term : 
- #pstatus as 'status -> cic_term -> NCic.context -> 'status * NCic.term
+ (#pstatus as 'status) -> cic_term -> NCic.context -> 'status * NCic.term
 
 val mk_cic_term : NCic.context -> NCic.term -> cic_term
 val disambiguate:
- #pstatus as 'status -> NCic.context -> tactic_term -> cic_term option ->
+ (#pstatus as 'status) -> NCic.context -> tactic_term -> cic_term NCicRefiner.expected_type ->
   'status * cic_term (* * cic_term XXX *)
 
 val analyse_indty: 
- #pstatus as 'status -> cic_term -> 
-  'status * (NReference.reference * int * NCic.term list * NCic.term list)
+ (#pstatus as 'status) -> cic_term -> 
+  'status * (NReference.reference * int * NCic.term list * NCic.term list * NCic.constructor list)
 
 val ppterm: #pstatus -> cic_term -> string
 val ppcontext: #pstatus -> NCic.context -> string
 val whd: 
- #pstatus as 'status -> ?delta:int -> NCic.context -> cic_term -> 
+ (#pstatus as 'status) -> ?delta:int -> NCic.context -> cic_term -> 
   'status * cic_term 
 val normalize: 
- #pstatus as 'status -> ?delta:int -> NCic.context -> cic_term ->
+ (#pstatus as 'status) -> ?delta:int -> NCic.context -> cic_term ->
   'status * cic_term 
+val are_convertible: 
+ (#pstatus as 'status) -> NCic.context -> cic_term -> cic_term -> 'status * bool
 val typeof: 
- #pstatus as 'status -> NCic.context -> cic_term -> 'status * cic_term
+ (#pstatus as 'status) -> NCic.context -> cic_term -> 'status * cic_term
 val unify: 
- #pstatus as 'status -> NCic.context -> cic_term -> cic_term -> 'status
+ (#pstatus as 'status) -> NCic.context -> cic_term -> cic_term -> 'status
 val refine: 
- #pstatus as 'status -> NCic.context -> cic_term -> cic_term option -> 
+ (#pstatus as 'status) -> NCic.context -> cic_term -> cic_term NCicRefiner.expected_type -> 
   'status * cic_term * cic_term (* status, term, type *)
 val apply_subst:
- #pstatus as 'status -> NCic.context -> cic_term -> 'status * cic_term
+ (#pstatus as 'status) -> NCic.context -> cic_term -> 'status * cic_term
 val apply_subst_context :
   #pstatus -> fix_projections:bool -> NCic.context -> NCic.context
-val fix_sorts: #pstatus as 'status -> cic_term -> 'status * cic_term
+val fix_sorts: (#pstatus as 'status) -> cic_term -> 'status * cic_term
 val saturate :
- #pstatus as 'status -> ?delta:int -> cic_term -> 'status * cic_term * cic_term list
-val metas_of_term : #pstatus as 'status -> cic_term -> int list
+ (#pstatus as 'status) -> ?delta:int -> cic_term -> 'status * cic_term * cic_term list
+val metas_of_term : (#pstatus as 'status) -> cic_term -> int list
 
 val get_goalty: #pstatus -> int -> cic_term
 val get_subst: #pstatus -> NCic.substitution
 val mk_meta: 
- #pstatus as 'status -> ?attrs:NCic.meta_attrs -> NCic.context ->
+ (#pstatus as 'status) -> ?attrs:NCic.meta_attrs -> NCic.context ->
    [ `Decl of cic_term | `Def of cic_term ] -> NCicUntrusted.meta_kind ->
      'status * cic_term
-val instantiate: #pstatus as 'status -> int -> cic_term -> 'status
-val instantiate_with_ast: #pstatus as 'status -> int -> tactic_term -> 'status
+val instantiate: (#pstatus as 'status) -> ?refine:bool -> int -> cic_term -> 'status
+val instantiate_with_ast: (#pstatus as 'status) -> int -> tactic_term -> 'status
 
 val select_term:
- #pstatus as 'status -> 
+ (#pstatus as 'status) -> 
   found: ('status -> cic_term -> 'status * cic_term) ->
   postprocess: ('status -> cic_term -> 'status * cic_term) ->
   cic_term -> tactic_term option * NCic.term ->
     'status * cic_term
 
-val mk_in_scope: #pstatus as 'status -> cic_term -> 'status * cic_term
+val mk_in_scope: (#pstatus as 'status) -> cic_term -> 'status * cic_term
 val mk_out_scope:
  int -> (#pstatus as 'status) -> cic_term -> 'status * cic_term
 
@@ -96,24 +129,24 @@ class type ['stack] g_status =
   method stack: 'stack
  end
 
-class ['stack] status :
+class virtual ['stack] status :
  NCic.obj -> 'stack ->
   object ('self)
+   inherit ['stack] g_status
    inherit pstatus
-   method stack: 'stack
    method set_stack: 'stack -> 'self
    method set_status: 'stack #g_status -> 'self
   end
 
-class type lowtac_status = [unit] status
+class type virtual lowtac_status = [unit] status
 
-type 'status lowtactic = #lowtac_status as 'status -> int -> 'status
+type 'status lowtactic = (#lowtac_status as 'status) -> int -> 'status
 
-class type tac_status = [Continuationals.Stack.t] status
+class type virtual tac_status = [Continuationals.Stack.t] status
 
 val pp_tac_status: #tac_status -> unit
 
-type 'status tactic = #tac_status as 'status -> 'status
+type 'status tactic = (#tac_status as 'status) -> 'status
 
 (* indexing facilities over cic_term based on inverse De Bruijn indexes *)