fix

[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 6bdbd8057015a58cc7bd119ff38dc5fc463aa849..5127f21383b222e6bac568c79f73e777f6282582 100644 (file)
--- a/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml
+++ b/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml
@@ -38,18 +38,17 @@ let regexp symbol_char =
      ' ' '\t' '\n'
      '\\' '(' '[' '{' ')' ']' '}' '?'
   ]
-let regexp dust = "%%" [^ '\n']* '\n'
 
-let regexp comment_char = [^ ")" ]
-let regexp note = "(*" comment_char* "*)"
+let regexp comment_char = [^'*'] | '*'[^')']
+let regexp note = "(*" ([^'*'] | "**") comment_char* "*)"
 
-let regexp commentbegin = "(**"
-let regexp commentend = "**)"
+let regexp commentbegin = "(**" blank
+let regexp commentend = "*)"
 
 let regexp blanks = blank+
 let regexp num = digit+
 let regexp tex_token = '\\' alpha+
-let regexp symbol = symbol_char+
+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+)
@@ -140,11 +139,10 @@ let rec token comments = lexer
         return lexbuf ("SYMBOL", Utf8Macro.expand macro)
       with Utf8Macro.Macro_not_found _ ->
         return lexbuf ("SYMBOL", Ulexing.utf8_lexeme lexbuf))
-  | dust -> token comments lexbuf
   | note -> 
       (*if comments then*)
         let comment =
-          Ulexing.utf8_sub_lexeme lexbuf 2 (Ulexing.lexeme_length lexbuf - 2)
+          Ulexing.utf8_sub_lexeme lexbuf 2 (Ulexing.lexeme_length lexbuf - 4)
         in
         return lexbuf ("NOTE", comment)
       (*else