matz

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@810 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 11 insertions, 3 deletions

diff --git a/eval.c b/eval.c
index 7415581d63..b2e2d63074 100644
--- a/eval.c
+++ b/eval.c
@@ -3679,9 +3679,9 @@ handle_rescue(self, node)
 }
 
 VALUE
-rb_rescue(b_proc, data1, r_proc, data2)
+rb_rescue2(b_proc, data1, eclass, r_proc, data2)
     VALUE (*b_proc)(), (*r_proc)();
-    VALUE data1, data2;
+    VALUE data1, eclass, data2;
 {
     int state;
     volatile VALUE result;
@@ -3692,7 +3692,7 @@ rb_rescue(b_proc, data1, r_proc, data2)
       retry_entry:
 	result = (*b_proc)(data1);
     }
-    else if (state == TAG_RAISE && rb_obj_is_kind_of(ruby_errinfo, rb_eStandardError)) {
+    else if (state == TAG_RAISE && rb_obj_is_kind_of(ruby_errinfo, eclass)) {
 	if (r_proc) {
 	    PUSH_TAG(PROT_NONE);
 	    if ((state = EXEC_TAG()) == 0) {
@@ -3719,6 +3719,14 @@ rb_rescue(b_proc, data1, r_proc, data2)
 }
 
 VALUE
+rb_rescue(b_proc, data1, r_proc, data2)
+    VALUE (*b_proc)(), (*r_proc)();
+    VALUE data1, data2;
+{
+    return rb_rescue2(b_proc, data1, rb_eStandardError, r_proc, data2);
+}
+
+VALUE
 rb_protect(proc, data, state)
     VALUE (*proc)();
     VALUE data;