Changeset 16526

Timestamp:

05/25/07 23:12:48 (18 months ago)

Author:

moritz

Message:

patch and test cases for zero or negative argument to 'x' and 'xx' operator
postet ond p6l by chas_owens++

Files:

• src/Pugs/Prim.hs (modified) (2 diffs)
• t/operators/repeat.t (modified) (4 diffs)

src/Pugs/Prim.hs

@@ -924 +924 @@
     | otherwise         = VStr str
 
+perlReplicate :: VInt -> a -> [a]
+perlReplicate i a = if i < 0 
+    then genericReplicate 0 a 
+    else genericReplicate i a
+
 -- |Implementation of 2-arity primitive operators and functions
 op2 :: String -> Val -> Val -> Eval Val
@@ -932 +937 @@
 op2 "/"  = op2Divide
 op2 "%"  = op2Modulus
-op2 "x"  = op2Cast (\x y -> VStr . concat $ (y :: VInt) `genericReplicate` x)
-op2 "xx" = op2Cast (\x y -> VList . concat $ (y :: VInt) `genericReplicate` x)
+op2 "x"  = op2Cast (\x y -> VStr . concat $ (y :: VInt) `perlReplicate` x)
+op2 "xx" = op2Cast (\x y -> VList . concat $ (y :: VInt) `perlReplicate` x)
 op2 "+&" = op2Int (.&.)
 op2 "+<" = op2Int shiftL

t/operators/repeat.t

@@ -9 +9 @@
 =cut
 
-plan 19;
+plan 23;
 
 #L<S03/Changes to Perl 5 operators/"x (which concatenates repetitions of a string to produce a single string">
@@ -17 +17 @@
 is(1 x 5, '11111', 'number repeat operator works on number and creates string');
 is('' x 6, '', 'repeating an empty string creates an empty string');
+is('a' x 0, '', 'repeating zero times produces an empty string');
+is('a' x -1, '', 'repeating negative times produces an empty string');
 
 #L<S03/Changes to Perl 5 operators/"and xx (which creates a list of repetitions of a list or item)">
@@ -24 +26 @@
 is(+@foo, 10, 'list repeat operator created array of the right size');
 
+
 lives_ok { my @foo2 = undef xx 2; }, 'can repeat undefs';
 my @foo3 = (1, 2) xx 2;
@@ -30 +33 @@
 is(@foo3[2], 1, 'can repeat lists');
 is(@foo3[3], 2, 'can repeat lists');
+
+my @foo4 = 'x' xx 0;
+is(+@foo4, 0, 'repeating zero times produces an empty list');
+
+my @foo5 = 'x' xx -1;
+is(+@foo5, 0, 'repeating negative times produces an empty list');
+
 my @foo_2d = [1, 2] xx 2; # should create 2d
 is(@foo_2d[1], [1, 2], 'can create 2d arrays', :todo<bug>); # creates a flat 1d array