From c2a04d87d0f51e871e2fc0254ce6f90136b50169 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 23 Apr 2015 02:35:58 +0000 Subject: vm_eval.c: allow symbols to instance_eval/exec * vm_eval.c (rb_obj_instance_eval, rb_obj_instance_exec): allow symbols to just instance_eval/exec, execept for definition of singletons. [ruby-core:68961] [Bug #11086] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50372 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- class.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'class.c') diff --git a/class.c b/class.c index 11210682fe..37ad4b542b 100644 --- a/class.c +++ b/class.c @@ -1539,7 +1539,8 @@ singleton_class_of(VALUE obj) { VALUE klass; - if (FIXNUM_P(obj) || FLONUM_P(obj) || SYMBOL_P(obj)) { + if (FIXNUM_P(obj) || FLONUM_P(obj) || STATIC_SYM_P(obj)) { + no_singleton: rb_raise(rb_eTypeError, "can't define singleton"); } if (SPECIAL_CONST_P(obj)) { @@ -1549,9 +1550,9 @@ singleton_class_of(VALUE obj) return klass; } else { - enum ruby_value_type type = BUILTIN_TYPE(obj); - if (type == T_FLOAT || type == T_BIGNUM) { - rb_raise(rb_eTypeError, "can't define singleton"); + switch (BUILTIN_TYPE(obj)) { + case T_FLOAT: case T_BIGNUM: case T_SYMBOL: + goto no_singleton; } } -- cgit v1.2.3