summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Changes1
-rw-r--r--parsing/lexer.mll1
-rw-r--r--parsing/parser.mly1
3 files changed, 1 insertions, 2 deletions
diff --git a/Changes b/Changes
index 45b6f77f7..c8bd4b95f 100644
--- a/Changes
+++ b/Changes
@@ -12,6 +12,7 @@ Bug fixes:
- PR#5695: remove warnings on sparc code emitter
- PR#5697: better location for warnings on statement expressions
- PR#5698: remove harcoded limit of 200000 labels in emitaux.ml
+- PR#4762: ?? is not used at all, but registered as a lexer token
Internals:
- Moved debugger/envaux.ml to typing/envaux.ml to publish env_of_only_summary
diff --git a/parsing/lexer.mll b/parsing/lexer.mll
index 652382aa7..9eb85d76b 100644
--- a/parsing/lexer.mll
+++ b/parsing/lexer.mll
@@ -268,7 +268,6 @@ 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 fb7d5745a..579e69736 100644
--- a/parsing/parser.mly
+++ b/parsing/parser.mly
@@ -380,7 +380,6 @@ let wrap_type_annotation newtypes core_type body =
%token <string> PREFIXOP
%token PRIVATE
%token QUESTION
-%token QUESTIONQUESTION
%token QUOTE
%token RBRACE
%token RBRACKET