aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Evans <code@jeremyevans.net>2023-06-22 09:44:51 -0700
committerJeremy Evans <code@jeremyevans.net>2023-07-26 07:27:15 -0700
commit786a864900ceee6ed89d7df81698bbbe7e7bd6ae (patch)
treeeec3826a102ced34b8e158faa3b48a169124b8da
parent9b405a18bea7825cba794e42a1fef58a48451ec3 (diff)
downloadruby-786a864900ceee6ed89d7df81698bbbe7e7bd6ae.tar.gz
Make {Nil,True,False}Class#singleton_method always raise NameError
{Nil,True,False}Class#singleton_methods always returns [] indicating that there are no singleton methods defined, so #singleton_method should be consistent with that. Fixes [Bug #11064]
-rw-r--r--proc.c7
-rw-r--r--spec/ruby/core/false/singleton_method_spec.rb15
-rw-r--r--spec/ruby/core/nil/singleton_method_spec.rb15
-rw-r--r--spec/ruby/core/true/singleton_method_spec.rb15
4 files changed, 48 insertions, 4 deletions
diff --git a/proc.c b/proc.c
index c284d4fcab..9fd24a8fd4 100644
--- a/proc.c
+++ b/proc.c
@@ -2096,10 +2096,9 @@ rb_obj_singleton_method(VALUE obj, VALUE vid)
VALUE klass = rb_singleton_class_get(obj);
ID id = rb_check_id(&vid);
- if (NIL_P(klass)) {
- /* goto undef; */
- }
- else if (NIL_P(klass = RCLASS_ORIGIN(klass))) {
+ if (NIL_P(klass) ||
+ NIL_P(klass = RCLASS_ORIGIN(klass)) ||
+ !NIL_P(rb_special_singleton_class(obj))) {
/* goto undef; */
}
else if (! id) {
diff --git a/spec/ruby/core/false/singleton_method_spec.rb b/spec/ruby/core/false/singleton_method_spec.rb
new file mode 100644
index 0000000000..6cf29af411
--- /dev/null
+++ b/spec/ruby/core/false/singleton_method_spec.rb
@@ -0,0 +1,15 @@
+require_relative '../../spec_helper'
+
+describe "FalseClass#singleton_method" do
+ ruby_version_is '3.3' do
+ it "raises regardless of whether FalseClass defines the method" do
+ proc{false.singleton_method(:foo)}.should raise_error(NameError)
+ begin
+ def false.foo; end
+ proc{false.singleton_method(:foo)}.should raise_error(NameError)
+ ensure
+ FalseClass.send(:remove_method, :foo)
+ end
+ end
+ end
+end
diff --git a/spec/ruby/core/nil/singleton_method_spec.rb b/spec/ruby/core/nil/singleton_method_spec.rb
new file mode 100644
index 0000000000..f9163da3f1
--- /dev/null
+++ b/spec/ruby/core/nil/singleton_method_spec.rb
@@ -0,0 +1,15 @@
+require_relative '../../spec_helper'
+
+describe "NilClass#singleton_method" do
+ ruby_version_is '3.3' do
+ it "raises regardless of whether NilClass defines the method" do
+ proc{nil.singleton_method(:foo)}.should raise_error(NameError)
+ begin
+ def nil.foo; end
+ proc{nil.singleton_method(:foo)}.should raise_error(NameError)
+ ensure
+ NilClass.send(:remove_method, :foo)
+ end
+ end
+ end
+end
diff --git a/spec/ruby/core/true/singleton_method_spec.rb b/spec/ruby/core/true/singleton_method_spec.rb
new file mode 100644
index 0000000000..f765054c5f
--- /dev/null
+++ b/spec/ruby/core/true/singleton_method_spec.rb
@@ -0,0 +1,15 @@
+require_relative '../../spec_helper'
+
+describe "TrueClass#singleton_method" do
+ ruby_version_is '3.3' do
+ it "raises regardless of whether TrueClass defines the method" do
+ proc{true.singleton_method(:foo)}.should raise_error(NameError)
+ begin
+ def true.foo; end
+ proc{true.singleton_method(:foo)}.should raise_error(NameError)
+ ensure
+ TrueClass.send(:remove_method, :foo)
+ end
+ end
+ end
+end