|
 |
e076ba |
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
|
|
|
e076ba |
Date: Sun, 31 Dec 2017 11:25:38 +0000
|
|
|
e076ba |
Subject: [PATCH] parse.y: assignable_error
|
|
|
e076ba |
|
|
|
e076ba |
* parse.y (assignable_gen): should return valid NODE always even
|
|
|
e076ba |
on errors. [ruby-core:84565] [Bug #14261]
|
|
|
e076ba |
|
|
|
e076ba |
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61523 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
|
|
e076ba |
---
|
|
|
e076ba |
parse.c | 14 ++++----------
|
|
|
e076ba |
test/ruby/test_parse.rb | 6 ++++++
|
|
|
e076ba |
2 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
e076ba |
|
|
|
e076ba |
diff --git a/parse.c b/parse.c
|
|
|
e076ba |
index 08c3461f7096..c260a046dc33 100644
|
|
|
e076ba |
--- a/parse.c
|
|
|
e076ba |
+++ b/parse.c
|
|
|
e076ba |
@@ -6593,10 +6593,6 @@
|
|
|
e076ba |
#line 1984 "parse.y" /* yacc.c:1646 */
|
|
|
e076ba |
{
|
|
|
e076ba |
(yyval.node) = assignable(var_field((yyvsp[0].id)), 0, &(yyloc));
|
|
|
e076ba |
- /*%%%*/
|
|
|
e076ba |
- if (!(yyval.node)) (yyval.node) = new_begin(0, &(yyloc));
|
|
|
e076ba |
- /*%
|
|
|
e076ba |
- %*/
|
|
|
e076ba |
}
|
|
|
e076ba |
#line 6598 "parse.c" /* yacc.c:1646 */
|
|
|
e076ba |
break;
|
|
|
e076ba |
@@ -6605,10 +6601,6 @@
|
|
|
e076ba |
#line 1992 "parse.y" /* yacc.c:1646 */
|
|
|
e076ba |
{
|
|
|
e076ba |
(yyval.node) = assignable(var_field((yyvsp[0].id)), 0, &(yyloc));
|
|
|
e076ba |
- /*%%%*/
|
|
|
e076ba |
- if (!(yyval.node)) (yyval.node) = new_begin(0, &(yyloc));
|
|
|
e076ba |
- /*%
|
|
|
e076ba |
- %*/
|
|
|
e076ba |
}
|
|
|
e076ba |
#line 6610 "parse.c" /* yacc.c:1646 */
|
|
|
e076ba |
break;
|
|
|
e076ba |
@@ -16034,11 +16026,13 @@
|
|
|
e076ba |
#ifdef RIPPER
|
|
|
e076ba |
ID id = get_id(lhs);
|
|
|
e076ba |
# define assignable_result(x) (lhs)
|
|
|
e076ba |
+# define assignable_error() (lhs)
|
|
|
e076ba |
# define parser_yyerror(parser, x) (lhs = assign_error_gen(parser, lhs))
|
|
|
e076ba |
#else
|
|
|
e076ba |
# define assignable_result(x) assignable_result0(x, location)
|
|
|
e076ba |
+# define assignable_error() new_begin(0, location)
|
|
|
e076ba |
#endif
|
|
|
e076ba |
- if (!id) return assignable_result(0);
|
|
|
e076ba |
+ if (!id) return assignable_error();
|
|
|
e076ba |
switch (id) {
|
|
|
e076ba |
case keyword_self:
|
|
|
e076ba |
yyerror0("Can't change the value of self");
|
|
|
e076ba |
@@ -16101,7 +16095,7 @@
|
|
|
e076ba |
compile_error(PARSER_ARG "identifier %"PRIsVALUE" is not valid to set", rb_id2str(id));
|
|
|
e076ba |
}
|
|
|
e076ba |
error:
|
|
|
e076ba |
- return assignable_result(0);
|
|
|
e076ba |
+ return assignable_error();
|
|
|
e076ba |
#undef assignable_result
|
|
|
e076ba |
#undef parser_yyerror
|
|
|
e076ba |
}
|
|
|
e076ba |
diff --git a/test/ruby/test_parse.rb b/test/ruby/test_parse.rb
|
|
|
e076ba |
index e26bcdc07e19..15c6245bac2e 100644
|
|
|
e076ba |
--- a/test/ruby/test_parse.rb
|
|
|
e076ba |
+++ b/test/ruby/test_parse.rb
|
|
|
e076ba |
@@ -746,6 +746,12 @@ def foo
|
|
|
e076ba |
end
|
|
|
e076ba |
END
|
|
|
e076ba |
end
|
|
|
e076ba |
+ assert_raise(SyntaxError) do
|
|
|
e076ba |
+ eval "#{<<~"begin;"}\n#{<<~'end;'}", nil, __FILE__, __LINE__+1
|
|
|
e076ba |
+ begin;
|
|
|
e076ba |
+ x, true
|
|
|
e076ba |
+ end;
|
|
|
e076ba |
+ end
|
|
|
e076ba |
end
|
|
|
e076ba |
|
|
|
e076ba |
def test_block_dup
|