summaryrefslogtreecommitdiffstats
path: root/lib/delegate.rb
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-10-20 12:47:20 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-10-20 12:47:20 +0000
commitf71b2a1e2b0c272bcf2f1bae29ea9964d2f7201d (patch)
treedb3928abc44090d749b6609bfb7ef49f2631a5c9 /lib/delegate.rb
parent7008e5c98b9e0fa8deecafc3d0474f4ed838d17a (diff)
downloadruby-f71b2a1e2b0c272bcf2f1bae29ea9964d2f7201d.tar.gz
ruby-f71b2a1e2b0c272bcf2f1bae29ea9964d2f7201d.tar.xz
ruby-f71b2a1e2b0c272bcf2f1bae29ea9964d2f7201d.zip
* string.c (str_gsub): reentrant check. [ruby-dev:24432]
* backport all SEGV bug fixes from CVS HEAD. [ruby-dev:24536] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7090 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/delegate.rb')
-rw-r--r--lib/delegate.rb14
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/delegate.rb b/lib/delegate.rb
index ee574cb02..20e6b53c2 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -76,10 +76,14 @@ class SimpleDelegator<Delegator
@_sd_obj = obj
end
- def initialize_copy(obj)
+ def clone(obj)
super
__setobj__(obj.__getobj__.clone)
end
+ def dup(obj)
+ super
+ __setobj__(obj.__getobj__.dup)
+ end
end
# backward compatibility ^_^;;;
@@ -108,9 +112,13 @@ def DelegateClass(superclass)
def __setobj__(obj)
@_dc_obj = obj
end
- def initialize_copy(obj)
+ def clone(obj)
super
- __setobj__(obj.__getobj__.clone)
+ __setobj__(obj.__getobj__.clone)
+ end
+ def dup(obj)
+ super
+ __setobj__(obj.__getobj__.dup)
end
}
for method in methods