X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2FcicTextualLexer2.ml;h=9534704edd466caeabd591cc9ed6ebf84ef8b7d2;hb=c66e9d17eda5e5defcb363e42d891d2b407cf7c3;hp=ba70d2745c8f73126733eff03c32664e15a1fc75;hpb=e3ce9e2940a9e9c736209517e20e4c4292fdd0c3;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml b/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml
index ba70d2745..9534704ed 100644
--- a/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml
+++ b/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml
@@ -30,28 +30,37 @@ exception Not_an_extended_ident
 let regexp alpha = [ 'a' - 'z' 'A' - 'Z' ]
 let regexp digit = [ '0' - '9' ]
 let regexp blank = [ ' ' '\t' '\n' ]
-
+let regexp paren = [ '(' '[' '{' ')' ']' '}' ]
+let regexp implicit = '?'
+let regexp symbol_char =
+  [^ 'a' - 'z' 'A' - 'Z' '0' - '9'
+     ' ' '\t' '\n'
+     '\\' '(' '[' '{' ')' ']' '}' '?'
+  ]
+let regexp comment_char = [^ '\n' ]
+let regexp comment = "%%" comment_char*
 let regexp blanks = blank+
 let regexp num = digit+
 let regexp tex_token = '\\' alpha+
-let regexp symbol = [^ 'a' - 'z' 'A' - 'Z' '0' - '9' ' ' '\t' '\n' ]
+let regexp symbol = symbol_char+
 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 paren = [ '(' '[' '{' ')' ']' '}' ]
-let regexp implicit = '?'
-let regexp meta = '?' num
+let regexp meta = implicit num
 let regexp qstring = '"' [^ '"']* '"'
 let regexp uri =
-  (*      schema      *) (*     path     *) (*  ext   *) (*    xpointer     *)
-  ("cic:/" | "theory:/") ident ('/' ident)* ('.' ident)+ ('#' num ('/' num)*)?
+  ("cic:/" | "theory:/")              (* schema *)
+  ident ('/' ident)*                  (* path *)
+  ('.' ident)+                        (* ext *)
+  ("#xpointer(" num ('/' num)+ ")")?    (* xpointer *)
 (* let regexp catchall = .* *)
 
 let keywords = Hashtbl.create 17
 let _ =
   List.iter (fun keyword -> Hashtbl.add keywords keyword ("", keyword))
-    [ "Prop"; "Type"; "Set"; "let"; "Let"; "rec"; "using"; "match"; "with" ]
+    [ "Prop"; "Type"; "Set"; "let"; "Let"; "rec"; "using"; "match"; "with";
+      "in"; "and" ]
 
 let error lexbuf msg =
   raise (Error (Ulexing.lexeme_start lexbuf, Ulexing.lexeme_end lexbuf, msg))
@@ -119,9 +128,14 @@ let rec token = lexer
         Ulexing.utf8_sub_lexeme lexbuf 1 (Ulexing.lexeme_length lexbuf - 1)
       in
       (try
-        return lexbuf ("SYMBOL", CicTextualParser2Macro.expand macro)
-      with CicTextualParser2Macro.Macro_not_found _ ->
+        return lexbuf ("SYMBOL", Utf8Macro.expand macro)
+      with Utf8Macro.Macro_not_found _ ->
         return lexbuf ("SYMBOL", Ulexing.utf8_lexeme lexbuf))
+  | comment ->
+      let comment =
+        Ulexing.utf8_sub_lexeme lexbuf 2 (Ulexing.lexeme_length lexbuf - 2)
+      in
+      return lexbuf ("COMMENT", comment)
   | eof -> return lexbuf ("EOI", "")
   | _ -> error lexbuf "Invalid character"