diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-27 06:05:04 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-27 06:05:04 +0000 |
| commit | 51e6d9061dc8090bd1c9e3a1a8dadbbd9294a48d (patch) | |
| tree | 034956384b778251a1dd4090d2f19a43a0d0025b /lib/weakref.rb | |
| parent | 8df4564367f895a5ba6f9186f7c90ebd07c874bb (diff) | |
| download | ruby-51e6d9061dc8090bd1c9e3a1a8dadbbd9294a48d.tar.gz | |
* 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
Diffstat (limited to 'lib/weakref.rb')
| -rw-r--r-- | lib/weakref.rb | 16 |
1 files changed, 8 insertions, 8 deletions
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 |