kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

parse.y (new_ary_op_assign): Factor out the typical code clone

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61842 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2018-01-15 06:25:43 +00:00
parent c2052b027c
commit 7c088b9662
1 changed files with 30 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
parse.y
View file

@ -404,6 +404,7 @@ static void rb_backref_error(struct parser_params*,NODE*);
static NODE *node_assign(struct parser_params*,NODE*,NODE*,const YYLTYPE*);
static NODE *new_op_assign(struct parser_params *p, NODE *lhs, ID op, NODE *rhs, const YYLTYPE *loc);
static NODE *new_ary_op_assign(struct parser_params *p, NODE *ary, NODE *args, ID op, NODE *rhs, const YYLTYPE *args_loc, const YYLTYPE *loc);
static NODE *new_attr_op_assign(struct parser_params *p, NODE *lhs, ID atype, ID attr, ID op, NODE *rhs, const YYLTYPE *loc);
static NODE *new_const_op_assign(struct parser_params *p, NODE *lhs, ID op, NODE *rhs, const YYLTYPE *loc);
@ -486,6 +487,7 @@ static VALUE new_qcall(struct parser_params *p, VALUE q, VALUE r, VALUE m, VALUE
#define new_nil(loc) Qnil
#define new_op_assign(p,lhs,op,rhs,loc) dispatch3(opassign, (lhs), (op), (rhs))
static VALUE new_ary_op_assign(struct parser_params *p, VALUE ary, VALUE args, VALUE op, VALUE rhs, const YYLTYPE *args_loc, const YYLTYPE *loc);
static VALUE new_attr_op_assign(struct parser_params *p, VALUE lhs, VALUE type, VALUE attr, VALUE op, VALUE rhs, const YYLTYPE *loc);
#define new_const_op_assign(p, lhs, op, rhs, loc) new_op_assign(p, lhs, op, rhs, loc)
@ -1293,23 +1295,8 @@ command_asgn : lhs '=' command_rhs
}
| primary_value '[' opt_call_args rbracket tOP_ASGN command_rhs
{
/*%%%*/
NODE *args;
value_expr($6);
$3 = make_array($3, &@3);
if (nd_type($3) == NODE_BLOCK_PASS) {
args = NEW_ARGSCAT($3, $6, &@$);
}
else {
args = arg_concat(p, $3, $6, &@$);
}
$$ = NEW_OP_ASGN1($1, $5, args, &@$);
fixpos($$, $1);
/*%
$$ = dispatch2(aref_field, $1, escape_Qundef($3));
$$ = dispatch3(opassign, $$, $5, $6);
%*/
$$ = new_ary_op_assign(p, $1, $3, $5, $6, &@3, &@$);
}
| primary_value call_op tIDENTIFIER tOP_ASGN command_rhs
{
@ -1923,23 +1910,8 @@ arg : lhs '=' arg_rhs
}
| primary_value '[' opt_call_args rbracket tOP_ASGN arg_rhs
{
/*%%%*/
NODE *args;
value_expr($6);
$3 = make_array($3, &@3);
if (nd_type($3) == NODE_BLOCK_PASS) {
args = NEW_ARGSCAT($3, $6, &@$);
}
else {
args = arg_concat(p, $3, $6, &@$);
}
$$ = NEW_OP_ASGN1($1, $5, args, &@$);
fixpos($$, $1);
/*%
$1 = dispatch2(aref_field, $1, escape_Qundef($3));
$$ = dispatch3(opassign, $1, $5, $6);
%*/
$$ = new_ary_op_assign(p, $1, $3, $5, $6, &@3, &@$);
}
| primary_value call_op tIDENTIFIER tOP_ASGN arg_rhs
{
@ -10402,6 +10374,24 @@ new_op_assign(struct parser_params *p, NODE *lhs, ID op, NODE *rhs, const YYLTYP
return asgn;
}
static NODE *
new_ary_op_assign(struct parser_params *p, NODE *ary,
NODE *args, ID op, NODE *rhs, const YYLTYPE *args_loc, const YYLTYPE *loc)
{
NODE *asgn;
args = make_array(args, args_loc);
if (nd_type(args) == NODE_BLOCK_PASS) {
args = NEW_ARGSCAT(args, rhs, loc);
}
else {
args = arg_concat(p, args, rhs, loc);
}
asgn = NEW_OP_ASGN1(ary, op, args, loc);
fixpos(asgn, ary);
return asgn;
}
static NODE *
new_attr_op_assign(struct parser_params *p, NODE *lhs,
ID atype, ID attr, ID op, NODE *rhs, const YYLTYPE *loc)
@ -10437,6 +10427,14 @@ const_decl(struct parser_params *p, NODE *path, const YYLTYPE *loc)
return NEW_CDECL(0, 0, (path), loc);
}
#else
static VALUE
new_ary_op_assign(struct parser_params *p, VALUE ary,
VALUE args, VALUE op, VALUE rhs, const YYLTYPE *args_loc, const YYLTYPE *loc)
{
VALUE recv = dispatch2(aref_field, ary, escape_Qundef(args));
return dispatch3(opassign, recv, op, rhs);
}
static VALUE
new_attr_op_assign(struct parser_params *p, VALUE lhs, VALUE type, VALUE attr, VALUE op, VALUE rhs, const YYLTYPE *loc)
{