From 51e6d9061dc8090bd1c9e3a1a8dadbbd9294a48d Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 27 Jan 2004 06:05:04 +0000
Subject: * misc/ruby-mode.el: better support for general delimited   strings. 
 [ruby-dev:22695]

* lib/weakref.rb (WeakRef::initialize): set up @__id before
  calling "super".

* lib/delegate.rb (Delegator::initialize): preserve
  singleton_method_added method [ruby-dev:22685]

* lib/delegate.rb (Delegator::initialize): use Kernel::raise
  instead of mere raise.  [ruby-dev:22681]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/weakref.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'lib/weakref.rb')

diff --git a/lib/weakref.rb b/lib/weakref.rb
index 49b907ba17..c790055d01 100644
--- a/lib/weakref.rb
+++ b/lib/weakref.rb
@@ -41,8 +41,7 @@ class WeakRef<Delegator
   }
 
   def initialize(orig)
-    super
-    @__id = orig.__id__
+    @__id = orig.object_id
     ObjectSpace.define_finalizer orig, @@final
     ObjectSpace.define_finalizer self, @@final
     __old_status = Thread.critical
@@ -52,23 +51,24 @@ class WeakRef<Delegator
     ensure
       Thread.critical = __old_status
     end
-    @@id_map[@__id].push self.__id__
-    @@id_rev_map[self.__id__] = @__id
+    @@id_map[@__id].push self.object_id
+    @@id_rev_map[self.object_id] = @__id
+    super 
   end
 
   def __getobj__
-    unless @@id_rev_map[self.__id__] == @__id
-      raise RefError, "Illegal Reference - probably recycled", caller(2)
+    unless @@id_rev_map[self.object_id] == @__id
+      Kernel::raise RefError, "Illegal Reference - probably recycled", Kernel::caller(2)
     end
     begin
       ObjectSpace._id2ref(@__id)
     rescue RangeError
-      raise RefError, "Illegal Reference - probably recycled", caller(2)
+      Kernel::raise RefError, "Illegal Reference - probably recycled", Kernel::caller(2)
     end
   end
 
   def weakref_alive?
-    @@id_rev_map[self.__id__] == @__id
+    @@id_rev_map[self.object_id] == @__id
   end
 end
 
-- 
cgit v1.2.1