diff options
| -rw-r--r-- | spec/ruby/language/defined_spec.rb | 4 | ||||
| -rw-r--r-- | test/ruby/test_defined.rb | 4 | ||||
| -rw-r--r-- | variable.c | 5 |
3 files changed, 11 insertions, 2 deletions
diff --git a/spec/ruby/language/defined_spec.rb b/spec/ruby/language/defined_spec.rb index 05f3075459..08fa2d8fe3 100644 --- a/spec/ruby/language/defined_spec.rb +++ b/spec/ruby/language/defined_spec.rb @@ -752,8 +752,8 @@ describe "The defined? keyword for a scoped constant" do defined?(DefinedSpecs::String).should be_nil end - it "returns 'constant' when a constant is defined on top-level but not on the class" do - defined?(DefinedSpecs::Basic::String).should == "constant" + it "returns nil when a constant is defined on top-level but not on the class" do + defined?(DefinedSpecs::Basic::String).should be_nil end it "returns 'constant' if the scoped-scoped constant is defined" do diff --git a/test/ruby/test_defined.rb b/test/ruby/test_defined.rb index 54f461ff03..9976db3b6f 100644 --- a/test/ruby/test_defined.rb +++ b/test/ruby/test_defined.rb @@ -253,4 +253,8 @@ class TestDefined < Test::Unit::TestCase assert_equal(nil, obj.func_defined_non_existing_func, bug_11212) assert_equal(true, obj.called, bug_11212) end + + def test_top_level_constant_not_defined + assert_nil(defined?(TestDefined::Object)) + end end diff --git a/variable.c b/variable.c index 3f9725a065..c8fd1553f5 100644 --- a/variable.c +++ b/variable.c @@ -2513,6 +2513,11 @@ rb_const_defined_0(VALUE klass, ID id, int exclude, int recurse, int visibility) if (ce->value == Qundef && !check_autoload_required(tmp, id, 0) && !rb_autoloading_value(tmp, id, 0)) return (int)Qfalse; + + if (exclude && tmp == rb_cObject && klass != rb_cObject) { + return (int)Qfalse; + } + return (int)Qtrue; } if (!recurse) break; |