nobu	2011-08-03 07:46:34 +0900 (Wed, 03 Aug 2011)

  New Revision: 32823

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32823

  Log:
    * encoding.c (enc_find): mistakenly remained !.  [Bug #5150]

  Modified files:
    trunk/ChangeLog
    trunk/encoding.c
    trunk/test/ruby/test_encoding.rb

Index: encoding.c
===================================================================
--- encoding.c	(revision 32822)
+++ encoding.c	(revision 32823)
@@ -1054,7 +1054,7 @@
 enc_find(VALUE klass, VALUE enc)
 {
     int idx;
-    if (!SPECIAL_CONST_P(enc) && BUILTIN_TYPE(enc) == T_DATA && is_data_encoding(enc))
+    if (RB_TYPE_P(enc, T_DATA) && is_data_encoding(enc))
 	return enc;
     idx = str_to_encindex(enc);
     if (idx == UNSPECIFIED_ENCODING) return Qnil;
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32822)
+++ ChangeLog	(revision 32823)
@@ -1,3 +1,7 @@
+Wed Aug  3 07:46:30 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* encoding.c (enc_find): mistakenly remained !.  [Bug #5150]
+
 Wed Aug  3 00:11:08 2011  Tanaka Akira  <akr@f...>
 
 	* lib/prettyprint.rb: update document.  [ruby-core:36776]
Index: test/ruby/test_encoding.rb
===================================================================
--- test/ruby/test_encoding.rb	(revision 32822)
+++ test/ruby/test_encoding.rb	(revision 32823)
@@ -50,6 +50,9 @@
         exit Encoding.find("filesystem") == Encoding::EUC_JP
       EOS
     end
+
+    bug5150 = '[ruby-dev:44327]'
+    assert_raise(TypeError, bug5150) {Encoding.find(1)}
   end
 
   def test_replicate

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/