ruby-core

Hello,

Attached is a patch to fix some spelling errors in the CVS of
lib/singleton.rb.

Best wishes,

Ian
-- 
Ian Macdonald               | In Tulsa, Oklahoma, it is against the law
System Administrator        | to open a soda bottle without the
ian@caliban.org             | supervision of a licensed engineer. 
http://www.caliban.org      | 
                            |

Attachments (1)

singleton.diff (2.75 KB, text/x-diff)

Index: lib/singleton.rb
[0m===================================================================
RCS file: /src/ruby/lib/singleton.rb,v
retrieving revision 1.21
[34mdiff -u -r1.21 singleton.rb[0m
[31m--- lib/singleton.rb	22 Aug 2003 08:09:58 -0000	1.21[0m
[32m+++ lib/singleton.rb	28 Mar 2004 23:49:05 -0000[0m
[34m@@ -13,7 +13,7 @@[0m
 #    a == b   # => true
 #    a.new    #  NoMethodError - new is private ...
 #
[31m-# *  ``The instance'' is created at instanciation time, in other[0m
[32m+# *  ``The instance'' is created at instantiation time, in other[0m
 #    words the first call of Klass.instance(), thus
 #
 #    class OtherKlass
[34m@@ -44,11 +44,11 @@[0m
 #
 # *  Klass._load(str)  -  calling Klass.instance()
 #
[31m-# *  Klass._instanciate?()  -  returning ``the instance'' or[0m
[32m+# *  Klass._instantiate?()  -  returning ``the instance'' or[0m
 #    nil. This hook method puts a second (or nth) thread calling
 #    Klass.instance() on a waiting loop. The return value
 #    signifies the successful completion or premature termination
[31m-#    of the first, or more generally, current "instanciation thread".[0m
[32m+#    of the first, or more generally, current "instantiation thread".[0m
 #
 #
 # The instance method of Singleton are
[34m@@ -103,7 +103,7 @@[0m
           @__instance__ = nil #  failed instance creation
         end
       end
[31m-    elsif  _instanciate?()[0m
[32m+    elsif  _instantiate?()[0m
       Thread.critical = false    
     else
       @__instance__  = false
[34m@@ -144,7 +144,7 @@[0m
     end
     
     # waiting-loop hook
[31m-    def _instanciate?()[0m
[32m+    def _instantiate?()[0m
       while false.equal?(@__instance__)
         Thread.critical = false
         sleep(0.08)   # timeout
[34m@@ -209,7 +209,7 @@[0m
 
 
 
[31m-puts "\nThreaded example with exception and customized #_instanciate?() hook"; p[0m
[32m+puts "\nThreaded example with exception and customized #_instantiate?() hook"; p[0m
 Thread.abort_on_exception = false
 
 class Ups < SomeSingletonClass
[34m@@ -220,7 +220,7 @@[0m
 end
   
 class << Ups
[31m-  def _instanciate?[0m
[32m+  def _instantiate?[0m
     @enter.push Thread.current[:i]
     while false.equal?(@__instance__)
       Thread.critical = false
[34m@@ -247,7 +247,7 @@[0m
     end
   end
   
[31m-  def instanciate_all[0m
[32m+  def instantiate_all[0m
     @enter = []
     @leave = []
     1.upto(9) {|i|  
[34m@@ -270,7 +270,7 @@[0m
 end
 
 
[31m-Ups.instanciate_all[0m
[32m+Ups.instantiate_all[0m
 # results in message like
 # Before there were 0 Ups instance(s)
 # boom - thread #6 failed to create instance
[34m@@ -293,7 +293,7 @@[0m
     end
   end
 end
[31m-Yup.instanciate_all[0m
[32m+Yup.instantiate_all[0m
 
 
 puts "\n\n","Customized marshalling"

Thread

Prev Next

In This Thread

Prev Next