1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

parse.y: adjust position of lambda

* parse.y (lambda): adjust position to the beginning of the block.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42980 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-09-19 07:59:07 +00:00
parent eb568bdee6
commit 5cda4e9071
3 changed files with 34 additions and 2 deletions

View file

@ -1,3 +1,7 @@
Thu Sep 19 16:59:02 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (lambda): adjust position to the beginning of the block.
Thu Sep 19 16:25:06 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vsnprintf.c (BSD_vfprintf): initialize cp so that size is 0 in the

View file

@ -3460,13 +3460,17 @@ lambda : {
lpar_beg = ++paren_nest;
}
f_larglist
{
$<num>$ = ruby_sourceline;
}
lambda_body
{
lpar_beg = $<num>2;
/*%%%*/
$$ = NEW_LAMBDA($3, $4);
$$ = NEW_LAMBDA($3, $5);
nd_set_line($$, $<num>4);
/*%
$$ = dispatch2(lambda, $3, $4);
$$ = dispatch2(lambda, $3, $5);
%*/
dyna_pop($<vars>1);
}

View file

@ -109,4 +109,28 @@ class TestLambdaParameters < Test::Unit::TestCase
assert_equal(42, return_in_current(42), feature8693)
assert_equal(42, return_in_callee(42), feature8693)
end
def test_do_lambda_source_location
exp_lineno = __LINE__ + 3
lmd = ->(x,
y,
z) do
#
end
file, lineno = lmd.source_location
assert_match(/^#{ Regexp.quote(__FILE__) }$/, file)
assert_equal(exp_lineno, lineno, "must be ")
end
def test_brace_lambda_source_location
exp_lineno = __LINE__ + 3
lmd = ->(x,
y,
z) {
#
}
file, lineno = lmd.source_location
assert_match(/^#{ Regexp.quote(__FILE__) }$/, file)
assert_equal(exp_lineno, lineno, "must be ")
end
end