merged cic_notation with disambiguation: good luck!

[helm.git] / helm / ocaml / cic_notation / cicNotationLexer.ml

diff --git a/helm/ocaml/cic_notation/cicNotationLexer.ml b/helm/ocaml/cic_notation/cicNotationLexer.ml
index b5cd026d6946cc45c2f5e5b811e5be727e847951..9897412b95a21b63e291f486e3421b057d6e0ebf 100644 (file)
--- 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", "")