summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-07-31 14:13:30 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-07-31 14:13:30 +0000
commitfd404f03cbdf9dec1dfc9a85ed8bafaf1477689a (patch)
tree3d563d319821d5e3b2f283a0b3be55d87159d202
parentcd110140db1a0ef1f057580860ded9c39944e288 (diff)
* eval.c (is_defined): stupid mistakes fixed. [ruby-dev:24006]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6730 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--eval.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a881bf6a1f..7ed9d327c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jul 31 23:08:00 2004 Yukihiro Matsumoto <[email protected]>
+
+ * eval.c (is_defined): stupid mistakes fixed. [ruby-dev:24006]
+
Sat Jul 31 17:39:47 2004 Nobuyoshi Nakada <[email protected]>
* misc/ruby-mode.el (ruby-expr-beg, ruby-parse-partial,
diff --git a/eval.c b/eval.c
index a402af1e64..bfeeac706c 100644
--- a/eval.c
+++ b/eval.c
@@ -2240,8 +2240,8 @@ is_defined(self, node, buf, noeval)
val = self;
if (node->nd_recv == (NODE *)1) goto check_bound;
case NODE_CALL:
- if (noeval) return ex;
if (!is_defined(self, node->nd_recv, buf, Qtrue)) return 0;
+ if (noeval) return ex;
val = rb_eval(self, node->nd_recv);
check_bound:
{
@@ -2333,8 +2333,9 @@ is_defined(self, node, buf, noeval)
break;
case NODE_COLON2:
- if (noeval) return ex;
if (!is_defined(self, node->nd_recv, buf, Qtrue)) return 0;
+ if (noeval) return ex;
+ val = rb_eval(self, node->nd_recv);
switch (TYPE(val)) {
case T_CLASS:
case T_MODULE: