summaryrefslogtreecommitdiff
path: root/parse.y
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-10 16:08:30 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-10 16:08:30 +0000
commit8fcdc4e23bf48ee90b7478747bb7a621032eb89e (patch)
tree084cf7d636824864f7f8abd97d29b39c6e1cb3d7 /parse.y
parent23f12a0660705d99952267b1e2ad53531771b6b2 (diff)
merge revision(s) 51350: [Backport #11380] [Backport #11389]
* parse.y (lambda_body): pop cmdarg stack for lookahead token. [ruby-core:70067] [Bug #11380] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51519 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y1
1 files changed, 1 insertions, 0 deletions
diff --git a/parse.y b/parse.y
index 996390e189..9bb569c4ed 100644
--- a/parse.y
+++ b/parse.y
@@ -3540,6 +3540,7 @@ lambda : {
{
lpar_beg = $<num>2;
cmdarg_stack = $<val>5;
+ CMDARG_LEXPOP();
/*%%%*/
$$ = NEW_LAMBDA($3, $6);
nd_set_line($$, $<num>4);