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: k_else in bodystmt

Browse source 
* parse.y (bodystmt): expand opt_else to show the error message at
  the right place.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-03-23 01:09:57 +00:00
parent 140512d222
commit f3fbf1dfad
2 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
parse.y
View file

@ -408,6 +408,7 @@ static NODE *new_op_assign(struct parser_params *p, NODE *lhs, ID op, NODE *rhs,
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);
static NODE *new_bodystmt(struct parser_params *p, NODE *head, NODE *rescue, NODE *rescue_else, NODE *ensure, const YYLTYPE *loc);
static NODE *const_decl(struct parser_params *p, NODE* path, const YYLTYPE *loc);
@ -991,24 +992,23 @@ begin_block : '{' top_compstmt '}'
bodystmt : compstmt
opt_rescue
opt_else
k_else {if (!$2) {yyerror1(&@3, "else without rescue is useless");}}
compstmt
opt_ensure
{
/*%%%*/
$$ = $1;
if ($2) {
$$ = NEW_RESCUE($1, $2, $3, &@$);
}
else if ($3) {
compile_error(p, "else without rescue is useless");
$$ = block_append(p, $$, $3);
}
if ($4) {
$$ = NEW_ENSURE($$, $4, &@$);
}
fixpos($$, $1);
$$ = new_bodystmt(p, $1, $2, $5, $6, &@$);
/*% %*/
/*% ripper: bodystmt!(escape_Qundef($1), escape_Qundef($2), escape_Qundef($3), escape_Qundef($4)) %*/
/*% ripper: bodystmt!(escape_Qundef($1), escape_Qundef($2), escape_Qundef($5), escape_Qundef($6)) %*/
}
| compstmt
opt_rescue
opt_ensure
{
/*%%%*/
$$ = new_bodystmt(p, $1, $2, 0, $3, &@$);
/*% %*/
/*% ripper: bodystmt!(escape_Qundef($1), escape_Qundef($2), Qnil, escape_Qundef($3)) %*/
}
;
@ -10201,6 +10201,25 @@ var_field(struct parser_params *p, VALUE a)
}
#endif
#ifndef RIPPER
static NODE *
new_bodystmt(struct parser_params *p, NODE *head, NODE *rescue, NODE *rescue_else, NODE *ensure, const YYLTYPE *loc)
{
NODE *result = head;
if (rescue) {
result = NEW_RESCUE(head, rescue, rescue_else, loc);
}
else if (rescue_else) {
result = block_append(p, result, rescue_else);
}
if (ensure) {
result = NEW_ENSURE(result, ensure, loc);
}
fixpos(result, head);
return result;
}
#endif
static void
warn_unused_var(struct parser_params *p, struct local_vars *local)
{

2
test/ruby/test_parse.rb
View file

@ -14,7 +14,7 @@ class TestParse < Test::Unit::TestCase
end
def test_else_without_rescue
assert_syntax_error(<<-END, /else without rescue/)
assert_syntax_error(<<-END, %r":#{__LINE__+2}: else without rescue"o, [__FILE__, __LINE__+1])
begin
else
42