diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-02-09 07:53:52 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-02-09 07:53:52 +0000 |
| commit | f83f2e29589935681f4215b3e5fcb6dc4eae7a56 (patch) | |
| tree | e5efde639bdb0d83386d9336caceb6229107bc3a | |
| parent | 70c8415deeda6e6bb8b4c4c27293051404cd6ae1 (diff) | |
| download | ruby-f83f2e29589935681f4215b3e5fcb6dc4eae7a56.tar.gz | |
parse.y: fix idCOLON2
* defs/id.def: remove idDSTAR and idCOLON3.
* parse.y (tCOLON2): make same as id.h.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57578 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | defs/id.def | 2 | ||||
| -rw-r--r-- | parse.y | 2 |
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 &. @@ -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 "=>" |