Previous patch improved: we now use an ad-hoc wrapper for Grammar.parsable

[helm.git] / matita / matita / matitaScript.ml

diff --git a/matita/matita/matitaScript.ml b/matita/matita/matitaScript.ml
index 3a73d6ce6d2d38cbb2425e04c9ad670ea8f59112..b84180037b5ad92716267ce1022b19cc74e72550 100644 (file)
--- a/matita/matita/matitaScript.ml
+++ b/matita/matita/matitaScript.ml
@@ -193,9 +193,9 @@ and eval_statement include_paths (buffer : GText.buffer) guistuff
     match statement with
     | `Raw text ->
         if Pcre.pmatch ~rex:only_dust_RE text then raise Margin;
-        let grammar = CicNotationParser.level2_ast_grammar grafite_status in
         let strm =
-         Grammar.parsable grammar (Obj.magic(Ulexing.from_utf8_string text)) in
+         GrafiteParser.parsable_statement grafite_status
+          (Ulexing.from_utf8_string text) in
         let ast = MatitaEngine.get_ast grafite_status include_paths strm in
          ast, text
     | `Ast (st, text) -> st, text
@@ -665,9 +665,9 @@ object (self)
   method eos = 
     let rec is_there_only_comments lexicon_status s = 
       if Pcre.pmatch ~rex:only_dust_RE s then raise Margin;
-      let grammar = CicNotationParser.level2_ast_grammar lexicon_status in
       let strm =
-       Grammar.parsable grammar (Obj.magic(Ulexing.from_utf8_string s)) in
+       GrafiteParser.parsable_statement lexicon_status
+        (Ulexing.from_utf8_string s)in
       match GrafiteParser.parse_statement lexicon_status strm with
       | GrafiteAst.Comment (loc,_) -> 
           let _,parsed_text_length = MatitaGtkMisc.utf8_parsed_text s loc in