let regexp alpha = [ 'a' - 'z' 'A' - 'Z' ]
let regexp digit = [ '0' - '9' ]
let regexp blank = [ ' ' '\t' '\n' ]
+let regexp paren = [ '(' '[' '{' ')' ']' '}' ]
+let regexp implicit = '?'
+let regexp symbol_char =
+ [^ 'a' - 'z' 'A' - 'Z' '0' - '9' ' ' '\t' '\n' '\\' '(' '[' '{' ')' ']' '}' ]
let regexp blanks = blank+
let regexp num = digit+
let regexp tex_token = '\\' alpha+
-let regexp symbol = [^ 'a' - 'z' 'A' - 'Z' '0' - '9' ' ' '\t' '\n' ]
+let regexp symbol = symbol_char+
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 regexp paren = [ '(' '[' '{' ')' ']' '}' ]
-let regexp implicit = '?'
-let regexp meta = '?' num
+let regexp meta = implicit num
let regexp qstring = '"' [^ '"']* '"'
let regexp uri =
(* schema *) (* path *) (* ext *) (* xpointer *)
let keywords = Hashtbl.create 17
let _ =
List.iter (fun keyword -> Hashtbl.add keywords keyword ("", keyword))
- [ "Prop"; "Type"; "Set"; "let"; "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))
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"