diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-17 06:38:18 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-17 06:38:18 +0000 |
commit | e78cb14774c3c08f1475299bb684b933ba2591b0 (patch) | |
tree | a4b269efa6e8341c107625d3ceb4344374cc8595 /lib/delegate.rb | |
parent | 1c1d2b9c34f6adcaf25667ab51f7f3720b4d8abe (diff) |
* lib/cgi.rb (CGI::QueryExtension::Value::[]): should work like
String#[] if more than one arguments are specified.
* lib/delegate.rb: avoid using common instance name as "@obj".
* lib/cgi.rb (CGI::QueryExtension::Value): Value is no longer
subclass of String, but DelegateClass(String).
* ext/curses/extconf.rb: restore function check for init_color.
[ruby-list:38905]
* Makefile.in: need to specify $(MAINLIBS) for the miniruby
generation rule.
* configure.in: better FreeBSD -lc_r support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5206 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/delegate.rb')
-rw-r--r-- | lib/delegate.rb | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/delegate.rb b/lib/delegate.rb index 41d35477e4..1ba4cf1e1b 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -64,15 +64,15 @@ class SimpleDelegator<Delegator def initialize(obj) super - @obj = obj + @_sd_obj = obj end def __getobj__ - @obj + @_sd_obj end def __setobj__(obj) - @obj = obj + @_sd_obj = obj end end @@ -88,7 +88,7 @@ def DelegateClass(superclass) methods |= ["to_s","to_a","inspect","==","=~","==="] klass.module_eval <<-EOS def initialize(obj) - @obj = obj + @_dc_obj = obj end EOS for method in methods @@ -96,7 +96,7 @@ def DelegateClass(superclass) klass.module_eval <<-EOS def #{method}(*args, &block) begin - @obj.__send__(:#{method}, *args, &block) + @_dc_obj.__send__(:#{method}, *args, &block) rescue $@[0,2] = nil raise @@ -107,6 +107,9 @@ def DelegateClass(superclass) raise NameError, "invalid identifier %s" % method, caller(3) end end + def __getobj__ + @_dc_obj + end return klass; end |