Simplify hack

Author: rossberg

interpreter/text/parse.ml

@@ -24,12 +24,6 @@ let wrap_lexbuf lexbuf =
   Annot.extend_source (Bytes.sub_string lexbuf.lex_buffer lexbuf.lex_start_pos n);
   {lexbuf with refill_buff}
 
-let provider lexbuf () =
-  let tok = Lexer.token lexbuf in
-  let start = Lexing.lexeme_start_p lexbuf in
-  let stop = Lexing.lexeme_end_p lexbuf in
-  tok, start, stop
-
 let convert_pos lexbuf =
   { Source.left = Lexer.convert_pos lexbuf.Lexing.lex_start_p;
     Source.right = Lexer.convert_pos lexbuf.Lexing.lex_curr_p
@@ -43,10 +37,8 @@ let make (type a) (start : _ -> _ -> a) : (module S with type t = a) =
       Annot.reset ();
       Lexing.set_filename lexbuf name;
       let lexbuf = wrap_lexbuf lexbuf in
-      let prov = provider lexbuf in
       let result =
-        try MenhirLib.Convert.Simplified.traditional2revised start prov
-        with Parser.Error ->
+        try start Lexer.token lexbuf with Parser.Error ->
           raise (Syntax (convert_pos lexbuf, "unexpected token"))
       in
       let annots = Annot.get_all () in

interpreter/text/parser.mly

@@ -1009,21 +1009,17 @@ module_ :
       $3, Textual (m, parse_annots m) @@ $sloc }
 
 inline_module :  /* Sugar */
-  | module_fields EOF
+  | module_fields
     { let m = $1 (empty_context ()) () @@ $sloc in
       (* Hack to handle annotations before first and after last token *)
-      (* Note: need EOF token here, since Menhir delivers a location
-       * with empty filename for $1 in case module_fields is empty! *)
-      let all = all_region (at $loc($2)).left.file in
+      let all = all_region (at $sloc).left.file in
       Textual (m, parse_annots Source.(m.it @@ all)) @@ $sloc }
 
 inline_module1 :  /* Sugar */
-  | module_fields1 EOF
+  | module_fields1
     { let m = $1 (empty_context ()) () @@ $sloc in
       (* Hack to handle annotations before first and after last token *)
-      (* Note: need EOF token here, since Menhir delivers a location
-       * with empty filename for $1 in case module_fields is empty! *)
-      let all = all_region (at $loc($2)).left.file in
+      let all = all_region (at $sloc).left.file in
       Textual (m, parse_annots Source.(m.it @@ all)) @@ $sloc }
 
 
@@ -1110,12 +1106,12 @@ result :
 
 script :
   | list(cmd) EOF { $1 }
-  | inline_module1 { [Module (None, $1) @@ $sloc] }  /* Sugar */
+  | inline_module1 EOF { [Module (None, $1) @@ $sloc] }  /* Sugar */
 
 script1 :
   | cmd { [$1] }
 
 module1 :
   | module_ EOF { $1 }
-  | inline_module { None, $1 }  /* Sugar */
+  | inline_module EOF { None, $1 }  /* Sugar */
 %%