From 28651fcd3db70dc779fd2d8d119229d3721de34b 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: http://svn.ruby-lang.org/repos/ruby/trunk@5565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/delegate.rb                   |  3 ++-
 lib/rexml/encodings/ISO-8859-1.rb |  2 +-
 lib/weakref.rb                    | 16 ++++++++--------
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/delegate.rb b/lib/delegate.rb
index 1ba4cf1e1..6ceaa67d2 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -27,6 +27,7 @@ class Delegator
       preserved |= t.protected_instance_methods(false)
       break if t == Delegator
     end
+    preserved << "singleton_method_added"
     for method in obj.methods
       next if preserved.include? method
       begin
@@ -37,7 +38,7 @@ class Delegator
 	    rescue Exception
 	      $@.delete_if{|s| /:in `__getobj__'$/ =~ s} #`
 	      $@.delete_if{|s| /^\\(eval\\):/ =~ s}
-	      raise
+	      ::Kernel::raise
 	    end
 	  end
 	EOS
diff --git a/lib/rexml/encodings/ISO-8859-1.rb b/lib/rexml/encodings/ISO-8859-1.rb
index 5beefbd40..32ddfbc90 100644
--- a/lib/rexml/encodings/ISO-8859-1.rb
+++ b/lib/rexml/encodings/ISO-8859-1.rb
@@ -1,6 +1,6 @@
 module REXML
   module Encoding
-    @@__REXML_encoding_methods =<<-EOL
+    @@__REXML_encoding_methods =<<-'EOL'
     # Convert from UTF-8
     def encode content
       array_utf8 = content.unpack('U*')
diff --git a/lib/weakref.rb b/lib/weakref.rb
index 49b907ba1..c790055d0 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