From 80f7f8d07e2b3b48c054e5f4c5d2e16ffa9bfc67 Mon Sep 17 00:00:00 2001 From: mame Date: Sun, 9 May 2010 18:21:39 +0000 Subject: * compile.c (iseq_compile_each), vm_insnhelper.c (vm_invoke_block, vm_throw): allow "return" and "yield" even in singleton class definition. based on a patch from wanabe for "return". [ruby-core:21379] [ruby-dev:40975] * insns.def (defineclass): ditto (straightforwardly push block ptr, instead of dfp ptr with special flag). * vm_core.h (RUBY_VM_CLASS_SPECIAL_P): ditto (no longer needed). * proc.c (proc_new): ditto (remove handling for special flag). * bootstraptest/test_jump.rb: add tests for above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27714 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'vm.c') diff --git a/vm.c b/vm.c index e7c9a33df5..084c8c853e 100644 --- a/vm.c +++ b/vm.c @@ -477,7 +477,6 @@ rb_vm_make_proc(rb_thread_t *th, const rb_block_t *block, VALUE klass) } if (GC_GUARDED_PTR_REF(cfp->lfp[0])) { - if (!RUBY_VM_CLASS_SPECIAL_P(cfp->lfp[0])) { rb_proc_t *p; blockprocval = vm_make_proc_from_block( @@ -486,7 +485,6 @@ rb_vm_make_proc(rb_thread_t *th, const rb_block_t *block, VALUE klass) GetProcPtr(blockprocval, p); *cfp->lfp = GC_GUARDED_PTR(&p->block); } - } envval = rb_vm_make_env_object(th, cfp); -- cgit v1.2.3