kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r29136 from trunk into ruby_1_9_2.

Browse source 
--
* vm.c (rb_thread_method_id_and_class): curried proc has no
  method.  [ruby-core:31871]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30024 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-12-02 08:05:28 +00:00
parent 45ba464561
commit 37309d99a7
4 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Aug 29 13:22:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm.c (rb_thread_method_id_and_class): curried proc has no
method. [ruby-core:31871]
Fri Sep 24 23:44:59 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (sym_call), vm.c (invoke_block_from_c),

8
test/ruby/test_proc.rb
View file

@ -793,6 +793,14 @@ class TestProc < Test::Unit::TestCase
end
end
def test_curry_with_trace
bug3751 = '[ruby-core:31871]'
set_trace_func(proc {})
test_curry
ensure
set_trace_func(nil)
end
def test_block_propagation
bug3792 = '[ruby-core:32075]'
c = Class.new do

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 54
#define RUBY_PATCHLEVEL 55
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1

2
vm.c
View file

@ -1396,7 +1396,7 @@ rb_thread_method_id_and_class(rb_thread_t *th,
{
rb_control_frame_t *cfp = th->cfp;
rb_iseq_t *iseq = cfp->iseq;
if (!iseq) {
if (!iseq && cfp->me) {
if (idp) *idp = cfp->me->def->original_id;
if (klassp) *klassp = cfp->me->klass;
return 1;