X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAst.ml;h=60e3aac4bfa0d2ad8ba476ecf1082c434cf22f1c;hb=72cd94b68037956a70b98cfa54f316fd54e52bae;hp=2dc077f063ffb125125795b091a9fc91f7c52dce;hpb=cf4088e2cabcbce9b112f1e1fd5cfd38fe16d427;p=helm.git

diff --git a/helm/software/components/grafite/grafiteAst.ml b/helm/software/components/grafite/grafiteAst.ml
index 2dc077f06..60e3aac4b 100644
--- a/helm/software/components/grafite/grafiteAst.ml
+++ b/helm/software/components/grafite/grafiteAst.ml
@@ -27,20 +27,57 @@
 
 type direction = [ `LeftToRight | `RightToLeft ]
 
-type loc = Token.flocation
+type loc = Stdpp.location
 
 type ('term, 'lazy_term, 'ident) pattern =
   'lazy_term option * ('ident * 'term) list * 'term option
 
+type npattern = 
+ CicNotationPt.term option * (string * CicNotationPt.term) list * CicNotationPt.term option
+
 type 'lazy_term reduction =
   [ `Normalize
-  | `Reduce
   | `Simpl
   | `Unfold of 'lazy_term option
   | `Whd ]
 
 type 'ident intros_spec = int option * 'ident option list
 
+type 'term auto_params = 'term list * (string*string) list
+
+type 'term just =
+ [ `Term of 'term
+ | `Auto of 'term auto_params ]
+
+type ntactic =
+   | NApply of loc * CicNotationPt.term
+   | NAssert of loc * ((string * [`Decl of CicNotationPt.term | `Def of CicNotationPt.term * CicNotationPt.term]) list * CicNotationPt.term) list
+   | NCases of loc * CicNotationPt.term * npattern  
+   | NCase1 of loc * string
+   | NChange of loc * npattern * CicNotationPt.term
+   | NElim of loc * CicNotationPt.term * npattern  
+   | NGeneralize of loc * npattern
+   | NId of loc
+   | NIntro of loc * string
+   | NLetIn of loc * npattern * CicNotationPt.term * string
+   | NReduce of loc * [ `Normalize of bool | `Whd of bool ] * npattern
+   | NRewrite of loc * direction * CicNotationPt.term * npattern
+   | NAuto of loc * CicNotationPt.term auto_params
+   | NDot of loc
+   | NSemicolon of loc
+   | NBranch of loc
+   | NShift of loc
+   | NPos of loc * int list
+   | NWildcard of loc
+   | NMerge of loc
+   | NSkip of loc
+   | NFocus of loc * int list
+   | NUnfocus of loc
+   | NTry of loc * ntactic
+   | NAssumption of loc
+   | NRepeat of loc * ntactic
+   | NBlock of loc * ntactic list
+
 type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   (* Higher order tactics (i.e. tacticals) *)
   | Do of loc * int * ('term, 'lazy_term, 'reduction, 'ident) tactic
@@ -58,19 +95,23 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   (* Real tactics *)
   | Absurd of loc * 'term
   | Apply of loc * 'term
-  | ApplyS of loc * 'term * (string * string) list
+  | ApplyRule of loc * 'term
+  | ApplyP of loc * 'term (* apply for procedural reconstruction *)
+  | ApplyS of loc * 'term * 'term auto_params
   | Assumption of loc
-  | AutoBatch of loc * (string * string) list
-  | Cases of loc * 'term * 'ident intros_spec
+  | AutoBatch of loc * 'term auto_params
+  | Cases of loc * 'term * ('term, 'lazy_term, 'ident) pattern *
+             'ident intros_spec
   | Change of loc * ('term, 'lazy_term, 'ident) pattern * 'lazy_term
   | Clear of loc * 'ident list
   | ClearBody of loc * 'ident
+  | Compose of loc * 'term * 'term option * int * 'ident intros_spec
   | Constructor of loc * int
   | Contradiction of loc
   | Cut of loc * 'ident option * 'term
   | Decompose of loc * 'ident option list
-  | Demodulate of loc
-  | Destruct of loc * 'term
+  | Demodulate of loc * 'term auto_params
+  | Destruct of loc * 'term list option
   | Elim of loc * 'term * 'term option * ('term, 'lazy_term, 'ident) pattern *
 	    'ident intros_spec
   | ElimType of loc * 'term * 'term option * 'ident intros_spec
@@ -95,58 +136,73 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   | Right of loc
   | Ring of loc
   | Split of loc
-  | Subst of loc
   | Symmetry of loc
   | Transitivity of loc * 'term
-  (* Costruttori Aggiunti *)
+  (* Declarative language *)
   | Assume of loc * 'ident * 'term
   | Suppose of loc * 'term *'ident * 'term option
-  | By_term_we_proved of loc *'term option * 'term * 'ident option * 'term option
+  | By_just_we_proved of loc * 'term just *
+     'term * 'ident option * 'term option
   | We_need_to_prove of loc * 'term * 'ident option * 'term option
-  | Bydone of loc * 'term option 
+  | Bydone of loc * 'term just
   | We_proceed_by_induction_on of loc * 'term * 'term
   | We_proceed_by_cases_on of loc * 'term * 'term
   | Byinduction of loc * 'term * 'ident
   | Thesisbecomes of loc * 'term
   | Case of loc * string * (string * 'term) list 
-  | ExistsElim of loc * 'term option * 'ident * 'term * 'ident * 'lazy_term
-  | AndElim of loc * 'term * 'ident * 'term * 'ident * 'term
+  | ExistsElim of loc * 'term just * 'ident * 'term * 'ident * 'lazy_term
+  | AndElim of loc * 'term just * 'ident * 'term * 'ident * 'term
   | RewritingStep of
      loc * (string option * 'term) option * 'term  *
-      [ `Term of 'term | `Auto of (string * string) list ] *
+      [ `Term of 'term | `Auto of 'term auto_params
+      | `Proof | `SolveWith of 'term ] *
       bool (* last step*)
   
 type search_kind = [ `Locate | `Hint | `Match | `Elim ]
 
 type print_kind = [ `Env | `Coer ]
 
-type presentation_style = Declarative
-                        | Procedural of int option
+type inline_param = IPPrefix of string         (* undocumented *)
+		  | IPAs of Cic.object_flavour (* preferred flavour *)
+		  | IPCoercions                (* show coercions *)
+                  | IPDebug of int             (* set debug level *)
+                  | IPProcedural               (* procedural rendering *)
+                  | IPNoDefaults               (* no default-based tactics *)
+		  | IPLevel of int             (* granularity level *)
+                  | IPDepth of int             (* undocumented *)
+                  | IPComments                 (* show statistics *)
+                  | IPCR                       (* detect convertible rewriting *)
 
-type 'term macro = 
+type ('term,'lazy_term) macro = 
   (* Whelp's stuff *)
-  | WHint of loc * 'term 
+  | WHint of loc * 'term
   | WMatch of loc * 'term 
   | WInstance of loc * 'term 
   | WLocate of loc * string
   | WElim of loc * 'term
   (* real macros *)
+  | Eval of loc * 'lazy_term reduction * 'term
   | Check of loc * 'term 
-  | Hint of loc
-  | AutoInteractive of loc * (string * string) list
-  | Inline of loc * presentation_style * string * string 
-     (* URI or base-uri, name prefix *) 
+  | Hint of loc * bool
+  | AutoInteractive of loc * 'term auto_params
+  | Inline of loc * string * inline_param list
+     (* URI or base-uri, parameters *) 
 
 (** To be increased each time the command type below changes, used for "safe"
  * marshalling *)
-let magic = 11
+let magic = 26
 
 type ('term,'obj) command =
   | Index of loc * 'term option (* key *) * UriManager.uri (* value *)
-  | Coercion of loc * UriManager.uri * bool (* add_obj *) * int (* arity *)
+  | Select of loc * UriManager.uri
+  | Pump of loc * int
+  | Coercion of loc * 'term * bool (* add_obj *) *
+     int (* arity *) * int (* saturations *)
+  | PreferCoercion of loc * 'term
+  | Inverter of loc * string * 'term * bool list
   | Default of loc * string * UriManager.uri list
   | Drop of loc
-  | Include of loc * string
+  | Include of loc * bool (* normal? *) * [`New | `OldAndNew] * string 
   | Obj of loc * 'obj
   | Relation of
      loc * string * 'term * 'term * 'term option * 'term option * 'term option
@@ -154,7 +210,16 @@ type ('term,'obj) command =
   | Print of loc * string
   | Qed of loc
 
-type ('term, 'lazy_term, 'reduction, 'ident) punctuation_tactical =
+type ncommand =
+  | UnificationHint of loc * CicNotationPt.term * int (* term, precedence *)
+  | NObj of loc * CicNotationPt.term CicNotationPt.obj
+  | NUnivConstraint of loc * bool * NUri.uri * NUri.uri
+  | NCoercion of loc * string *
+      CicNotationPt.term * CicNotationPt.term *
+      (string * CicNotationPt.term) * CicNotationPt.term
+  | NQed of loc
+
+type punctuation_tactical =
   | Dot of loc
   | Semicolon of loc
   | Branch of loc
@@ -163,19 +228,20 @@ type ('term, 'lazy_term, 'reduction, 'ident) punctuation_tactical =
   | Wildcard of loc
   | Merge of loc
 
-type ('term,'lazy_term,'reduction,'ident) non_punctuation_tactical =
+type non_punctuation_tactical =
   | Focus of loc * int list
   | Unfocus of loc
   | Skip of loc
 
 type ('term, 'lazy_term, 'reduction, 'obj, 'ident) code =
   | Command of loc * ('term, 'obj) command
-  | Macro of loc * 'term macro 
+  | NCommand of loc * ncommand
+  | Macro of loc * ('term,'lazy_term) macro 
+  | NTactic of loc * ntactic list
   | Tactic of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic option
-      * ('term, 'lazy_term, 'reduction, 'ident) punctuation_tactical
-  | NonPunctuationTactical of loc
-      * ('term, 'lazy_term, 'reduction, 'ident) non_punctuation_tactical
-      * ('term, 'lazy_term, 'reduction, 'ident) punctuation_tactical
+      * punctuation_tactical
+  | NonPunctuationTactical of loc * non_punctuation_tactical
+      * punctuation_tactical
              
 type ('term, 'lazy_term, 'reduction, 'obj, 'ident) comment =
   | Note of loc * string