diff options
| -rw-r--r-- | encoding.c | 18 | ||||
| -rw-r--r-- | spec/ruby/optional/capi/encoding_spec.rb | 5 |
2 files changed, 8 insertions, 15 deletions
diff --git a/encoding.c b/encoding.c index d130eb2612..eac4d7c50a 100644 --- a/encoding.c +++ b/encoding.c @@ -793,26 +793,24 @@ rb_enc_get_index(VALUE obj) obj = rb_sym2str(obj); } switch (BUILTIN_TYPE(obj)) { + as_default: + default: case T_STRING: - case T_SYMBOL: case T_REGEXP: i = enc_get_index_str(obj); break; case T_FILE: tmp = rb_funcallv(obj, rb_intern("internal_encoding"), 0, 0); - if (NIL_P(tmp)) { - tmp = rb_funcallv(obj, rb_intern("external_encoding"), 0, 0); - } - if (is_data_encoding(tmp)) { - i = enc_check_encoding(tmp); - } - break; + if (NIL_P(tmp)) obj = rb_funcallv(obj, rb_intern("external_encoding"), 0, 0); + else obj = tmp; + if (NIL_P(obj)) break; case T_DATA: if (is_data_encoding(obj)) { i = enc_check_encoding(obj); } - break; - default: + else { + goto as_default; + } break; } return i; diff --git a/spec/ruby/optional/capi/encoding_spec.rb b/spec/ruby/optional/capi/encoding_spec.rb index 33587bf03a..7661f2b68b 100644 --- a/spec/ruby/optional/capi/encoding_spec.rb +++ b/spec/ruby/optional/capi/encoding_spec.rb @@ -147,11 +147,6 @@ describe "C-API Encoding function" do it "returns -1 as the index for immediates" do @s.send(@method, 1).should == -1 end - - it "returns -1 for an object without an encoding" do - obj = Object.new - @s.send(@method, obj).should == -1 - end end describe "rb_enc_set_index" do |