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

Revert "encoding.c (rb_enc_get_index): return -1 for non-encoding capable objects"

Browse source 
* This reverts commit fb253d2032.
* The CI is failing, this seems a bug in the JSON C extension.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64174 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eregon 2018-08-03 14:31:39 +00:00
parent fb253d2032
commit bd58361e58
2 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
encoding.c
View file

@ -793,26 +793,24 @@ rb_enc_get_index(VALUE obj)
obj = rb_sym2str(obj); obj = rb_sym2str(obj);
} }
switch (BUILTIN_TYPE(obj)) { switch (BUILTIN_TYPE(obj)) {
as_default:
default:
case T_STRING: case T_STRING:
case T_SYMBOL:
case T_REGEXP: case T_REGEXP:
i = enc_get_index_str(obj); i = enc_get_index_str(obj);
break; break;
case T_FILE: case T_FILE:
tmp = rb_funcallv(obj, rb_intern("internal_encoding"), 0, 0); tmp = rb_funcallv(obj, rb_intern("internal_encoding"), 0, 0);
if (NIL_P(tmp)) { if (NIL_P(tmp)) obj = rb_funcallv(obj, rb_intern("external_encoding"), 0, 0);
tmp = rb_funcallv(obj, rb_intern("external_encoding"), 0, 0); else obj = tmp;
} if (NIL_P(obj)) break;
if (is_data_encoding(tmp)) {
i = enc_check_encoding(tmp);
}
break;
case T_DATA: case T_DATA:
if (is_data_encoding(obj)) { if (is_data_encoding(obj)) {
i = enc_check_encoding(obj); i = enc_check_encoding(obj);
} }
break; else {
default: goto as_default;
}
break; break;
} }
return i; return i;

5
spec/ruby/optional/capi/encoding_spec.rb
View file

@ -147,11 +147,6 @@ describe "C-API Encoding function" do
it "returns -1 as the index for immediates" do it "returns -1 as the index for immediates" do
@s.send(@method, 1).should == -1 @s.send(@method, 1).should == -1
end end
it "returns -1 for an object without an encoding" do
obj = Object.new
@s.send(@method, obj).should == -1
end
end end
describe "rb_enc_set_index" do describe "rb_enc_set_index" do