diff options
| author | Alain Frisch <alain@frisch.fr> | 2012-07-30 10:15:10 +0000 |
|---|---|---|
| committer | Alain Frisch <alain@frisch.fr> | 2012-07-30 10:15:10 +0000 |
| commit | f6f54d325d799f45dbf18e45f1af6e9702861413 (patch) | |
| tree | 8ad7e340c3c48ddcc4bf2fb179832a3b3777c367 | |
| parent | 1641d2d16ec149acc6301dfcf2dbce6b80203a3b (diff) | |
#4762: QUESTIONQUESTION is no longer a token.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12795 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | Changes | 1 | ||||
| -rw-r--r-- | parsing/lexer.mll | 1 | ||||
| -rw-r--r-- | parsing/parser.mly | 1 |
3 files changed, 1 insertions, 2 deletions
@@ -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 |