diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-27 15:08:54 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-27 15:08:54 +0000 |
commit | 018eeaf276624f2baed2bf01993a71dba62b584c (patch) | |
tree | 855f7b4a7494fd812a4d79daf802be9ca0d73605 /vm_eval.c | |
parent | 783286fe56b160acd5f366ac9d52c9e2824c446c (diff) |
merge revision(s) 56747,56754,56777: [Backport #12923] [Backport #12930] [Backport #13238]
class.c: no fstring singleton class
* class.c (singleton_class_of): prohibit fstrings from creating
singleton classes.
temporary measure for [ruby-dev:49867] [Bug #12923]
test_fstring.rb: fix exception
* test/-ext-/string/test_fstring.rb (test_singleton_class): fix
expected exception class. [ruby-dev:49867] [Bug #12923]
vm_eval.c: fstring instance_eval
* vm_eval.c (singleton_class_for_eval): enable fstring singleton
class for instance_eval. [ruby-core:78116] [Bug #12930]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@58157 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_eval.c')
-rw-r--r-- | vm_eval.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1667,6 +1667,8 @@ singleton_class_for_eval(VALUE self) switch (BUILTIN_TYPE(self)) { case T_FLOAT: case T_BIGNUM: case T_SYMBOL: return Qnil; + case T_STRING: + if (FL_TEST_RAW(self, RSTRING_FSTR)) return Qnil; default: return rb_singleton_class(self); } |