X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2FcicTextualLexer2.ml;h=b28d3cae66de76a40b49725bdc829024dbcce848;hb=423f3f23abfe6d5906818c26ab92d3703714057d;hp=4cf0e4270a2fe29e53fdacac1aa017f83e055799;hpb=63b1ff9601a54dba2bed63c2b58ec909dc162471;p=helm.git diff --git a/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml b/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml index 4cf0e4270..b28d3cae6 100644 --- a/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml +++ b/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml @@ -32,20 +32,24 @@ let regexp digit = [ '0' - '9' ] let regexp blank = [ ' ' '\t' '\n' ] let regexp paren = [ '(' '[' '{' ')' ']' '}' ] let regexp implicit = '?' +let regexp placeholder = '%' let regexp symbol_char = [^ 'a' - 'z' 'A' - 'Z' '0' - '9' ' ' '\t' '\n' '\\' '(' '[' '{' ')' ']' '}' '?' ] let regexp dust = "%%" [^ '\n']* '\n' -let regexp comment_char = [^ "*)" ] + +let regexp comment_char = [^ ")" ] let regexp note = "(*" comment_char* "*)" + let regexp commentbegin = "(**" 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+) @@ -124,6 +128,7 @@ let rec token comments = lexer | paren -> return lexbuf ("PAREN", Ulexing.utf8_lexeme lexbuf) | meta -> return lexbuf ("META", Ulexing.utf8_lexeme lexbuf) | implicit -> return lexbuf ("IMPLICIT", Ulexing.utf8_lexeme lexbuf) + | placeholder -> return lexbuf ("PLACEHOLDER", Ulexing.utf8_lexeme lexbuf) | qstring -> return lexbuf ("QSTRING", remove_quotes (Ulexing.utf8_lexeme lexbuf)) | symbol -> return lexbuf ("SYMBOL", Ulexing.utf8_lexeme lexbuf)