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_core.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'vm_core.h') diff --git a/vm_core.h b/vm_core.h index 2174613156..050d7834b4 100644 --- a/vm_core.h +++ b/vm_core.h @@ -597,8 +597,6 @@ typedef rb_control_frame_t * #define RUBY_VM_NORMAL_ISEQ_P(ptr) \ (ptr && !RUBY_VM_IFUNC_P(ptr)) -#define RUBY_VM_CLASS_SPECIAL_P(ptr) (((VALUE)(ptr)) & 0x02) - #define RUBY_VM_GET_BLOCK_PTR_IN_CFP(cfp) ((rb_block_t *)(&(cfp)->self)) #define RUBY_VM_GET_CFP_FROM_BLOCK_PTR(b) \ ((rb_control_frame_t *)((VALUE *)(b) - 5)) -- cgit v1.2.3