mk_fresh_name moved to FreshNamesGenerator.

[helm.git] / helm / ocaml / cic_disambiguation / cicTextualLexer2.ml

diff --git a/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml b/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml
index 5363d2180e72426f31bd329eeaf3f406da343db0..bcc8fda28486221bbafa1bbd17c65eac1de52cf9 100644 (file)
--- a/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml
+++ b/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml
@@ -39,9 +39,13 @@ let regexp ident_cont = alpha | num | '_'
 let regexp ident_cont' = ident_cont | tex_token
 let regexp ident = (alpha ident_cont*) | ('_' ident_cont+)
 let regexp ident' = ((alpha | tex_token) ident_cont'*) | ('_' ident_cont'+)
-let regexp lparen = [ '(' '[' '{' ]
-let regexp rparen = [ ')' ']' '}' ]
+let regexp paren = [ '(' '[' '{' ')' ']' '}' ]
+let regexp implicit = '?'
 let regexp meta = '?' num
+let regexp qstring = '"' [^ '"']* '"'
+let regexp uri =
+  (*      schema      *) (*     path     *) (*  ext   *) (*    xpointer     *)
+  ("cic:/" | "theory:/") ident ('/' ident)* ('.' ident)+ ('#' num ('/' num)*)?
 (* let regexp catchall = .* *)
 
 let keywords = Hashtbl.create 17
@@ -87,15 +91,20 @@ and token = lexer
 *)
 let rec token = lexer
   | blanks -> token lexbuf
+  | uri -> return lexbuf ("URI", Ulexing.utf8_lexeme lexbuf)
   | ident ->
       let lexeme = Ulexing.utf8_lexeme lexbuf in
       (try
         return lexbuf (Hashtbl.find keywords lexeme)
       with Not_found -> return lexbuf ("IDENT", lexeme))
   | num -> return lexbuf ("NUM", Ulexing.utf8_lexeme lexbuf)
-  | lparen -> return lexbuf ("LPAREN", Ulexing.utf8_lexeme lexbuf)
-  | rparen -> return lexbuf ("RPAREN", Ulexing.utf8_lexeme lexbuf)
+  | paren -> return lexbuf ("PAREN", Ulexing.utf8_lexeme lexbuf)
   | meta -> return lexbuf ("META", Ulexing.utf8_lexeme lexbuf)
+  | implicit -> return lexbuf ("IMPLICIT", Ulexing.utf8_lexeme lexbuf)
+  | qstring ->
+      let lexeme = Ulexing.utf8_lexeme lexbuf in
+      let s = String.sub lexeme 1 (String.length lexeme - 2) in
+      return lexbuf ("QSTRING", s)
   | symbol -> return lexbuf ("SYMBOL", Ulexing.utf8_lexeme lexbuf)
   | tex_token ->
       let macro =
@@ -118,7 +127,7 @@ let tok_func stream =
       | Ulexing.Error -> error_at_end lexbuf "Unexpected character"
       | Ulexing.InvalidCodepoint i -> error_at_end lexbuf "Invalid code point")
 
-let lex =
+let cic_lexer =
   { 
     Token.tok_func = tok_func;
     Token.tok_using = (fun _ -> ());
@@ -127,3 +136,4 @@ let lex =
     Token.tok_text = Token.lexer_text;
     Token.tok_comm = None;
   }
+