[ruby-cvs:53336] nagachika:r46190 (ruby_2_1): merge revision(s) r45179, r45564, r45565, r45584, r45585: [Backport #9721]

nagachika at ruby-lang.org nagachika at ruby-lang.org
Wed May 28 01:03:14 JST 2014


nagachika	2014-05-28 01:03:12 +0900 (Wed, 28 May 2014)

  New Revision: 46190

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=46190

  Log:
    merge revision(s) r45179,r45564,r45565,r45584,r45585: [Backport #9721]
    
    envutil.rb: move labeled_module and labeled_class
    
    * test/ruby/envutil.rb (labeled_module, labeled_class): move from
      test/ruby/test_module.rb.
    * proc.c (rb_method_call_with_block, umethod_bind): call with
      IClass including the module for a module instance method.
      [ruby-core:61936] [Bug #9721]
    
    * vm_insnhelper.c (vm_search_super_method): allow bound
      UnboundMethod case.
    
    * proc.c (umethod_bind): use the ancestor iclass instead of new
      iclass to get rid of infinite recursion, if the defined module
      is already included.  [ruby-core:62014] [Bug #9721]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/internal.h
    branches/ruby_2_1/object.c
    branches/ruby_2_1/proc.c
    branches/ruby_2_1/test/ruby/envutil.rb
    branches/ruby_2_1/test/ruby/test_module.rb
    branches/ruby_2_1/test/ruby/test_super.rb
    branches/ruby_2_1/version.h
    branches/ruby_2_1/vm_insnhelper.c


More information about the ruby-cvs mailing list