X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_notation%2FcicNotationLexer.ml;h=9c0efc8bb99a8b06c6b1e684637c1da562ba7c55;hb=2ecd65dbcc1388bb2dfe6425e6ef1b2e3f45c4ac;hp=b5cd026d6946cc45c2f5e5b811e5be727e847951;hpb=34113d572c334c351ba66f4b05db503eed4d48f2;p=helm.git

diff --git a/helm/ocaml/cic_notation/cicNotationLexer.ml b/helm/ocaml/cic_notation/cicNotationLexer.ml
index b5cd026d6..9c0efc8bb 100644
--- a/helm/ocaml/cic_notation/cicNotationLexer.ml
+++ b/helm/ocaml/cic_notation/cicNotationLexer.ml
@@ -91,11 +91,9 @@ let level2_meta_keywords =
   (* (string, unit) Hashtbl.t, to exploit multiple bindings *)
 let level2_ast_keywords = Hashtbl.create 23
 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" ]
+  [ "CProp"; "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 +215,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", "")