[Truffle] Move #singleton_method_{added,removed,undefined} from Kerne…

…l to BasicObject.
jruby · Mar 1, 2016 · ad317a3 · ad317a3
1 parent 9bda28a
commit ad317a3
Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/spec/truffle/tags/core/basicobject/singleton_method_added_tags.txt b/spec/truffle/tags/core/basicobject/singleton_method_added_tags.txt
diff --git a/spec/truffle/tags/core/basicobject/singleton_method_removed_tags.txt b/spec/truffle/tags/core/basicobject/singleton_method_removed_tags.txt
@@ -1,2 +1 @@
-fails:BasicObject#singleton_method_removed is a private method
 fails:BasicObject#singleton_method_removed is called when a method is removed on self
diff --git a/spec/truffle/tags/core/basicobject/singleton_method_undefined_tags.txt b/spec/truffle/tags/core/basicobject/singleton_method_undefined_tags.txt
@@ -1,2 +1 @@
-fails:BasicObject#singleton_method_undefined is a private method
 fails:BasicObject#singleton_method_undefined is called when a method is removed on self
diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/basic_object.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/basic_object.rb
@@ -31,4 +31,16 @@ def __id__
     Rubinius.primitive :object_id
     raise ::PrimitiveFailure, "BasicObject#__id__ primitive failed"
   end
+
+  def singleton_method_added(name)
+  end
+  private :singleton_method_added
+
+  def singleton_method_removed(name)
+  end
+  private :singleton_method_removed
+
+  def singleton_method_undefined(name)
+  end
+  private :singleton_method_undefined
 end
diff --git a/truffle/src/main/ruby/core/rubinius/common/kernel.rb b/truffle/src/main/ruby/core/rubinius/common/kernel.rb
@@ -889,18 +889,6 @@ def trap(sig, prc=nil, &block)
   end
   module_function :trap
 
-  def singleton_method_added(name)
-  end
-  private :singleton_method_added
-
-  def singleton_method_removed(name)
-  end
-  private :singleton_method_removed
-
-  def singleton_method_undefined(name)
-  end
-  private :singleton_method_undefined
-
   def singleton_methods(all=true)
     m = Rubinius::Type.object_singleton_class self
     mt = m.method_table
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		fails:BasicObject#singleton_method_removed is a private method
		fails:BasicObject#singleton_method_removed is called when a method is removed on self
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		fails:BasicObject#singleton_method_undefined is a private method
		fails:BasicObject#singleton_method_undefined is called when a method is removed on self