From ce9aba02a65a2a34f9c682635a4ccb5c3077b862 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 22 Aug 2003 08:09:58 +0000
Subject: * enum.c (inject_i): use rb_yield_values.

* enum.c (each_with_index_i): ditto.

* eval.c (rb_yield_splat): new function to call "yield *values".

* string.c (rb_str_scan): use rb_yield_splat().


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4424 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/singleton.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'lib/singleton.rb')

diff --git a/lib/singleton.rb b/lib/singleton.rb
index 30990b79b..2954bfa15 100644
--- a/lib/singleton.rb
+++ b/lib/singleton.rb
@@ -95,7 +95,10 @@ class << Singleton
         @__instance__ = new
       ensure
         if @__instance__
-          def self.instance; @__instance__ end
+          class <<self
+            remove_method :instance
+            def instance; @__instance__ end
+          end
         else
           @__instance__ = nil #  failed instance creation
         end
@@ -109,7 +112,10 @@ class << Singleton
         @__instance__ = new
       ensure
         if @__instance__
-          def self.instance; @__instance__ end
+          class <<self
+            remove_method :instance
+            def instance; @__instance__ end
+          end
         else
           @__instance__ = nil
         end
-- 
cgit