diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-25 00:36:43 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-25 00:36:43 +0000 |
commit | 85143cab00f41efa2cc566cd6485a79c64bd9bf3 (patch) | |
tree | 2b9fd212e59659dc286dd8f8a30e33af39a9e3e5 | |
parent | e16d49fbceb6b4359ca23b58a3c6d7abd4b80690 (diff) |
merge revision(s) 62071: [Backport #14407]
defined? returns nil for toplevel constant lookup
* variable.c (rb_const_defined_0): toplevel constant lookup has
been removed, should return nil too.
[ruby-core:85142] [Bug #14407] [Fix GH-1800]
From: Gonzalo <grzuy0@gmail.com>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@62568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-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 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/spec/ruby/language/defined_spec.rb b/spec/ruby/language/defined_spec.rb index 0c8e657786..eae0b03573 100644 --- a/spec/ruby/language/defined_spec.rb +++ b/spec/ruby/language/defined_spec.rb @@ -766,8 +766,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 310ef74d13..52ea6b4cab 100644 --- a/variable.c +++ b/variable.c @@ -2515,6 +2515,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; @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.5.0" #define RUBY_RELEASE_DATE "2018-02-24" -#define RUBY_PATCHLEVEL 35 +#define RUBY_PATCHLEVEL 36 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 2 |