1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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
This commit is contained in:
matz 2004-01-27 06:05:04 +00:00
parent 8df4564367
commit 51e6d9061d
9 changed files with 39 additions and 24 deletions

View file

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