let regexp num = digit+
let regexp tex_token = '\\' alpha+
let regexp symbol = [^ 'a' - 'z' 'A' - 'Z' '0' - '9' ' ' '\t' '\n' ]
-let regexp ident_cont = alpha | num | '_'
+let regexp ident_cont = alpha | num | '_' | '\''
let regexp ident_cont' = ident_cont | tex_token
let regexp ident = (alpha ident_cont*) | ('_' ident_cont+)
let regexp ident' = ((alpha | tex_token) ident_cont'*) | ('_' ident_cont'+)
let keywords = Hashtbl.create 17
let _ =
List.iter (fun keyword -> Hashtbl.add keywords keyword ("", keyword))
- [ "Prop"; "Type"; "Set"; "let"; "rec"; "using"; "match"; "with" ]
+ [ "Prop"; "Type"; "Set"; "let"; "Let"; "rec"; "using"; "match"; "with";
+ "in"; "and" ]
let error lexbuf msg =
raise (Error (Ulexing.lexeme_start lexbuf, Ulexing.lexeme_end lexbuf, msg))
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 =
Ulexing.utf8_sub_lexeme lexbuf 1 (Ulexing.lexeme_length lexbuf - 1)
in
(try
- return lexbuf ("SYMBOL", CicTextualParser2Macro.expand macro)
- with CicTextualParser2Macro.Macro_not_found _ ->
+ return lexbuf ("SYMBOL", Utf8Macro.expand macro)
+ with Utf8Macro.Macro_not_found _ ->
return lexbuf ("SYMBOL", Ulexing.utf8_lexeme lexbuf))
| eof -> return lexbuf ("EOI", "")
| _ -> error lexbuf "Invalid character"
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