mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
merges r21086 from trunk into ruby_1_9_1.
* eval.c (get_errinfo): return th->errinfo value if normal errinfo place (dynamic local viriable) is not found. fixes Bug #732 [ruby-dev:37046]. * bootstraptest/test_proc.rb: add a test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21116 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
6bcc55dc6c
commit
02e2b50599
3 changed files with 18 additions and 1 deletions
|
|
@ -1,3 +1,11 @@
|
|||
Sat Dec 27 13:36:55 2008 Koichi Sasada <ko1@atdot.net>
|
||||
|
||||
* eval.c (get_errinfo): return th->errinfo value
|
||||
if normal errinfo place (dynamic local viriable) is not found.
|
||||
fixes Bug #732 [ruby-dev:37046].
|
||||
|
||||
* bootstraptest/test_proc.rb: add a test.
|
||||
|
||||
Sat Dec 27 11:41:45 2008 Koichi Sasada <ko1@atdot.net>
|
||||
|
||||
* vm_insnhelper.c (vm_call_method, vm_call_cfunc): use original id instead of
|
||||
|
|
|
|||
|
|
@ -418,3 +418,11 @@ assert_equal 'foo!', %q{
|
|||
|
||||
fp.bar
|
||||
}, 'Subclass of Proc'
|
||||
|
||||
assert_equal 'ok', %q{
|
||||
at_exit{
|
||||
print $!.message
|
||||
}
|
||||
raise "ok"
|
||||
}
|
||||
|
||||
|
|
|
|||
3
eval.c
3
eval.c
|
|
@ -961,7 +961,8 @@ get_errinfo(void)
|
|||
return *ptr;
|
||||
}
|
||||
else {
|
||||
return Qnil;
|
||||
rb_thread_t *th = GET_THREAD();
|
||||
return th->errinfo;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue