From: Ian Macdonald <ian@...>
Date: 2004-03-29T08:52:03+09:00
Subject: typos in lib/singleton.rb

--17pEHd4RhPHOinZp
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

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      | 
                            | 

--17pEHd4RhPHOinZp
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="singleton.diff"
Content-Transfer-Encoding: quoted-printable

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

--17pEHd4RhPHOinZp--