From 83740fa4bda976d6aef50a452a9dd433b5446af1 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 2 Oct 2003 03:00:23 +0000
Subject: * variable.c (rb_const_defined_0): look up constants in Object as  
 well.  [ruby-dev:21458]

* test/ruby/test_defined.rb (TestDefined::test_defined): test for
  constants.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4649 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                 |  8 ++++++++
 test/ruby/test_defined.rb |  5 ++++-
 variable.c                | 14 ++++++++------
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5e2f892624..d2ab572c2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Oct  2 12:00:18 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_const_defined_0): look up constants in Object as
+	  well.  [ruby-dev:21458]
+
+	* test/ruby/test_defined.rb (TestDefined::test_defined): test for
+	  constants.
+
 Thu Oct  2 11:17:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
 
 	* lib/test/unit/assertions.rb: should not capture an
diff --git a/test/ruby/test_defined.rb b/test/ruby/test_defined.rb
index e53778f75f..d386b4bddc 100644
--- a/test/ruby/test_defined.rb
+++ b/test/ruby/test_defined.rb
@@ -24,10 +24,13 @@ class TestDefined < Test::Unit::TestCase
     assert(defined?($x))		# global variable
     assert_equal('global-variable', defined?($x))# returns description
 
+    assert_nil(defined?(foo))		# undefined
     foo=5
     assert(defined?(foo))		# local variable
 
-    assert(defined?(::Array))		# constant	!! Array -> ::Array
+    assert(defined?(Array))		# constant
+    assert(defined?(::Array))		# toplevel constant
+    assert(defined?(File::Constants))	# nested constant
     assert(defined?(Object.new))	# method
     assert(!defined?(Object.print))	# private method
     assert(defined?(1 == 2))		# operator expression
diff --git a/variable.c b/variable.c
index 05f6281c3d..32616fc13f 100644
--- a/variable.c
+++ b/variable.c
@@ -1430,12 +1430,12 @@ rb_const_defined_0(klass, id, exclude, recurse)
     ID id;
     int exclude, recurse;
 {
-    VALUE tmp = klass, value;
+    VALUE value, tmp;
+    int mod_retry = 0;
 
+    tmp = klass;
+  retry:
     while (tmp) {
-	if (tmp == rb_cObject && klass != rb_cObject) {
-	    break;
-	}
 	if (RCLASS(tmp)->iv_tbl && st_lookup(RCLASS(tmp)->iv_tbl, id, &value)) {
 	    if (value == Qundef && NIL_P(autoload_file(klass, id)))
 		return Qfalse;
@@ -1444,8 +1444,10 @@ rb_const_defined_0(klass, id, exclude, recurse)
 	if (!recurse && klass != rb_cObject) break;
 	tmp = RCLASS(tmp)->super;
     }
-    if (!exclude && BUILTIN_TYPE(klass) == T_MODULE) {
-	return rb_const_defined(rb_cObject, id);
+    if (!exclude && !mod_retry && BUILTIN_TYPE(klass) == T_MODULE) {
+	mod_retry = 1;
+	tmp = rb_cObject;
+	goto retry;
     }
     return Qfalse;
 }
-- 
cgit v1.2.3