kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 56747,56754,56777: [Backport #12923] [Backport #12930] [Backport #13238]

Browse source 
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
This commit is contained in:
nagachika 2017-03-27 15:08:54 +00:00
parent 783286fe56
commit 018eeaf276
5 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
class.c
View file

@ -1578,6 +1578,9 @@ singleton_class_of(VALUE obj)
switch (BUILTIN_TYPE(obj)) { switch (BUILTIN_TYPE(obj)) {
case T_FLOAT: case T_BIGNUM: case T_SYMBOL: case T_FLOAT: case T_BIGNUM: case T_SYMBOL:
goto no_singleton; goto no_singleton;
case T_STRING:
if (FL_TEST_RAW(obj, RSTRING_FSTR)) goto no_singleton;
break;
} }
} }

9
test/-ext-/string/test_fstring.rb
View file

@ -1,8 +1,11 @@
# frozen_string_literal: false # frozen_string_literal: false
require 'test/unit' require 'test/unit'
require '-test-/string' require '-test-/string'
require_relative '../symbol/noninterned_name'
class Test_String_Fstring < Test::Unit::TestCase class Test_String_Fstring < Test::Unit::TestCase
include Test_Symbol::NonInterned
def assert_fstring(str) def assert_fstring(str)
fstr = Bug::String.fstring(str) fstr = Bug::String.fstring(str)
yield str yield str
@ -54,6 +57,12 @@ class Test_String_Fstring < Test::Unit::TestCase
assert_fstring(str) {|s| assert_send([s, :respond_to?, :foo])} assert_fstring(str) {|s| assert_send([s, :respond_to?, :foo])}
end 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 class S < String
end end

8
test/ruby/test_eval.rb
View file

@ -504,6 +504,14 @@ class TestEval < Test::Unit::TestCase
assert_same a, b assert_same a, b
end 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 def test_gced_binding_block
assert_normal_exit %q{ assert_normal_exit %q{
def m def m

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.3" #define RUBY_VERSION "2.3.3"
#define RUBY_RELEASE_DATE "2017-03-27" #define RUBY_RELEASE_DATE "2017-03-27"
#define RUBY_PATCHLEVEL 267 #define RUBY_PATCHLEVEL 268
#define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3

2
vm_eval.c
View file

@ -1667,6 +1667,8 @@ singleton_class_for_eval(VALUE self)
switch (BUILTIN_TYPE(self)) { switch (BUILTIN_TYPE(self)) {
case T_FLOAT: case T_BIGNUM: case T_SYMBOL: case T_FLOAT: case T_BIGNUM: case T_SYMBOL:
return Qnil; return Qnil;
case T_STRING:
if (FL_TEST_RAW(self, RSTRING_FSTR)) return Qnil;
default: default:
return rb_singleton_class(self); return rb_singleton_class(self);
} }