factorized an ast_statement type which is (now) used from outside this module

diff --git a/components/grafite_parser/grafiteParser.ml b/components/grafite_parser/grafiteParser.ml
index 73d6bf66ac5e3f8c37865cacbd7719fb092cf8eb..aa10bdcf315e2e436b4f45479df51bd5397cda33 100644 (file)
--- a/components/grafite_parser/grafiteParser.ml
+++ b/components/grafite_parser/grafiteParser.ml
@@ -31,15 +31,17 @@ module Ast = CicNotationPt
 
 type 'a localized_option =
    LSome of 'a
- | LNone of Token.flocation
+ | LNone of GrafiteAst.loc
 
-type statement =
- include_paths:string list ->
- LexiconEngine.status ->
-  LexiconEngine.status *
+type ast_statement =
   (CicNotationPt.term, CicNotationPt.term,
    CicNotationPt.term GrafiteAst.reduction, CicNotationPt.obj, string)
-    GrafiteAst.statement localized_option
+    GrafiteAst.statement
+
+type statement =
+  include_paths:string list ->
+  LexiconEngine.status ->
+    LexiconEngine.status * ast_statement localized_option
 
 let grammar = CicNotationParser.level2_ast_grammar
 

diff --git a/components/grafite_parser/grafiteParser.mli b/components/grafite_parser/grafiteParser.mli
index 6a1980011409c790625df02005b9cb17d70c26ae..cb88940ffde19daea908157bc497b83acc0c4a3b 100644 (file)
--- a/components/grafite_parser/grafiteParser.mli
+++ b/components/grafite_parser/grafiteParser.mli
@@ -25,15 +25,17 @@
 
 type 'a localized_option =
    LSome of 'a
- | LNone of Token.flocation
+ | LNone of GrafiteAst.loc
 
-type statement =
- include_paths:string list ->
- LexiconEngine.status ->
-  LexiconEngine.status *
+type ast_statement =
   (CicNotationPt.term, CicNotationPt.term,
    CicNotationPt.term GrafiteAst.reduction, CicNotationPt.obj, string)
-    GrafiteAst.statement localized_option
+    GrafiteAst.statement
+
+type statement =
+  include_paths:string list ->
+  LexiconEngine.status ->
+    LexiconEngine.status * ast_statement localized_option
 
 val parse_statement: Ulexing.lexbuf -> statement  (** @raise End_of_file *)