let error_at_end lexbuf msg =
raise (Error (Ulexing.lexeme_end lexbuf, Ulexing.lexeme_end lexbuf, msg))
-let return lexbuf token = (token, Ulexing.loc lexbuf)
+let return lexbuf token =
+ let flocation_begin =
+ { Lexing.pos_fname = ""; Lexing.pos_lnum = -1; Lexing.pos_bol = -1;
+ Lexing.pos_cnum = Ulexing.lexeme_start lexbuf }
+ in
+ let flocation_end =
+ { flocation_begin with Lexing.pos_cnum = Ulexing.lexeme_end lexbuf }
+ in
+ (token, (flocation_begin, flocation_end))
(*
let parse_ext_ident ident =
let tok_func stream =
let lexbuf = Ulexing.from_utf8_stream stream in
- Token.make_stream_and_location
+ Token.make_stream_and_flocation
(fun () ->
try
token lexbuf