nobu	2012-04-11 21:43:56 +0900 (Wed, 11 Apr 2012)

  New Revision: 35297

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

  Log:
    * sprintf.c (rb_str_format): fix error message.

  Modified files:
    trunk/sprintf.c
    trunk/test/ruby/test_sprintf.rb

Index: sprintf.c
===================================================================
--- sprintf.c	(revision 35296)
+++ sprintf.c	(revision 35297)
@@ -584,7 +584,7 @@
 #endif
 		len = (int)(p - start + 1); /* including parenthesis */
 		if (id) {
-		    rb_raise(rb_eArgError, "name%.*s after <%s>",
+		    rb_raise(rb_eArgError, "named%.*s after <%s>",
 			     len, start, rb_id2name(id));
 		}
 		id = rb_intern3(start + 1, len - 2 /* without parenthesis */, enc);
Index: test/ruby/test_sprintf.rb
===================================================================
--- test/ruby/test_sprintf.rb	(revision 35296)
+++ test/ruby/test_sprintf.rb	(revision 35297)
@@ -325,10 +325,15 @@
 
   def test_named
     assert_equal("value", sprintf("%<key>s", :key => "value"))
-    assert_raise(ArgumentError) {sprintf("%1$<key2>s", :key => "value")}
-    assert_raise(ArgumentError) {sprintf("%<key><key2>s", :key => "value")}
+    e = assert_raise(ArgumentError) {sprintf("%1$<key2>s", :key => "value")}
+    assert_equal("named<key2> after numbered", e.message)
+    e = assert_raise(ArgumentError) {sprintf("%<key><key2>s", :key => "value")}
+    assert_equal("named<key2> after <key>", e.message)
     assert_equal("value", sprintf("%{key}", :key => "value"))
-    assert_raise(ArgumentError) {sprintf("%1${key2}", :key => "value")}
+    e = assert_raise(ArgumentError) {sprintf("%1${key2}", :key => "value")}
+    assert_equal("named{key2} after numbered", e.message)
+    e = assert_raise(ArgumentError) {sprintf("%<key>{key2}", :key => "value")}
+    assert_equal("named{key2} after <key>", e.message)
     assert_equal("value{key2}", sprintf("%{key}{key2}", :key => "value"))
   end
 end

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