1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename DOTQ to ANDDOT

Browse Source 
* defs/id.def, parse.y: Switch internal token name to reflect
  current form of safe-call operator.  [Fix GH-1090]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52525 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-11-10 09:42:27 +00:00
parent 16e7869ded
commit a01b6453eb
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Nov 10 18:42:24 2015 Aleksandrs Ledovskis <aleksandrs@ledovskis.lv>
* defs/id.def, parse.y: Switch internal token name to reflect
current form of safe-call operator. [Fix GH-1090]
Tue Nov 10 18:25:56 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Nov 10 18:25:56 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* hash.c (rb_hash_to_proc): use rb_func_proc_new to make light * hash.c (rb_hash_to_proc): use rb_func_proc_new to make light

2
defs/id.def
View File

@ -98,7 +98,7 @@ token_ops = %[\
COLON3 :: COLON3 ::
ANDOP && ANDOP &&
OROP || OROP ||
DOTQ &. ANDDOT &.
] ]
class KeywordError < RuntimeError class KeywordError < RuntimeError

2
ext/ripper/eventids2.c
View File

@ -257,7 +257,7 @@ static const struct token_assoc {
{tRSHFT, O(op)}, {tRSHFT, O(op)},
{tSTAR, O(op)}, {tSTAR, O(op)},
{tDSTAR, O(op)}, {tDSTAR, O(op)},
{tDOTQ, O(op)}, {tANDDOT, O(op)},
{tSTRING_BEG, O(tstring_beg)}, {tSTRING_BEG, O(tstring_beg)},
{tSTRING_CONTENT, O(tstring_content)}, {tSTRING_CONTENT, O(tstring_content)},
{tSTRING_DBEG, O(embexpr_beg)}, {tSTRING_DBEG, O(embexpr_beg)},

12
parse.y
View File

@ -371,7 +371,7 @@ static int parser_yyerror(struct parser_params*, const char*);
#define ruby_coverage (parser->coverage) #define ruby_coverage (parser->coverage)
#endif #endif
#define CALL_Q_P(q) ((q) == tDOTQ) #define CALL_Q_P(q) ((q) == tANDDOT)
#define NODE_CALL_Q(q) (CALL_Q_P(q) ? NODE_QCALL : NODE_CALL) #define NODE_CALL_Q(q) (CALL_Q_P(q) ? NODE_QCALL : NODE_CALL)
#define NEW_QCALL(q,r,m,a) NEW_NODE(NODE_CALL_Q(q),r,m,a) #define NEW_QCALL(q,r,m,a) NEW_NODE(NODE_CALL_Q(q),r,m,a)
@ -875,7 +875,7 @@ static void token_info_pop(struct parser_params*, const char *token, size_t len)
%token tASET RUBY_TOKEN(ASET) "[]=" %token tASET RUBY_TOKEN(ASET) "[]="
%token tLSHFT RUBY_TOKEN(LSHFT) "<<" %token tLSHFT RUBY_TOKEN(LSHFT) "<<"
%token tRSHFT RUBY_TOKEN(RSHFT) ">>" %token tRSHFT RUBY_TOKEN(RSHFT) ">>"
%token tDOTQ RUBY_TOKEN(DOTQ) "&." %token tANDDOT RUBY_TOKEN(ANDDOT) "&."
%token tCOLON2 "::" %token tCOLON2 "::"
%token tCOLON3 ":: at EXPR_BEG" %token tCOLON3 ":: at EXPR_BEG"
%token <id> tOP_ASGN /* +=, -= etc. */ %token <id> tOP_ASGN /* +=, -= etc. */
@ -5117,12 +5117,12 @@ call_op : '.'
$$ = ripper_id2sym('.'); $$ = ripper_id2sym('.');
%*/ %*/
} }
| tDOTQ | tANDDOT
{ {
/*%%%*/ /*%%%*/
$$ = tDOTQ; $$ = tANDDOT;
/*% /*%
$$ = ripper_id2sym(idDOTQ); $$ = ripper_id2sym(idANDDOT);
%*/ %*/
} }
; ;
@ -8278,7 +8278,7 @@ parser_yylex(struct parser_params *parser)
} }
else if (c == '.') { else if (c == '.') {
lex_state = EXPR_DOT; lex_state = EXPR_DOT;
return tDOTQ; return tANDDOT;
} }
pushback(c); pushback(c);
if (IS_SPCARG(c)) { if (IS_SPCARG(c)) {