- cleanup

[helm.git] / matita / components / grafite_parser / grafiteParser.ml

diff --git a/matita/components/grafite_parser/grafiteParser.ml b/matita/components/grafite_parser/grafiteParser.ml
index 9485190867edd74a55b8689049550f20424371aa..27634f1c3ddbf8b3afd311417d66b986abc4fb93 100644 (file)
--- a/matita/components/grafite_parser/grafiteParser.ml
+++ b/matita/components/grafite_parser/grafiteParser.ml
@@ -27,13 +27,6 @@
 
 module N  = NotationPt
 module G  = GrafiteAst
-module LE = LexiconEngine
-
-type 'a localized_option =
-   LSome of 'a
- | LNone of G.loc
-
-type ast_statement = G.statement
 
 let exc_located_wrapper f =
   try
@@ -612,12 +605,10 @@ EXTEND
     ]
   ];
   statement: [
-    [ ex = executable ->
-         LSome (G.Executable (loc, ex))
-    | com = comment ->
-         LSome (G.Comment (loc, com))
+    [ ex = executable -> G.Executable (loc, ex)
+    | com = comment -> G.Comment (loc, com)
     | (iloc,fname,mode) = include_command ; SYMBOL "."  ->
-              LSome (G.Executable (loc,G.NCommand (loc,G.Include (iloc,mode,fname))))
+              G.Executable (loc,G.NCommand (loc,G.Include (iloc,mode,fname)))
     | EOI -> raise End_of_file
     ]
   ];
@@ -626,23 +617,23 @@ EXTEND
   statement
 ;;
 
-type db = ast_statement localized_option Grammar.Entry.e ;;
+type db = GrafiteAst.statement Grammar.Entry.e ;;
 
 class type g_status =
  object
-  inherit LexiconTypes.g_status
+  inherit CicNotationParser.g_status
   method parser_db: db
  end
 
 class status =
  object(self)
-  inherit LexiconTypes.status as super
+  inherit CicNotationParser.status ~keywords:[]
   val mutable db = None
   method parser_db = match db with None -> assert false | Some x -> x
   method set_parser_db v = {< db = Some v >}
   method set_parser_status
    : 'status. #g_status as 'status -> 'self
-   = fun o -> {< db = Some o#parser_db >}#set_lexicon_engine_status o
+   = fun o -> {< db = Some o#parser_db >}#set_notation_parser_status o
   initializer
    let grammar = CicNotationParser.level2_ast_grammar self in
    db <- Some (mk_parser (Grammar.Entry.create grammar "statement") self)