nobu	2011-06-11 16:52:34 +0900 (Sat, 11 Jun 2011)

  New Revision: 31999

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

  Log:
    * numeric.c (rb_enc_uint_chr): fix message format. Bug#4869

  Modified files:
    trunk/ChangeLog
    trunk/numeric.c
    trunk/test/ruby/test_m17n.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31998)
+++ ChangeLog	(revision 31999)
@@ -1,3 +1,7 @@
+Sat Jun 11 16:52:16 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* numeric.c (rb_enc_uint_chr): fix message format. Bug#4869
+
 Sat Jun 11 16:28:25 2011  Kouhei Sutou  <kou@c...>
 
 	* lib/rexml/formatters/pretty.rb
Index: numeric.c
===================================================================
--- numeric.c	(revision 31998)
+++ numeric.c	(revision 31999)
@@ -2118,7 +2118,7 @@
     int n;
     VALUE str;
     if ((n = rb_enc_codelen(code, enc)) <= 0) {
-	rb_raise(rb_eRangeError, "%d out of char range", code);
+	rb_raise(rb_eRangeError, "%u out of char range", code);
     }
     str = rb_enc_str_new(0, n, enc);
     rb_enc_mbcput(code, RSTRING_PTR(str), enc);
Index: test/ruby/test_m17n.rb
===================================================================
--- test/ruby/test_m17n.rb	(revision 31998)
+++ test/ruby/test_m17n.rb	(revision 31999)
@@ -1192,6 +1192,10 @@
       assert_equal([b].pack("C"), b.chr)
     }
     assert_equal("\x84\x31\xA4\x39".force_encoding("GB18030"), 0x8431A439.chr("GB18030"))
+    e = assert_raise(RangeError) {
+      2206368128.chr(Encoding::UTF_8)
+    }
+    assert_not_match(/-\d+ out of char range/, e.message)
   end
 
   def test_marshal

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