X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2FcicTextualLexer2.ml;h=be2a034ac7f6c48a08828cc7685202c441416b9c;hb=9be7ec5bbacfafed8a3e37cfe0095f2aea1b9bf9;hp=21f0205203aea6e410b54d283a8ed60f1a92bf1f;hpb=14cf23213ea79b1157c224b2af2a256cff06e241;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml b/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml
index 21f020520..be2a034ac 100644
--- a/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml
+++ b/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml
@@ -40,7 +40,12 @@ 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 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
@@ -86,6 +91,7 @@ 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
@@ -94,14 +100,19 @@ let rec token = lexer
   | num -> return lexbuf ("NUM", 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 =
         Ulexing.utf8_sub_lexeme lexbuf 1 (Ulexing.lexeme_length lexbuf - 1)
       in
       (try
-        return lexbuf ("SYMBOL", Macro.expand macro)
-      with Macro.Macro_not_found _ ->
+        return lexbuf ("SYMBOL", CicTextualParser2Macro.expand macro)
+      with CicTextualParser2Macro.Macro_not_found _ ->
         return lexbuf ("SYMBOL", Ulexing.utf8_lexeme lexbuf))
   | eof -> return lexbuf ("EOI", "")
   | _ -> error lexbuf "Invalid character"
@@ -116,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 _ -> ());
@@ -125,3 +136,4 @@ let lex =
     Token.tok_text = Token.lexer_text;
     Token.tok_comm = None;
   }
+