[ruby-cvs:53817] usa:r46671 (ruby_2_0_0): merge revision(s) 44535, 44536: [Backport #9321]

usa at ruby-lang.org usa at ruby-lang.org
Thu Jul 3 15:20:12 JST 2014


usa	2014-07-03 15:20:05 +0900 (Thu, 03 Jul 2014)

  New Revision: 46671

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

  Log:
    merge revision(s) 44535,44536: [Backport #9321]
    
    * vm.c (rb_vm_pop_cfunc_frame): added.  It cares c_return event.
      The patch base by drkaes (Stefan Kaes).
      [Bug #9321]
    
    * variable.c (rb_mod_const_missing): use rb_vm_pop_cfunc_frame()
      instead of rb_frame_pop().
    
    * vm_eval.c (raise_method_missing): ditto.
    
    * vm_eval.c (rb_iterate): ditto.
    
    * internal.h (rb_vm_pop_cfunc_frame): add decl.
    
    * test/ruby/test_settracefunc.rb: add tests.
      provided by drkaes (Stefan Kaes).
    
    * vm.c, eval.c, include/ruby/intern.h (rb_frame_pop): 
      move definition of rb_frame_pop() and deprecate it.
      It doesn't care about `return' events.
    
    * vm.c, eval.c, include/ruby/intern.h (rb_frame_pop):

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/eval.c
    branches/ruby_2_0_0/include/ruby/intern.h
    branches/ruby_2_0_0/internal.h
    branches/ruby_2_0_0/test/ruby/test_settracefunc.rb
    branches/ruby_2_0_0/variable.c
    branches/ruby_2_0_0/version.h
    branches/ruby_2_0_0/vm.c
    branches/ruby_2_0_0/vm_eval.c


More information about the ruby-cvs mailing list