diff --git a/ChangeLog b/ChangeLog index baf6dbc7e6..1f7f41fb26 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Sep 15 07:27:52 2010 Nobuyoshi Nakada + + * string.c (rb_str_times): mentioned about Hash argument. a patch + from Daniel Bovensiepen at [ruby-core:32386]. + + * sprintf.c (get_hash): ditto, and fix typo. + Wed Sep 15 07:22:20 2010 Tanaka Akira * ext/pathname/pathname.c (path_entries): Pathname#entries translated diff --git a/sprintf.c b/sprintf.c index 4f3b51701e..a9e560b48e 100644 --- a/sprintf.c +++ b/sprintf.c @@ -422,13 +422,13 @@ get_hash(volatile VALUE *hash, int argc, const VALUE *argv) * sprintf("%u", -123) #=> "-123" * * For more complex formatting, Ruby supports a reference by name. - * %s style uses format style, but ${name} style doesn't. + * %s style uses format style, but %{name} style doesn't. * * Exapmles: * sprintf("%d : %f" % { :foo => 1, :bar => 2 }) * #=> 1 : 2.000000 - * sprintf("%d %{foo}" % { :foo => 'bar' }) - * # => "%d bar" + * sprintf("%{foo}f" % { :foo => 1 }) + * # => "1f" */ VALUE diff --git a/string.c b/string.c index f96c770f04..4ae149f0c4 100644 --- a/string.c +++ b/string.c @@ -1224,12 +1224,13 @@ rb_str_times(VALUE str, VALUE times) * * Format---Uses str as a format specification, and returns the result * of applying it to arg. If the format specification contains more than - * one substitution, then arg must be an Array containing - * the values to be substituted. See Kernel::sprintf for details - * of the format string. + * one substitution, then arg must be an Array or Hash + * containing the values to be substituted. See Kernel::sprintf for + * details of the format string. * * "%05d" % 123 #=> "00123" * "%-5s: %08x" % [ "ID", self.object_id ] #=> "ID : 200e14d6" + * "foo = %{foo}" % { :foo => 'bar' } #=> "foo = bar" */ static VALUE