Merge branch 'master' of https://git.cduce.org/cduce

parser/ulexer.ml

@@ -186,6 +186,8 @@ let regexp qname = (ncname ':')? ncname
 
 (* Should be [^ xml_letter ] *)
 let regexp not_xml_letter = [^ 'A'-'Z' 'a'-'z' '0'-'9' '_' ]
+let regexp character = _ | '\\' ['\\' '"' '\''] | "\\n" | "\\t" | "\\r"
+  | '\\' 'x' ['0'-'9' 'a'-'f' 'A'-'F']+ ';' | '\\' ['0'-'9']+ ';'
 
 let illegal lexbuf =
   error
@@ -226,7 +228,7 @@ let rec token = lexer
      string (L.lexeme_start lexbuf) '"' lexbuf;
      let s = get_stored_string () in
      return_loc start (L.lexeme_end lexbuf) (STRING s)
- | "'" "\\"? _ "'" ->
+ | "'" character "'" ->
      L.rollback lexbuf;
      (fun _ -> lexer
 	 | "'" -> let start = L.lexeme_start lexbuf in
@@ -280,7 +282,7 @@ and token2 = lexer
      string (L.lexeme_start lexbuf) '"' lexbuf;
      let s = get_stored_string () in
      return_loc start (L.lexeme_end lexbuf) (STRING s)
- | "'" "\\"? _ "'--'" "\\"? _ "'"
+ | "'" character "'--'" character "'"
  | "'" [^ '\'']+ "'" not_xml_letter ->
      L.rollback lexbuf;
      (fun _ -> lexer
@@ -345,7 +347,7 @@ and token2toplevel = lexer
      string (L.lexeme_start lexbuf) '"' lexbuf;
      let s = get_stored_string () in
      return_loc start (L.lexeme_end lexbuf) (STRING s)
- | "'" "\\"? _ "'--'" "\\"? _ "'"
+ | "'" character "'--'" character "'"
  | "'" ((";"[^ ";'"]) | [^ ";'"])* ";"? "'" not_xml_letter ->
      L.rollback lexbuf;
      (fun _ -> lexer