mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* parse.y (primary): fix lineno of rescue and ensure.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8184 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
93c746f828
commit
1429223686
3 changed files with 12 additions and 8 deletions
|
@ -1,3 +1,7 @@
|
|||
Wed Mar 23 16:12:40 2005 Shugo Maeda <shugo@ruby-lang.org>
|
||||
|
||||
* parse.y (primary): fix lineno of rescue and ensure.
|
||||
|
||||
Wed Mar 23 00:39:05 2005 Shugo Maeda <shugo@ruby-lang.org>
|
||||
|
||||
* test/ruby/test_settracefunc.rb (test_event): added tests for
|
||||
|
|
9
parse.y
9
parse.y
|
@ -2448,10 +2448,15 @@ primary : literal
|
|||
kEND
|
||||
{
|
||||
/*%%%*/
|
||||
if ($3 == NULL)
|
||||
if ($3 == NULL) {
|
||||
$$ = NEW_NIL();
|
||||
else
|
||||
}
|
||||
else {
|
||||
if (nd_type($3) == NODE_RESCUE ||
|
||||
nd_type($3) == NODE_ENSURE)
|
||||
nd_set_line($3, $<num>1);
|
||||
$$ = NEW_BEGIN($3);
|
||||
}
|
||||
nd_set_line($$, $<num>1);
|
||||
/*%
|
||||
$$ = dispatch1(begin, $3);
|
||||
|
|
|
@ -71,13 +71,8 @@ class TestSetTraceFunc < Test::Unit::TestCase
|
|||
events.shift) # when 3
|
||||
assert_equal(["line", 20, :test_event, TestSetTraceFunc],
|
||||
events.shift) # c = "b == 3"
|
||||
|
||||
# 1.8
|
||||
# assert_equal(["line", 23, :test_event, TestSetTraceFunc],
|
||||
# events.shift) # begin
|
||||
assert_equal(["line", 24, :test_event, TestSetTraceFunc],
|
||||
assert_equal(["line", 23, :test_event, TestSetTraceFunc],
|
||||
events.shift) # begin
|
||||
|
||||
assert_equal(["line", 24, :test_event, TestSetTraceFunc],
|
||||
events.shift) # raise "error"
|
||||
assert_equal(["c-call", 24, :raise, Kernel],
|
||||
|
|
Loading…
Reference in a new issue