Changeset 3119 for src/Pugs/Prim/Match.hs

Timestamp:

05/12/05 21:45:17 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

4536

Message:

* split// now attaches the submatches themselves to the

resulting list.

Files:

• src/Pugs/Prim/Match.hs (modified) (1 diff)

src/Pugs/Prim/Match.hs

@@ -149 +149 @@
     return $ VBool $ x' `cmp` y'
 
-rxSplit :: VRule -> String -> Eval [String]
+rxSplit :: VRule -> String -> Eval [Val]
 rxSplit _  [] = return []
 rxSplit rx str = do
     match <- str `doMatch` rx
-    if not (matchOk match) then return [str] else do
+    if not (matchOk match) then return [VStr str] else do
     if matchFrom match == matchTo match
         then do
             let (c:cs) = str
             rest <- rxSplit rx (cs)
-            return ([c]:rest)
+            return (VStr [c]:rest)
         else do
             let before = genericTake (matchFrom match) str
                 after  = genericDrop (matchTo match) str
             rest <- rxSplit rx after
-            strs <- mapM fromVal (matchSubPos match)
-            return $ (before:concat strs) ++ rest
+            return $ (VStr before:matchSubPos match) ++ rest