[ruby-dev:26935] __send__ in lib

なかだです。

__send__の変更で、visibilityの変更を期待していたものが動かなく
なっています。

__attr_proxyはちょっと意味が違うんで、まずいようなら別の方法で。


Index: lib/monitor.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/lib/monitor.rb,v
retrieving revision 1.12
diff -U2 -p -r1.12 monitor.rb
--- lib/monitor.rb	18 Apr 2004 23:19:46 -0000	1.12
+++ lib/monitor.rb	1 Sep 2005 07:20:09 -0000
@@ -88,9 +88,9 @@ module MonitorMixin
     
     def wait(timeout = nil)
-      @monitor.__send__(:mon_check_owner)
+      @monitor.instance_eval {mon_check_owner()}
       timer = create_timer(timeout)
       
       Thread.critical = true
-      count = @monitor.__send__(:mon_exit_for_cond)
+      count = @monitor.instance_eval {mon_exit_for_cond()}
       @waiters.push(Thread.current)
 
@@ -108,5 +108,5 @@ module MonitorMixin
 	  @waiters.delete(Thread.current)
 	end
-        @monitor.__send__(:mon_enter_for_cond, count)
+        @monitor.instance_eval {mon_enter_for_cond(count)}
 	Thread.critical = false
       end
@@ -126,5 +126,5 @@ module MonitorMixin
     
     def signal
-      @monitor.__send__(:mon_check_owner)
+      @monitor.instance_eval {mon_check_owner()}
       Thread.critical = true
       t = @waiters.shift
@@ -135,5 +135,5 @@ module MonitorMixin
     
     def broadcast
-      @monitor.__send__(:mon_check_owner)
+      @monitor.instance_eval {mon_check_owner()}
       Thread.critical = true
       for t in @waiters
@@ -173,5 +173,5 @@ module MonitorMixin
   def self.extend_object(obj)
     super(obj)
-    obj.__send__(:mon_initialize)
+    obj.instance_eval {mon_initialize()}
   end
   
Index: lib/rss/maker/content.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/lib/rss/maker/content.rb,v
retrieving revision 1.2
diff -U2 -p -r1.2 content.rb
--- lib/rss/maker/content.rb	3 Nov 2004 06:43:18 -0000	1.2
+++ lib/rss/maker/content.rb	1 Sep 2005 06:56:25 -0000
@@ -11,6 +11,6 @@ module RSS
           klass.add_need_initialize_variable(element)
           klass.add_other_element(element)
-          klass.__send__(:attr_accessor, element)
-          klass.module_eval(<<-EOC, __FILE__, __LINE__)
+          klass.module_eval(<<-EOC, __FILE__, __LINE__+1)
+            attr_accessor :#{element}
             def setup_#{element}(rss, current)
               if #{element} and current.respond_to?(:#{element}=)
Index: lib/rss/maker/dublincore.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/lib/rss/maker/dublincore.rb,v
retrieving revision 1.7
diff -U2 -p -r1.7 dublincore.rb
--- lib/rss/maker/dublincore.rb	11 Aug 2005 04:04:59 -0000	1.7
+++ lib/rss/maker/dublincore.rb	1 Sep 2005 06:57:18 -0000
@@ -19,6 +19,6 @@ module RSS
                                              "make_#{full_plural_name}")
           klass.add_other_element(full_plural_name)
-          klass.__send__(:attr_accessor, full_plural_name)
-          klass.module_eval(<<-EOC, __FILE__, __LINE__)
+          klass.module_eval(<<-EOC, __FILE__, __LINE__+1)
+            attr_accessor :#{full_plural_name}
             def make_#{full_plural_name}
               #{full_plural_klass_name}.new(@maker)
Index: lib/rss/maker/image.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/lib/rss/maker/image.rb,v
retrieving revision 1.2
diff -U2 -p -r1.2 image.rb
--- lib/rss/maker/image.rb	5 Apr 2005 06:42:02 -0000	1.2
+++ lib/rss/maker/image.rb	1 Sep 2005 07:11:36 -0000
@@ -12,6 +12,6 @@ module RSS
         klass.add_need_initialize_variable(name, "make_#{name}")
         klass.add_other_element(name)
-        klass.__send__(:attr_reader, name)
-        klass.module_eval(<<-EOC, __FILE__, __LINE__)
+        klass.module_eval(<<-EOC, __FILE__, __LINE__+1)
+          attr_reader :#{name}
           def setup_#{name}(rss, current)
             if @#{name}
