summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Doligez <damien.doligez-inria.fr>2003-02-25 16:38:30 +0000
committerDamien Doligez <damien.doligez-inria.fr>2003-02-25 16:38:30 +0000
commit0483c6ac9208c07c5fd24a587d00066d1523b26f (patch)
treec3217809d82edcd3c898db0d8d11006ef897bdcd
parent57679b800bab95195585bc6a415a78c93e19be7d (diff)
PR#1553
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5408 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--parsing/lexer.mll1
-rw-r--r--parsing/parser.mly1
2 files changed, 2 insertions, 0 deletions
diff --git a/parsing/lexer.mll b/parsing/lexer.mll
index 5f5d36053..72d603f1f 100644
--- a/parsing/lexer.mll
+++ b/parsing/lexer.mll
@@ -252,6 +252,7 @@ rule token = parse
raise (Error(Keyword_as_label name, Location.curr lexbuf));
LABEL name }
| "?" { QUESTION }
+ | "??" { QUESTIONQUESTION }
| "?" lowercase identchar * ':'
{ let s = Lexing.lexeme lexbuf in
let name = String.sub s 1 (String.length s - 2) in
diff --git a/parsing/parser.mly b/parsing/parser.mly
index 8d98da37d..5f3c9b489 100644
--- a/parsing/parser.mly
+++ b/parsing/parser.mly
@@ -250,6 +250,7 @@ let bigarray_set arr arg newval =
%token <string> PREFIXOP
%token PRIVATE
%token QUESTION
+%token QUESTIONQUESTION
%token QUOTE
%token RBRACE
%token RBRACKET