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: make tNUMPARAM id

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67308 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2019-03-20 00:31:02 +00:00
parent afa1505ca8
commit 740248425c
1 changed files with 3 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
parse.y
View file

@ -862,6 +862,7 @@ static void token_info_warn(struct parser_params *p, const char *token, token_in
%token <id> tCONSTANT "constant" %token <id> tCONSTANT "constant"
%token <id> tCVAR "class variable" %token <id> tCVAR "class variable"
%token <id> tLABEL %token <id> tLABEL
%token <id> tNUMPARAM "numbered parameter"
%token <node> tINTEGER "integer literal" %token <node> tINTEGER "integer literal"
%token <node> tFLOAT "float literal" %token <node> tFLOAT "float literal"
%token <node> tRATIONAL "rational literal" %token <node> tRATIONAL "rational literal"
@ -871,7 +872,6 @@ static void token_info_warn(struct parser_params *p, const char *token, token_in
%token <node> tBACK_REF "back reference" %token <node> tBACK_REF "back reference"
%token <node> tSTRING_CONTENT "literal content" %token <node> tSTRING_CONTENT "literal content"
%token <num> tREGEXP_END %token <num> tREGEXP_END
%token <num> tNUMPARAM "numbered parameter"
%type <node> singleton strings string string1 xstring regexp %type <node> singleton strings string string1 xstring regexp
%type <node> string_contents xstring_contents regexp_contents string_content %type <node> string_contents xstring_contents regexp_contents string_content
@ -3820,11 +3820,9 @@ string_dvar : tGVAR
} }
| tNUMPARAM | tNUMPARAM
{ {
ID id = numparam_id(p, get_num($1));
/*%%%*/ /*%%%*/
$$ = NEW_DVAR(id, &@1); $$ = NEW_DVAR($1, &@1);
/*% %*/ /*% %*/
(void)id;
/*% ripper: var_ref!($1) %*/ /*% ripper: var_ref!($1) %*/
} }
| backref | backref
@ -3883,14 +3881,6 @@ user_variable : tIDENTIFIER
| tCONSTANT | tCONSTANT
| tCVAR | tCVAR
| tNUMPARAM | tNUMPARAM
{
ID id = numparam_id(p, get_num($1));
/*%%%*/
$$ = id;
/*%
$$ = ripper_new_yylval(p, id, get_value($1), 0);
%*/
}
; ;
keyword_variable: keyword_nil {$$ = KWD2EID(nil, $1);} keyword_variable: keyword_nil {$$ = KWD2EID(nil, $1);}
@ -7663,7 +7653,7 @@ parser_numbered_param(struct parser_params *p, unsigned long n)
compile_error(p, "ordinary parameter is defined"); compile_error(p, "ordinary parameter is defined");
return false; return false;
} }
set_yylval_num((int)n); set_yylval_name(numparam_id(p, (int)n));
SET_LEX_STATE(EXPR_ARG); SET_LEX_STATE(EXPR_ARG);
return true; return true;
} }