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

parse.y: insane syntax

Browse Source 
* parse.y (primary): save/restore COND and CMDARG stacks at method
  definition, to distinguish do_block and do_cond properly.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61724 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-01-09 12:33:38 +00:00
parent d68a3d3bc1
commit 9c2c2f77ba
2 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
parse.y
View File

@ -2900,22 +2900,31 @@ primary : literal
$<num>$ = in_def; $<num>$ = in_def;
in_def = 1; in_def = 1;
} }
{
$<val>1 = cond_stack;
$<val>$ = cmdarg_stack;
COND_SET(0);
CMDARG_SET(0);
}
f_arglist f_arglist
bodystmt bodystmt
k_end k_end
{ {
/*%%%*/ /*%%%*/
NODE *body = remove_begin($6); NODE *body = remove_begin($7);
reduce_nodes(&body); reduce_nodes(&body);
$$ = NEW_DEFN($2, $5, body, &@$); $$ = NEW_DEFN($2, $6, body, &@$);
nd_set_line($$->nd_defn, @7.end_pos.lineno); nd_set_line($$->nd_defn, @8.end_pos.lineno);
set_line_body(body, @1.beg_pos.lineno); set_line_body(body, @1.beg_pos.lineno);
/*% /*%
$$ = dispatch3(def, $2, $5, $6); $$ = dispatch3(def, $2, $6, $7);
%*/ %*/
local_pop(); local_pop();
in_def = $<num>4 & 1; in_def = $<num>4 & 1;
current_arg = $<id>3; current_arg = $<id>3;
COND_SET($<val>1);
CMDARG_SET($<val>5);
} }
| k_def singleton dot_or_colon {SET_LEX_STATE(EXPR_FNAME);} fname | k_def singleton dot_or_colon {SET_LEX_STATE(EXPR_FNAME);} fname
{ {
@ -2926,22 +2935,31 @@ primary : literal
$<id>$ = current_arg; $<id>$ = current_arg;
current_arg = 0; current_arg = 0;
} }
{
$<val>1 = cond_stack;
$<val>$ = cmdarg_stack;
COND_SET(0);
CMDARG_SET(0);
}
f_arglist f_arglist
bodystmt bodystmt
k_end k_end
{ {
/*%%%*/ /*%%%*/
NODE *body = remove_begin($8); NODE *body = remove_begin($9);
reduce_nodes(&body); reduce_nodes(&body);
$$ = NEW_DEFS($2, $5, $7, body, &@$); $$ = NEW_DEFS($2, $5, $8, body, &@$);
nd_set_line($$->nd_defn, @9.end_pos.lineno); nd_set_line($$->nd_defn, @10.end_pos.lineno);
set_line_body(body, @1.beg_pos.lineno); set_line_body(body, @1.beg_pos.lineno);
/*% /*%
$$ = dispatch5(defs, $2, $<val>3, $5, $7, $8); $$ = dispatch5(defs, $2, $<val>3, $5, $8, $9);
%*/ %*/
local_pop(); local_pop();
in_def = $<num>4 & 1; in_def = $<num>4 & 1;
current_arg = $<id>6; current_arg = $<id>6;
COND_SET($<val>1);
CMDARG_SET($<val>7);
} }
| keyword_break | keyword_break
{ {

5
test/ruby/test_syntax.rb
View File

@ -1181,6 +1181,11 @@ eom
assert_equal(line, e.backtrace_locations[0].lineno) assert_equal(line, e.backtrace_locations[0].lineno)
end end
def test_methoddef_in_cond
assert_valid_syntax('while def foo; tap do end; end; break; end')
assert_valid_syntax('while def foo a = tap do end; end; break; end')
end
private private
def not_label(x) @result = x; @not_label ||= nil end def not_label(x) @result = x; @not_label ||= nil end