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

Timestamp:

08/28/06 09:29:28 (2 years ago)

Author:

audreyt

Message:

* <<$x $y>> would return a list even if explictly annotated as under scalar context...

Files:

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

src/Pugs/Prim/Match.hs

@@ -180 +180 @@
     rv      <- matchOnce str
     cxt     <- asks envContext
-    if (not $ isSlurpyCxt cxt)
-        then return (VInt $ genericLength rv)
-        else if rxStringify rx
-            then do
-                strs <- mapM fromVal rv
-                return (VList $ map VStr strs)
-            else return (VList rv)
+    case rxStringify rx of
+        True -> do
+            strs <- mapM fromVal rv
+            return (VList $ map VStr strs)
+        _ | isSlurpyCxt cxt -> do
+            return (VList rv)
+        _ -> do
+            return (VInt $ genericLength rv)
     where
     hasSubpatterns = case rx of