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 /test | |
| 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 'test')
| -rw-r--r-- | test/-ext-/string/test_fstring.rb | 9 | ||||
| -rw-r--r-- | test/ruby/test_eval.rb | 8 |
2 files changed, 17 insertions, 0 deletions
diff --git a/test/-ext-/string/test_fstring.rb b/test/-ext-/string/test_fstring.rb index 39ed020892..1b3b15c922 100644 --- a/test/-ext-/string/test_fstring.rb +++ b/test/-ext-/string/test_fstring.rb @@ -1,8 +1,11 @@ # frozen_string_literal: false require 'test/unit' require '-test-/string' +require_relative '../symbol/noninterned_name' class Test_String_Fstring < Test::Unit::TestCase + include Test_Symbol::NonInterned + def assert_fstring(str) fstr = Bug::String.fstring(str) yield str @@ -54,6 +57,12 @@ class Test_String_Fstring < Test::Unit::TestCase assert_fstring(str) {|s| assert_send([s, :respond_to?, :foo])} end + def test_singleton_class + str = noninterned_name.force_encoding("us-ascii") + fstr = Bug::String.fstring(str) + assert_raise(TypeError) {fstr.singleton_class} + end + class S < String end diff --git a/test/ruby/test_eval.rb b/test/ruby/test_eval.rb index 6982429b51..bf0a63171d 100644 --- a/test/ruby/test_eval.rb +++ b/test/ruby/test_eval.rb @@ -504,6 +504,14 @@ class TestEval < Test::Unit::TestCase assert_same a, b end + def test_fstring_instance_eval + bug = "[ruby-core:78116] [Bug #12930]".freeze + assert_same bug, (bug.instance_eval {self}) + assert_raise(RuntimeError) { + bug.instance_eval {@ivar = true} + } + end + def test_gced_binding_block assert_normal_exit %q{ def m |