Move .substr guts from Cool to Str, make .substr properly fail on neg…

…ative start or length arguments.
rakudo · Jul 5, 2011 · 86ff74d · 86ff74d
1 parent 87e9756
commit 86ff74d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/src/core/Cool.pm b/src/core/Cool.pm
@@ -13,26 +13,8 @@ my class Cool {
         )
     }
 
-    method substr($start as Int, $length?) {
-        # TODO: Update this to match the spec.
-        my Str $str := self.Str;
-        my Int $len := ($length // $str.chars).Int;
-        if ($len < 0) {
-            if ($start >= 0) {
-                $len := $len + $str.chars;
-            }
-            $len := $len - $start;
-        }
-
-        # XXX no prefix:<-> yet...
-        #if ($start > self.chars || $start < -self.chars) {
-        #    return Mu;
-        #}
-
-        nqp::p6box_s(nqp::substr(
-            nqp::unbox_s($str),
-            nqp::unbox_i($start),
-            nqp::unbox_i($len)));
+    method substr($start as Int, $length?) { 
+        self.Stringy.substr($start, $length);
     }
 
     method uc() {

diff --git a/src/core/Str.pm b/src/core/Str.pm
@@ -32,6 +32,18 @@ my class Str {
         );
     }
 
+    method substr($start as Int, $length? is copy) {
+        fail "Negative start argument ($start) to .substr" if $start < 0;
+        fail "Start of substr ($start) beyond end of string" if $start > self.chars;
+        $length = self.chars - $start if !$length.defined; 
+        fail "Negative length argument ($length) to .substr" if $length < 0;
+
+
+        nqp::p6box_s(nqp::substr(
+            nqp::unbox_s(self),
+            nqp::unbox_i($start),
+            nqp::unbox_i($length)));
+    } 
 
     # chars used to handle ranges for pred/succ
     my $RANGECHAR =