diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-03-26 08:24:09 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-03-26 08:24:09 +0000 |
| commit | 45fff5150a1aa5fac2e54a9771dbc4a3318df8b9 (patch) | |
| tree | a52597a3648fd371a663c3b811d300944fc58eff | |
| parent | 623da1525a7a98f84286316e791086548083ab97 (diff) | |
| download | ruby-45fff5150a1aa5fac2e54a9771dbc4a3318df8b9.tar.gz | |
encoding.c: enc_capable symbol
* encoding.c (enc_capable): Symbol is now encoding capable.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | encoding.c | 1 | ||||
| -rw-r--r-- | test/ruby/test_encoding.rb | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/encoding.c b/encoding.c index f102524379..df3d65cd48 100644 --- a/encoding.c +++ b/encoding.c @@ -720,6 +720,7 @@ enc_capable(VALUE obj) case T_STRING: case T_REGEXP: case T_FILE: + case T_SYMBOL: return TRUE; case T_DATA: if (is_data_encoding(obj)) return TRUE; diff --git a/test/ruby/test_encoding.rb b/test/ruby/test_encoding.rb index 85f1a2df17..9a780a64c5 100644 --- a/test/ruby/test_encoding.rb +++ b/test/ruby/test_encoding.rb @@ -107,6 +107,9 @@ class TestEncoding < Test::Unit::TestCase bin = "a".force_encoding(Encoding::ASCII_8BIT) asc = "b".force_encoding(Encoding::US_ASCII) assert_equal(Encoding::ASCII_8BIT, Encoding.compatible?(bin, asc)) + bin = "\xff".force_encoding(Encoding::ASCII_8BIT).to_sym + asc = "b".force_encoding(Encoding::ASCII_8BIT) + assert_equal(Encoding::ASCII_8BIT, Encoding.compatible?(bin, asc)) end def test_errinfo_after_autoload |