@@ -53,6 +53,6 @@ EOC
         klass.add_need_initialize_variable(name, "make_#{name}")
         klass.add_other_element(name)
-        klass.__send__(:attr_reader, name)
-        klass.module_eval(<<-EOC, __FILE__, __LINE__)
+        klass.module_eval(<<-EOC, __FILE__, __LINE__+1)
+          attr_reader :#{name}
           def setup_#{name}(rss, current)
             if @#{name}
Index: lib/rss/maker/syndication.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/lib/rss/maker/syndication.rb,v
retrieving revision 1.2
diff -U2 -p -r1.2 syndication.rb
--- lib/rss/maker/syndication.rb	3 Nov 2004 06:43:18 -0000	1.2
+++ lib/rss/maker/syndication.rb	1 Sep 2005 07:09:14 -0000
@@ -11,6 +11,6 @@ module RSS
           klass.add_need_initialize_variable(element)
           klass.add_other_element(element)
-          klass.__send__(:attr_accessor, element)
-          klass.module_eval(<<-EOC, __FILE__, __LINE__)
+          klass.module_eval(<<-EOC, __FILE__, __LINE__+1)
+            attr_accessor :#{element}
             def setup_#{element}(rss, current)
               if #{element} and current.respond_to?(:#{element}=)
Index: lib/rss/maker/trackback.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/lib/rss/maker/trackback.rb,v
retrieving revision 1.4
diff -U2 -p -r1.4 trackback.rb
--- lib/rss/maker/trackback.rb	5 Apr 2005 06:42:02 -0000	1.4
+++ lib/rss/maker/trackback.rb	1 Sep 2005 07:08:48 -0000
@@ -12,6 +12,6 @@ module RSS
         klass.add_need_initialize_variable(name)
         klass.add_other_element(name)
-        klass.__send__(:attr_accessor, name)
-        klass.module_eval(<<-EOC, __FILE__, __LINE__)
+        klass.module_eval(<<-EOC, __FILE__, __LINE__+1)
+          attr_accessor :#{name}
           def setup_#{name}(rss, current)
             if #{name} and current.respond_to?(:#{name}=)
@@ -24,6 +24,6 @@ module RSS
         klass.add_need_initialize_variable(name, "make_#{name}")
         klass.add_other_element(name)
-        klass.__send__(:attr_accessor, name)
-        klass.module_eval(<<-EOC, __FILE__, __LINE__)
+        klass.module_eval(<<-EOC, __FILE__, __LINE__+1)
+          attr_accessor :#{name}
           def make_#{name}
             self.class::TrackBackAbouts.new(self)
Index: lib/rss/parser.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/lib/rss/parser.rb,v
retrieving revision 1.15
diff -U2 -p -r1.15 parser.rb
--- lib/rss/parser.rb	22 Jul 2005 05:40:31 -0000	1.15
+++ lib/rss/parser.rb	1 Sep 2005 07:20:47 -0000
@@ -410,5 +410,5 @@ module RSS
       prefix = ""
       prefix << "#{klass.required_prefix}_" if klass.required_prefix
