From 321270509222bef5db3f6110e8070851079addd9 Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 21 Apr 2008 02:02:26 +0000 Subject: * compile.c (defined_expr): capture exception during defined? evaluation. a patch from wanabe in [ruby-dev:34461]. [ruby-core:16010] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16118 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- compile.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'compile.c') diff --git a/compile.c b/compile.c index dc26a4c1c..c4cbf837e 100644 --- a/compile.c +++ b/compile.c @@ -2421,10 +2421,21 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret, ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]); } if (!self) { + LABEL *lstart = NEW_LABEL(nd_line(node)); + LABEL *lend = NEW_LABEL(nd_line(node)); + VALUE rescue = NEW_CHILD_ISEQVAL(NEW_NIL(), + rb_str_concat(rb_str_new2 + ("defined guard in "), + iseq->name), + ISEQ_TYPE_DEFINED_GUARD); + defined_expr(iseq, ret, node->nd_recv, lfinish, Qfalse); ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]); + ADD_LABEL(ret, lstart); COMPILE(ret, "defined/recv", node->nd_recv); + ADD_LABEL(ret, lend); + ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lfinish[1]); ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_METHOD), ID2SYM(node->nd_mid), needstr); } -- cgit