* lib/singleton.rb (SingletonClassMethods): _load should be public.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 30 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index 1a45f79cd2..6cfde9f700 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed May 28 15:18:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/singleton.rb (SingletonClassMethods): _load should be public.
+
 Wed May 28 13:30:43 2008  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* enc/trans/japanese.c: add workarround for Unicode to CP932.
diff --git a/lib/singleton.rb b/lib/singleton.rb
index acacfc48c7..a5c7eb164d 100644
--- a/lib/singleton.rb
+++ b/lib/singleton.rb
@@ -30,7 +30,7 @@
 # *  Klass.new and Klass.allocate - as private
 #
 # Providing (or modifying) the class methods
-# *  Klass.inherited(sub_klass) and Klass.clone()  - 
+# *  Klass.inherited(sub_klass) and Klass.clone()  -
 #    to ensure that the Singleton pattern is properly
 #    inherited and cloned.
 #
@@ -70,32 +70,32 @@ module Singleton
   def dup
     raise TypeError, "can't dup instance of singleton #{self.class}"
   end
-  
-  private 
+
+  private
 
   #  default marshalling strategy
-  def _dump(depth = -1) 
+  def _dump(depth = -1)
     ''
   end
 
-  module SingletonClassMethods  
+  module SingletonClassMethods
     # properly clone the Singleton pattern - did you know
-    # that duping doesn't copy class methods?  
+    # that duping doesn't copy class methods?
     def clone
       Singleton.__init__(super)
     end
 
+    def _load(str)
+      instance
+    end
+
     private
-    
-    #  ensure that the Singleton pattern is properly inherited   
+
+    #  ensure that the Singleton pattern is properly inherited
     def inherited(sub_klass)
       super
       Singleton.__init__(sub_klass)
     end
-    
-    def _load(str) 
-      instance 
-    end
   end
 
   class << Singleton
@@ -114,12 +114,12 @@ module Singleton
       end
       klass
     end
-    
+
     private
 
     #  extending an object with Singleton is a bad idea
     undef_method :extend_object
-    
+
     def append_features(mod)
       #  help out people counting on transitive mixins
       unless mod.instance_of?(Class)
@@ -127,7 +127,7 @@ module Singleton
       end
       super
     end
-    
+
     def included(klass)
       super
       klass.private_class_method  :new, :allocate
@@ -135,7 +135,7 @@ module Singleton
       Singleton.__init__(klass)
     end
   end
-  
+
 end
 
 
@@ -143,14 +143,14 @@ if __FILE__ == $0
 
 def num_of_instances(klass)
     "#{ObjectSpace.each_object(klass){}} #{klass} instance(s)"
-end 
+end
 
 # The basic and most important example.
 
 class SomeSingletonClass
   include Singleton
 end
-puts "There are #{num_of_instances(SomeSingletonClass)}" 
+puts "There are #{num_of_instances(SomeSingletonClass)}"
 
 a = SomeSingletonClass.instance
 b = SomeSingletonClass.instance # a and b are same object
@@ -173,23 +173,23 @@ class Ups < SomeSingletonClass
     puts "initialize called by thread ##{Thread.current[:i]}"
   end
 end
-  
+
 class << Ups
   def _instantiate?
     @enter.push Thread.current[:i]
     while false.equal?(@singleton__instance__)
       @singleton__mutex__.unlock
-      sleep 0.08 
+      sleep 0.08
       @singleton__mutex__.lock
     end
     @leave.push Thread.current[:i]
     @singleton__instance__
   end
-  
+
   def __sleep
     sleep(rand(0.08))
   end
-  
+
   def new
     begin
       __sleep
@@ -201,12 +201,12 @@ class << Ups
       end
     end
   end
-  
+
   def instantiate_all
     @enter = []
     @leave = []
-    1.upto(9) {|i|  
-      Thread.new { 
+    1.upto(9) {|i|
+      Thread.new {
         begin
           Thread.current[:i] = i
           __sleep
@@ -296,7 +296,7 @@ end
 class Down < Middle; end
 
 puts  "and basic \"Down test\" is #{Down.instance == Down.instance}\n
-Various exceptions"  
+Various exceptions"
 
 begin
   module AModule