X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2FcicTextualLexer2.ml;h=32d8ae54da64d11ac23e7a0ce0b2fee899921911;hb=7793efe5c9ac8ff4c71579e6fc0aa4764dd2bc9e;hp=a326acf7f5e5c246e9999487666bffe4a7478aa7;hpb=13d2c8cde6d1f64c720bcdf703e4846fdbadee08;p=helm.git diff --git a/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml b/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml index a326acf7f..32d8ae54d 100644 --- a/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml +++ b/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml @@ -38,13 +38,12 @@ let regexp symbol_char = ' ' '\t' '\n' '\\' '(' '[' '{' ')' ']' '}' '?' ] -let regexp dust = "%%" [^ '\n']* '\n' let regexp comment_char = [^'*'] | '*'[^')'] -let regexp note = "(*" 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+ @@ -67,7 +66,7 @@ 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"] let error lexbuf msg = raise (Error (Ulexing.lexeme_start lexbuf, Ulexing.lexeme_end lexbuf, msg)) @@ -140,7 +139,6 @@ let rec token comments = lexer 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 =