aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--defs/id.def2
-rw-r--r--parse.y2
2 files changed, 1 insertions, 3 deletions
diff --git a/defs/id.def b/defs/id.def
index 4fe9d3ccd8..f2ff293f6b 100644
--- a/defs/id.def
+++ b/defs/id.def
@@ -76,7 +76,6 @@ token_ops = %[\
UPlus +@ UPLUS
UMinus -@ UMINUS
Pow ** POW
- DSTAR **
Cmp <=> CMP
PLUS +
MINUS -
@@ -99,7 +98,6 @@ token_ops = %[\
AREF []
ASET []=
COLON2 ::
- COLON3 ::
ANDOP &&
OROP ||
ANDDOT &.
diff --git a/parse.y b/parse.y
index 0e1734bf6a..ba72ac0b80 100644
--- a/parse.y
+++ b/parse.y
@@ -943,7 +943,7 @@ static void token_info_pop_gen(struct parser_params*, const char *token, size_t
%token tLSHFT RUBY_TOKEN(LSHFT) "<<"
%token tRSHFT RUBY_TOKEN(RSHFT) ">>"
%token tANDDOT RUBY_TOKEN(ANDDOT) "&."
-%token tCOLON2 "::"
+%token tCOLON2 RUBY_TOKEN(COLON2) "::"
%token tCOLON3 ":: at EXPR_BEG"
%token <id> tOP_ASGN /* +=, -= etc. */
%token tASSOC "=>"