summaryloggraphiclog1graphiclog2commitcommitdifftreerefseditfork
rawpatchinlineside by side (parent: a3d6290)
rawpatchinlineside by side (parent: a3d6290)
| author | Nobuyoshi Nakada <[email protected]> | |
| Sun, 20 Apr 2014 22:00:03 +0000 (21 07:00 +0900) | ||
| committer | Nobuyoshi Nakada <[email protected]> | |
| Sun, 20 Apr 2014 22:00:57 +0000 (21 07:00 +0900) |
save cmdarg_stack and isolate command argument state from outer scope
to allow method definition in cmdarg
import from ruby/ruby@04bb9d6b75a55d4000700769eead5a5cb942c25b
to allow method definition in cmdarg
import from ruby/ruby@04bb9d6b75a55d4000700769eead5a5cb942c25b
| src/parse.y | patchblobblamehistory | |
| test/t/syntax.rb | patchblobblamehistory |
diff --git a/src/parse.y b/src/parse.y
--- a/src/parse.y
+++ b/src/parse.y
{
p->in_def++;
$<nd>$ = local_switch(p);
+ $<stack>1 = p->cmdarg_stack;
+ p->cmdarg_stack = 0;
}
f_arglist
bodystmt
$$ = new_def(p, $2, $4, $5);
local_resume(p, $<nd>3);
p->in_def--;
+ p->cmdarg_stack = $<stack>1;
}
| keyword_def singleton dot_or_colon {p->lstate = EXPR_FNAME;} fname
{
p->in_single++;
p->lstate = EXPR_ENDFN; /* force for args */
$<nd>$ = local_switch(p);
+ $<stack>1 = p->cmdarg_stack;
+ p->cmdarg_stack = 0;
}
f_arglist
bodystmt
$$ = new_sdef(p, $2, $5, $7, $8);
local_resume(p, $<nd>6);
p->in_single--;
+ p->cmdarg_stack = $<stack>1;
}
| keyword_break
{
diff --git a/test/t/syntax.rb b/test/t/syntax.rb
--- a/test/t/syntax.rb
+++ b/test/t/syntax.rb
result = x.test (proc do :ok; end)
assert_equal :ok, result
end
+
+assert('method definition in cmdarg') do
+ if false
+ bar def foo; self.each do end end
+ end
+ true
+end