naruse	2008-08-24 06:12:32 +0900 (Sun, 24 Aug 2008)

  New Revision: 18797

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

  Log:
    * encoding.c (enc_compatible_p): raise TypeError when argument is Encoding.

  Modified files:
    trunk/ChangeLog
    trunk/encoding.c

Index: encoding.c
===================================================================
--- encoding.c	(revision 18796)
+++ encoding.c	(revision 18797)
@@ -876,6 +876,8 @@
 {
     rb_encoding *enc;
 
+    if (enc_check_encoding(str1) > 0 || enc_check_encoding(str2) > 0)
+       rb_raise(rb_eTypeError, "wrong argument type Encoding (expected String)");
     if (!enc_capable(str1)) return Qnil;
     if (!enc_capable(str2)) return Qnil;
     enc = rb_enc_compatible(str1, str2);
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18796)
+++ ChangeLog	(revision 18797)
@@ -1,3 +1,7 @@
+Sun Aug 24 04:23:19 2008  NARUSE, Yui  <naruse@r...>
+
+	* encoding.c (enc_compatible_p): raise TypeError when argument is Encoding.
+
 Sat Aug 23 23:25:47 2008  NARUSE, Yui  <naruse@r...>
 
 	* lib/cgi.rb (CGI#out): remove auto encoding conversion and set

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