-      previous.__send__(:set_next_element, prefix, tag_name, next_element)
+      previous.instance_eval {set_next_element(prefix, tag_name, next_element)}
       @last_element = next_element
       @proc_stack.push Proc.new { |text, tags|
Index: lib/rss/rss.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/lib/rss/rss.rb,v
retrieving revision 1.27
diff -U2 -p -r1.27 rss.rb
--- lib/rss/rss.rb	22 Jul 2005 06:10:22 -0000	1.27
+++ lib/rss/rss.rb	1 Sep 2005 08:04:41 -0000
@@ -660,5 +660,5 @@ EOC
           target = parent.__send__(plural_name)
           __send__(plural_name).each do |elem|
-            elem.__send__("setup_maker", target)
+            elem.setup_maker(target)
           end
         end
Index: lib/rss/trackback.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/lib/rss/trackback.rb,v
retrieving revision 1.11
diff -U2 -p -r1.11 trackback.rb
--- lib/rss/trackback.rb	5 Apr 2005 07:03:42 -0000	1.11
+++ lib/rss/trackback.rb	1 Sep 2005 07:08:16 -0000
@@ -39,5 +39,5 @@ module RSS
 
       unless klass.class == Module
-        klass.__send__(:include, TrackBackUtils)
+        klass.module_eval {include TrackBackUtils}
 
         %w(ping).each do |name|
Index: lib/soap/mapping/mapping.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/lib/soap/mapping/mapping.rb,v
retrieving revision 1.9
diff -U2 -p -r1.9 mapping.rb
--- lib/soap/mapping/mapping.rb	22 May 2005 13:03:18 -0000	1.9
+++ lib/soap/mapping/mapping.rb	1 Sep 2005 07:22:19 -0000
@@ -255,5 +255,5 @@ module Mapping
   def self.define_singleton_method(obj, name, &block)
     sclass = (class << obj; self; end)
-    sclass.__send__(:define_method, name, &block)
+    sclass.class_eval {define_method(name, &block)}
   end
 
Index: lib/soap/rpc/driver.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/lib/soap/rpc/driver.rb,v
retrieving revision 1.9
diff -U2 -p -r1.9 driver.rb
--- lib/soap/rpc/driver.rb	22 May 2005 13:03:18 -0000	1.9
+++ lib/soap/rpc/driver.rb	1 Sep 2005 07:32:51 -0000
@@ -27,11 +27,8 @@ class Driver
       def __attr_proxy(symbol, assignable = false)
         name = symbol.to_s
-        self.__send__(:define_method, name, proc {
-          @proxy.__send__(name)
-        })
+        define_method(name, &@proxy.method(name))
         if assignable
-          self.__send__(:define_method, name + '=', proc { |rhs|
-            @proxy.__send__(name + '=', rhs)
-          })
+          name += '='
+          define_method(aname, &@proxy.method(aname))
         end
       end
Index: lib/soap/wsdlDriver.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/lib/soap/wsdlDriver.rb,v
retrieving revision 1.12
diff -U2 -p -r1.12 wsdlDriver.rb
--- lib/soap/wsdlDriver.rb	22 May 2005 13:03:16 -0000	1.12
+++ lib/soap/wsdlDriver.rb	1 Sep 2005 07:37:18 -0000
@@ -107,7 +107,5 @@ private
       end
       if orgname != name and orgname.capitalize == name.capitalize
-        ::SOAP::Mapping.define_singleton_method(drv, orgname) do |*arg|
-          __send__(name, *arg)
-        end
+        ::SOAP::Mapping.define_singleton_method(drv, orgname, &method(name))
       end
     end
@@ -160,11 +158,8 @@ class WSDLDriver
       def __attr_proxy(symbol, assignable = false)
         name = symbol.to_s
-        self.__send__(:define_method, name, proc {
-          @servant.__send__(name)
-        })
+        define_method(name, &@servant.method(name))
         if assignable
-          self.__send__(:define_method, name + '=', proc { |rhs|
-            @servant.__send__(name + '=', rhs)
-          })
+          name += '='
+          define_method(name, &@servant.method(name))
         end
       end
Index: lib/wsdl/xmlSchema/attribute.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/lib/wsdl/xmlSchema/attribute.rb,v
retrieving revision 1.4
diff -U2 -p -r1.4 attribute.rb
--- lib/wsdl/xmlSchema/attribute.rb	22 May 2005 13:03:20 -0000	1.4
+++ lib/wsdl/xmlSchema/attribute.rb	1 Sep 2005 07:39:34 -0000
@@ -19,8 +19,9 @@ class Attribute < Info
       def attr_reader_ref(symbol)
         name = symbol.to_s
-        self.__send__(:define_method, name, proc {
-          instance_variable_get("@#{name}") ||
+        iv = "@#{name}"
+        define_method(name) {
+          instance_variable_get(iv) ||
             (refelement ? refelement.__send__(name) : nil)
-        })
+        }
       end
     else
Index: lib/wsdl/xmlSchema/element.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/lib/wsdl/xmlSchema/element.rb,v
retrieving revision 1.4
diff -U2 -p -r1.4 element.rb
--- lib/wsdl/xmlSchema/element.rb	22 May 2005 13:03:20 -0000	1.4
+++ lib/wsdl/xmlSchema/element.rb	1 Sep 2005 07:40:02 -0000
@@ -19,8 +19,9 @@ class Element < Info
       def attr_reader_ref(symbol)
         name = symbol.to_s
-        self.__send__(:define_method, name, proc {
-          instance_variable_get("@#{name}") ||
+        iv = "@#{name}"
+        define_method(name) {
+          instance_variable_get(iv) ||
             (refelement ? refelement.__send__(name) : nil)
-        })
+        }
       end
     else


-- 
--- 僕の前にBugはない。
--- 僕の後ろにBugはできる。
    中田 伸悦