X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_notation%2FcicNotationLexer.ml;fp=helm%2Focaml%2Fcic_notation%2FcicNotationLexer.ml;h=9897412b95a21b63e291f486e3421b057d6e0ebf;hb=e20f3963028a966fc93ba0d611c4aa8341d20e2c;hp=b5cd026d6946cc45c2f5e5b811e5be727e847951;hpb=b24260fd5c00791ad04042405e3942f288f54ab2;p=helm.git diff --git a/helm/ocaml/cic_notation/cicNotationLexer.ml b/helm/ocaml/cic_notation/cicNotationLexer.ml index b5cd026d6..9897412b9 100644 --- a/helm/ocaml/cic_notation/cicNotationLexer.ml +++ b/helm/ocaml/cic_notation/cicNotationLexer.ml @@ -94,8 +94,8 @@ let _ = (* TODO ZACK: keyword list almost cut and paste from cicTextualLexer2.ml, to * be reviewed *) List.iter (fun k -> Hashtbl.add level2_ast_keywords k ()) - [ "Prop"; "Type"; "Set"; "let"; "rec"; "corec"; "match"; "with"; "in"; - "and"; "on" ] + [ "Prop"; "Type"; "Set"; "let"; "rec"; "corec"; "using"; "match"; "with"; + "in"; "and"; "to"; "as"; "on"; "names" ] let add_level2_ast_keyword k = Hashtbl.add level2_ast_keywords k () let remove_level2_ast_keyword k = Hashtbl.remove level2_ast_keywords k @@ -217,7 +217,8 @@ let rec level2_ast_token = lexer | uri -> return lexbuf ("URI", Ulexing.utf8_lexeme lexbuf) | qstring -> return lexbuf ("QSTRING", remove_quotes (Ulexing.utf8_lexeme lexbuf)) - | csymbol -> return lexbuf ("CSYMBOL", Ulexing.utf8_lexeme lexbuf) + | csymbol -> + return lexbuf ("CSYMBOL", remove_left_quote (Ulexing.utf8_lexeme lexbuf)) | "${" -> read_unparsed_group "UNPARSED_META" lexbuf | "@{" -> read_unparsed_group "UNPARSED_AST" lexbuf | '(' -> return lexbuf ("LPAREN", "")