[macruby-changes] [1749] MacRuby/branches/experimental

[source_changes at macosforge.org]

Revision: 1749
          http://trac.macosforge.org/projects/ruby/changeset/1749
Author:   lsansonetti at apple.com
Date:     2009-06-05 13:02:14 -0700 (Fri, 05 Jun 2009)
Log Message:
-----------
String#{ljust,rjust,center}: if the given padding string is empty, raise an ArgumentError

Modified Paths:
--------------
    MacRuby/branches/experimental/spec/frozen/tags/macruby/core/string/center_tags.txt
    MacRuby/branches/experimental/spec/frozen/tags/macruby/core/string/ljust_tags.txt
    MacRuby/branches/experimental/spec/frozen/tags/macruby/core/string/rjust_tags.txt
    MacRuby/branches/experimental/string.c

Modified: MacRuby/branches/experimental/spec/frozen/tags/macruby/core/string/center_tags.txt
===================================================================
--- MacRuby/branches/experimental/spec/frozen/tags/macruby/core/string/center_tags.txt	2009-06-05 15:47:47 UTC (rev 1748)
+++ MacRuby/branches/experimental/spec/frozen/tags/macruby/core/string/center_tags.txt	2009-06-05 20:02:14 UTC (rev 1749)
@@ -1,4 +1,3 @@
-critical:String#center with length, padding raises an ArgumentError if padstr is empty
 fails:String#center with length, padding returns a new string of specified length with self centered and padded with padstr
 fails:String#center with length, padding calls #to_str to convert padstr to a String
 fails:String#center with length, padding raises a TypeError when padstr can't be converted to a string

Modified: MacRuby/branches/experimental/spec/frozen/tags/macruby/core/string/ljust_tags.txt
===================================================================
--- MacRuby/branches/experimental/spec/frozen/tags/macruby/core/string/ljust_tags.txt	2009-06-05 15:47:47 UTC (rev 1748)
+++ MacRuby/branches/experimental/spec/frozen/tags/macruby/core/string/ljust_tags.txt	2009-06-05 20:02:14 UTC (rev 1749)
@@ -1,4 +1,3 @@
-critical:String#ljust with length, padding raises an ArgumentError when padstr is empty
 fails:String#ljust with length, padding returns a new string of specified length with self left justified and padded with padstr
 fails:String#ljust with length, padding tries to convert padstr to a string using to_str
 fails:String#ljust with length, padding raises a TypeError when padstr can't be converted

Modified: MacRuby/branches/experimental/spec/frozen/tags/macruby/core/string/rjust_tags.txt
===================================================================
--- MacRuby/branches/experimental/spec/frozen/tags/macruby/core/string/rjust_tags.txt	2009-06-05 15:47:47 UTC (rev 1748)
+++ MacRuby/branches/experimental/spec/frozen/tags/macruby/core/string/rjust_tags.txt	2009-06-05 20:02:14 UTC (rev 1749)
@@ -1,4 +1,3 @@
-critical:String#rjust with length, padding raises an ArgumentError when padstr is empty
 fails:String#rjust with length, padding returns a new string of specified length with self right justified and padded with padstr
 fails:String#rjust with length, padding tries to convert padstr to a string using to_str
 fails:String#rjust with length, padding raises a TypeError when padstr can't be converted

Modified: MacRuby/branches/experimental/string.c
===================================================================
--- MacRuby/branches/experimental/string.c	2009-06-05 15:47:47 UTC (rev 1748)
+++ MacRuby/branches/experimental/string.c	2009-06-05 20:02:14 UTC (rev 1749)
@@ -4586,6 +4586,10 @@
 	padwidth = CFStringGetLength((CFStringRef)pad);
     }
 
+    if (padwidth == 0) {
+	rb_raise(rb_eArgError, "zero width padding");
+    }
+
     if (jflag == 'c') {
 	rb_str_justify0(str, pad, ceil(width / 2.0), padwidth, n);
 	rb_str_justify0(str, pad, floor(width / 2.0), padwidth, 0);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090605/9d9f032e/attachment.html>