summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2013-04-03 06:58:49 -0700
committerYukihiro "Matz" Matsumoto <[email protected]>2013-04-03 06:58:49 -0700
commitdfb4755729266e178394a6c45b08265d43886f58 (patch)
treefa0b8526fa489a11a59e9ab664c6f62798eb28c1
parent5f04e276db1c906098befeadd63ccbcc73ef8b78 (diff)
parentf36c133909e6a05ef8e92773a3d0219ed47672b8 (diff)
downloadmruby-dfb4755729266e178394a6c45b08265d43886f58.tar.gz
mruby-dfb4755729266e178394a6c45b08265d43886f58.zip
Merge pull request #1131 from takkaw/mrb_funcall_return_exc
Change to return the exception object when an exception occurred in mrb_funcall
-rw-r--r--src/vm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vm.c b/src/vm.c
index 658f179ba..c319e7148 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -305,7 +305,7 @@ mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, int argc, mr
cipop(mrb);
}
mrb->jmp = 0;
- val = mrb_nil_value();
+ val = mrb_obj_value(mrb->exc);
}
else {
mrb->jmp = &c_jmp;