Changeset 4865

Timestamp:

06/20/05 06:39:30 (4 years ago)

Author:

mugwump

svk:copy_cache_prev:

6641

Message:

Implement 3-arg split (rx-only for now), update test

Files:

• src/Pugs/Prim.hs (modified) (3 diffs)
• src/Pugs/Prim/Match.hs (modified) (2 diffs)
• t/builtins/strings/split.t (modified) (3 diffs)

src/Pugs/Prim.hs

@@ -964 +964 @@
 op3 "splice" = \x y z -> do
     op4 "splice" x y z (VList [])
+op3 "split" = op3Split
 op3 "Any::new" = \t n _ -> do
     typ     <- fromVal t
@@ -982 +983 @@
     return obj
 op3 other = \_ _ _ -> fail ("Unimplemented 3-ary op: " ++ other)
+
+op3Split :: Val -> Val -> Val -> Eval Val
+op3Split x y z = do
+    val <- fromVal x
+    str <- fromVal y
+    limit <- fromVal z
+    case val of
+        VRule rx -> do
+            chunks <- rxSplit_n rx str limit
+            return $ VList chunks
+        _ -> do
+            delim <- fromVal val
+            return $ split' delim str
+    where
+    split' :: VStr -> VStr -> Val
+    split' [] xs = VList $ map (VStr . (:[])) xs
+    split' glue xs = VList $ map VStr $ split glue xs
 
 -- |Implementation of 4-arity primitive operators and functions.
@@ -1435 +1453 @@
 \\n   List      pre     split   safe   (Str, Str)\
 \\n   List      pre     split   safe   (Rule, Str)\
+\\n   List      pre     split   safe   (Rule, Str, Int)\
 \\n   Str       spre    =       safe   (Any)\
 \\n   List      spre    =       safe   (Any)\

src/Pugs/Prim/Match.hs

@@ -3 +3 @@
 
 module Pugs.Prim.Match (
-    op2Match, rxSplit, matchFromMR
+    op2Match, rxSplit, rxSplit_n, matchFromMR
 ) where
 import Pugs.Internals
@@ -175 +175 @@
             rest <- rxSplit rx after
             return $ (VStr before:matchSubPos match) ++ rest
+
+-- duplicated for now, pending über-Haskell-fu
+
+rxSplit_n :: VRule -> String -> Int -> Eval [Val]
+rxSplit_n _ [] n = return []
+rxSplit_n rx str n = do
+    match <- str `doMatch` rx
+    if or [ ( n == 1 ), ( not (matchOk match) ) ] then return [VStr str] else do
+    if matchFrom match == matchTo match
+        then do
+            let (c:cs) = str
+            rest <- rxSplit_n rx (cs) (n-1)
+            return (VStr [c]:rest)
+        else do
+            let before = genericTake (matchFrom match) str
+                after  = genericDrop (matchTo match) str
+            rest <- rxSplit_n rx after (n-1)
+            return $ (VStr before:matchSubPos match) ++ rest

t/builtins/strings/split.t

@@ -5 +5 @@
 
 # XXX - this needs to be updated when Str.split(Str) works again
-plan 54;
+plan 64;
 
 # split on an empty string
@@ -80 +80 @@
 try {
 split_test split(rx:perl5{\s+}, "Hello World    Goodbye   Mars", 3),
-           [ qw/Hello World/, "Goodbye   Mars" ],
+           ( qw/Hello World/, "Goodbye   Mars" ),
            q(split rx:perl5{\s+}, Str, limit);
 };
@@ -89 +89 @@
 try {
 split_test split(" ", "Hello World    Goodbye   Mars", 3),
-           [ qw/Hello World/, "   Goodbye   Mars" ],
+           ( qw/Hello World/, "   Goodbye   Mars" ),
            q(split " ", Str, limit);
 };