From dcb7270d7e2fb0036afcc421b63be32a7732a9a1 Mon Sep 17 00:00:00 2001 From: shugo Date: Wed, 23 Mar 2005 07:15:49 +0000 Subject: * parse.y (primary): fix lineno of rescue and ensure. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8184 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ parse.y | 9 +++++++-- test/ruby/test_settracefunc.rb | 7 +------ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68cb88175..d01499ce2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Mar 23 16:12:40 2005 Shugo Maeda + + * parse.y (primary): fix lineno of rescue and ensure. + Wed Mar 23 00:39:05 2005 Shugo Maeda * test/ruby/test_settracefunc.rb (test_event): added tests for diff --git a/parse.y b/parse.y index 4922eeee5..21faacd0e 100644 --- a/parse.y +++ b/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, $1); $$ = NEW_BEGIN($3); + } nd_set_line($$, $1); /*% $$ = dispatch1(begin, $3); diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb index 220c946ca..aa21812fa 100644 --- a/test/ruby/test_settracefunc.rb +++ b/test/ruby/test_settracefunc.rb @@ -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], -- cgit