From 9e9551378171f33a6dea7d90c79eaf2dafe8fb1e Mon Sep 17 00:00:00 2001 From: mame Date: Sat, 20 Jan 2018 06:11:21 +0000 Subject: parse.y: Remove unneeded var_field_1 trick I thought this trick was needed because the result of var_field was passed to different arguments, as follows: ``` $1 = var_field(p, $1); $$ = backref_assign_error(p, $1, $1, &@$); ``` Currently the DSL supports that one result is passed to one argument. However, after the refactoring, I found that `backref_assign_error` uses only one `$1`. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61979 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- parse.y | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'parse.y') diff --git a/parse.y b/parse.y index ec70974efb..f1701f058a 100644 --- a/parse.y +++ b/parse.y @@ -1260,7 +1260,7 @@ command_asgn : lhs '=' command_rhs rb_backref_error(p, $1); $$ = NEW_BEGIN(0, &@$); /*% %*/ - /*% ripper[var_field_1,error]: assign_error!(assign!($1, $3)) %*/ + /*% ripper[error]: assign_error!(assign!(var_field(p, $1), $3)) %*/ } ; @@ -1559,14 +1559,14 @@ mlhs_node : user_variable /*%%%*/ $$ = assignable(p, $1, 0, &@$); /*% %*/ - /*% ripper[var_field_1]: assignable(p, $1) %*/ + /*% ripper: assignable(p, var_field(p, $1)) %*/ } | keyword_variable { /*%%%*/ $$ = assignable(p, $1, 0, &@$); /*% %*/ - /*% ripper[var_field_1]: assignable(p, $1) %*/ + /*% ripper: assignable(p, var_field(p, $1)) %*/ } | primary_value '[' opt_call_args rbracket { @@ -1610,7 +1610,7 @@ mlhs_node : user_variable rb_backref_error(p, $1); $$ = NEW_BEGIN(0, &@$); /*% %*/ - /*% ripper[var_field_1,error]: assign_error!($1) %*/ + /*% ripper[error]: assign_error!(var_field(p, $1)) %*/ } ; @@ -1619,14 +1619,14 @@ lhs : user_variable /*%%%*/ $$ = assignable(p, $1, 0, &@$); /*% %*/ - /*% ripper[var_field_1]: assignable(p, $1) %*/ + /*% ripper: assignable(p, var_field(p, $1)) %*/ } | keyword_variable { /*%%%*/ $$ = assignable(p, $1, 0, &@$); /*% %*/ - /*% ripper[var_field_1]: assignable(p, $1) %*/ + /*% ripper: assignable(p, var_field(p, $1)) %*/ } | primary_value '[' opt_call_args rbracket { @@ -1670,7 +1670,7 @@ lhs : user_variable rb_backref_error(p, $1); $$ = NEW_BEGIN(0, &@$); /*% %*/ - /*% ripper[var_field_1,error]: assign_error!($1) %*/ + /*% ripper[error]: assign_error!(var_field(p, $1)) %*/ } ; @@ -1849,7 +1849,7 @@ arg : lhs '=' arg_rhs rb_backref_error(p, $1); $$ = NEW_BEGIN(0, &@$); /*% %*/ - /*% ripper[var_field_1,error]: assign_error!(opassign!($1, $2, $3)) %*/ + /*% ripper[error]: assign_error!(opassign!(var_field(p, $1), $2, $3)) %*/ } | arg tDOT2 arg { @@ -3675,14 +3675,14 @@ var_lhs : user_variable /*%%%*/ $$ = assignable(p, $1, 0, &@$); /*% %*/ - /*% ripper[var_field_1]: assignable(p, $1) %*/ + /*% ripper: assignable(p, var_field(p, $1)) %*/ } | keyword_variable { /*%%%*/ $$ = assignable(p, $1, 0, &@$); /*% %*/ - /*% ripper[var_field_1]: assignable(p, $1) %*/ + /*% ripper: assignable(p, var_field(p, $1)) %*/ } ; -- cgit v1.2.3