diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-28 09:40:24 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-28 09:40:24 +0000 |
commit | bd5c473b4b37ccd86dc592bc19168dd0afec99cd (patch) | |
tree | 19f0c7295cc3ec5720350466a30c1680bf1cb31c /eval.c | |
parent | 3296ddc54db92946b9739e1dc5d0a520cde0541f (diff) | |
download | ruby-bd5c473b4b37ccd86dc592bc19168dd0afec99cd.tar.gz ruby-bd5c473b4b37ccd86dc592bc19168dd0afec99cd.tar.xz ruby-bd5c473b4b37ccd86dc592bc19168dd0afec99cd.zip |
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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21116 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -961,7 +961,8 @@ get_errinfo(void) return *ptr; } else { - return Qnil; + rb_thread_t *th = GET_THREAD(); + return th->errinfo; } } |