' ' '\t' '\n'
'\\' '(' '[' '{' ')' ']' '}' '?'
]
-let regexp dust = "%%" [^ '\n']* '\n'
-let regexp comment_char = [^ ")" ]
-let regexp note = "(*" comment_char* "*)"
+let regexp comment_char = [^'*'] | '*'[^')']
+let regexp note = "(*" ([^'*'] | "**") comment_char* "*)"
-let regexp commentbegin = "(**"
-let regexp commentend = "**)"
+let regexp commentbegin = "(**" blank
+let regexp commentend = "*)"
let regexp blanks = blank+
let regexp num = digit+
let regexp tex_token = '\\' alpha+
-let regexp symbol = symbol_char+
+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 _ =
List.iter (fun keyword -> Hashtbl.add keywords keyword ("", keyword))
[ "Prop"; "Type"; "Set"; "let"; "Let"; "rec"; "using"; "match"; "with";
- "in"; "and" ]
+ "in"; "and"; "to" ]
let error lexbuf msg =
raise (Error (Ulexing.lexeme_start lexbuf, Ulexing.lexeme_end lexbuf, msg))
return lexbuf ("SYMBOL", Utf8Macro.expand macro)
with Utf8Macro.Macro_not_found _ ->
return lexbuf ("SYMBOL", Ulexing.utf8_lexeme lexbuf))
- | dust -> token comments lexbuf
| note ->
(*if comments then*)
let comment =
- Ulexing.utf8_sub_lexeme lexbuf 2 (Ulexing.lexeme_length lexbuf - 2)
+ Ulexing.utf8_sub_lexeme lexbuf 2 (Ulexing.lexeme_length lexbuf - 4)
in
return lexbuf ("NOTE", comment)
(*else