Huge reorganization of matita and ocaml.

[helm.git] / helm / ocaml / grafite / grafiteAst.ml

diff --git a/helm/ocaml/grafite/grafiteAst.ml b/helm/ocaml/grafite/grafiteAst.ml
index 810e54140adac17bb5b721d9b7fa6970de575d7a..12063745fa32784b3466a17d1a6bbeec096cd65e 100644 (file)
--- a/helm/ocaml/grafite/grafiteAst.ml
+++ b/helm/ocaml/grafite/grafiteAst.ml
@@ -25,7 +25,7 @@
 
 type direction = [ `LeftToRight | `RightToLeft ]
 
-type loc = CicNotationPt.location
+type loc = Token.flocation
 
 type ('term, 'lazy_term, 'ident) pattern =
   'lazy_term option * ('ident * 'term) list * 'term option
@@ -108,11 +108,6 @@ type 'term macro =
   | Search_pat of loc * search_kind * string  (* searches with string pattern *)
   | Search_term of loc * search_kind * 'term  (* searches with term pattern *)
 
-type alias_spec =
-  | Ident_alias of string * string        (* identifier, uri *)
-  | Symbol_alias of string * int * string (* name, instance no, description *)
-  | Number_alias of int * string          (* instance no, description *)
-
 (** To be increased each time the command type below changes, used for "safe"
  * marshalling *)
 let magic = 5
@@ -123,28 +118,8 @@ type 'obj command =
   | Set of loc * string * string
   | Drop of loc
   | Qed of loc
-      (** name.
-       * Name is needed when theorem was started without providing a name
-       *)
   | Coercion of loc * UriManager.uri * bool (* add composites *)
-  | Alias of loc * alias_spec
-      (** parameters, name, type, fields *) 
   | Obj of loc * 'obj
-  | Notation of loc * direction option * CicNotationPt.term * Gramext.g_assoc *
-      int * CicNotationPt.term
-      (* direction, l1 pattern, associativity, precedence, l2 pattern *)
-  | Interpretation of loc *
-      string * (string * CicNotationPt.argument_pattern list) *
-        CicNotationPt.cic_appl_pattern
-      (* description (i.e. id), symbol, arg pattern, appl pattern *)
-
-    (* DEBUGGING *)
-  | Dump of loc (* dump grammar on stdout *)
-    (* DEBUGGING *)
-  | Render of loc * UriManager.uri (* render library object *)
-
-(* composed magic: term + command magics. No need to change this value *)
-let magic = magic + 10000 * CicNotationPt.magic
 
 type ('term, 'lazy_term, 'reduction, 'ident) tactical =
   | Tactic of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic
@@ -188,10 +163,3 @@ type ('term, 'lazy_term, 'reduction, 'obj, 'ident) comment =
 type ('term, 'lazy_term, 'reduction, 'obj, 'ident) statement =
   | Executable of loc * ('term, 'lazy_term, 'reduction, 'obj, 'ident) code
   | Comment of loc * ('term, 'lazy_term, 'reduction, 'obj, 'ident) comment
-
-  (* statements meaningful for matitadep *)
-type dependency =
-  | IncludeDep of string
-  | BaseuriDep of string
-  | UriDep of UriManager.uri
-