' ' '\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 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 uri_step = (alpha (ident_cont|'-')*)
let regexp meta = implicit num
let regexp qstring = '"' [^ '"']* '"'
+let regexp uri_suffix = "con"|"ind"|"var"
let regexp uri =
("cic:/" | "theory:/") (* schema *)
- ident ('/' ident)* (* path *)
- ('.' ident)+ (* ext *)
- ("#xpointer(" num ('/' num)+ ")")? (* xpointer *)
+ uri_step ('/' uri_step)* (* path *)
+ ('.' uri_suffix)+ (* ext *)
+ ("#xpointer(" num ('/' num)+ ")")? (* xpointer *)
(* let regexp catchall = .* *)
let keywords = Hashtbl.create 17
let _ =
List.iter (fun keyword -> Hashtbl.add keywords keyword ("", keyword))
[ "Prop"; "Type"; "Set"; "let"; "Let"; "rec"; "using"; "match"; "with";
- "in"; "and" ]
+ "in"; "and"; "to"; "as"; "on"; "names"]
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