diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:56:55 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:56:55 +0000 |
commit | dcc293e053ee845446396b85950fd95cf62bbcb3 (patch) | |
tree | 7f26b6fc5b8798184b0828c44fbb880200a9fe1c /proc.c | |
parent | eaf7ad9d5a5e210bde9ec7643ef0b54da64ee3a1 (diff) |
merges r20980 from trunk into ruby_1_9_1.
* proc.c (proc_new): should use proc_dup() if block has Proc.
* vm.c (vm_make_proc_from_block): should use rb_cProc for block.
* vm.c (vm_make_proc): add an assertion.
* bootstraptest/test_proc.rb: add a test.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21033 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'proc.c')
-rw-r--r-- | proc.c | 22 |
1 files changed, 10 insertions, 12 deletions
@@ -350,7 +350,6 @@ proc_new(VALUE klass, int is_lambda) !RUBY_VM_CLASS_SPECIAL_P(cfp->lfp[0])) { block = GC_GUARDED_PTR_REF(cfp->lfp[0]); - cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp); } else { cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp); @@ -360,15 +359,6 @@ proc_new(VALUE klass, int is_lambda) block = GC_GUARDED_PTR_REF(cfp->lfp[0]); - if (block->proc) { - return block->proc; - } - - /* TODO: check more (cfp limit, called via cfunc, etc) */ - while (cfp->dfp != block->dfp) { - cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp); - } - if (is_lambda) { rb_warn("tried to create Proc object without a block"); } @@ -380,8 +370,16 @@ proc_new(VALUE klass, int is_lambda) } procval = block->proc; - if (procval && RBASIC(procval)->klass == klass) { - return procval; + + if (procval) { + if (RBASIC(procval)->klass == klass) { + return procval; + } + else { + VALUE newprocval = proc_dup(procval); + RBASIC(newprocval)->klass = klass; + return newprocval; + } } procval = vm_make_proc(th, block, klass); |