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

parse.y (symbol_append): Added to factor out %i[] and %I[]

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61861 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2018-01-16 01:32:58 +00:00
parent f6c659353a
commit fb1172bcf6
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
parse.y
View File

@ -430,6 +430,8 @@ static NODE *new_regexp(struct parser_params *, NODE *, int, const YYLTYPE *);
static NODE *new_xstring(struct parser_params *, NODE *, const YYLTYPE *loc); static NODE *new_xstring(struct parser_params *, NODE *, const YYLTYPE *loc);
#define new_string1(str) (str) #define new_string1(str) (str)
static NODE *symbol_append(struct parser_params *p, NODE *symbols, NODE *symbol);
#define new_brace_body(param, stmt, loc) NEW_ITER(param, stmt, loc) #define new_brace_body(param, stmt, loc) NEW_ITER(param, stmt, loc)
#define new_do_body(param, stmt, loc) NEW_ITER(param, stmt, loc) #define new_do_body(param, stmt, loc) NEW_ITER(param, stmt, loc)
@ -3593,15 +3595,7 @@ symbol_list : /* none */
| symbol_list word ' ' | symbol_list word ' '
{ {
/*%%%*/ /*%%%*/
$2 = evstr2dstr(p, $2); $$ = symbol_append(p, $1, evstr2dstr(p, $2));
if (nd_type($2) == NODE_DSTR) {
nd_set_type($2, NODE_DSYM);
}
else {
nd_set_type($2, NODE_LIT);
add_mark_object(p, $2->nd_lit = rb_str_intern($2->nd_lit));
}
$$ = list_append(p, $1, $2);
/*% /*%
$$ = dispatch2(symbols_add, $1, $2); $$ = dispatch2(symbols_add, $1, $2);
%*/ %*/
@ -3658,12 +3652,8 @@ qsym_list : /* none */
| qsym_list tSTRING_CONTENT ' ' | qsym_list tSTRING_CONTENT ' '
{ {
/*%%%*/ /*%%%*/
VALUE lit;
lit = $2->nd_lit;
nd_set_type($2, NODE_LIT);
add_mark_object(p, $2->nd_lit = ID2SYM(rb_intern_str(lit)));
nd_set_loc($2, &@2); nd_set_loc($2, &@2);
$$ = list_append(p, $1, $2); $$ = symbol_append(p, $1, $2);
/*% /*%
$$ = dispatch2(qsymbols_add, $1, $2); $$ = dispatch2(qsymbols_add, $1, $2);
%*/ %*/
@ -8958,6 +8948,19 @@ new_defined(struct parser_params *p, NODE *expr, const YYLTYPE *loc)
return NEW_DEFINED(remove_begin_all(expr), loc); return NEW_DEFINED(remove_begin_all(expr), loc);
} }
static NODE*
symbol_append(struct parser_params *p, NODE *symbols, NODE *symbol)
{
if (nd_type(symbol) == NODE_DSTR) {
nd_set_type(symbol, NODE_DSYM);
}
else {
nd_set_type(symbol, NODE_LIT);
symbol->nd_lit = add_mark_object(p, rb_str_intern(symbol->nd_lit));
}
return list_append(p, symbols, symbol);
}
static NODE * static NODE *
new_regexp(struct parser_params *p, NODE *node, int options, const YYLTYPE *loc) new_regexp(struct parser_params *p, NODE *node, int options, const YYLTYPE *loc)
{ {