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

Timestamp:

08/07/05 20:12:10 (3 years ago)

Author:

putter

Message:

PCRE :global rules, without a subpattern, now return the correct match array. my @a = 'aaa' rx:perl5:g/a/; +@a #=> 3, not 0. PGE rules are not fixed, awaiting a way to determine if they contain a subpattern. Match .from and .to still incorrect. The patch is a bit messy. This would all be better handled by p6-side analysis and implementation of :global.

Files:

• src/Pugs/Prim/Match.hs (modified) (2 diffs)

src/Pugs/Prim/Match.hs

@@ -144 +144 @@
             else return (VList rv)
     where
+    hasSubpatterns = case rx of
+        MkRulePGE{}             -> True -- bogus
+        MkRulePCRE{rxNumSubs=n} -> not (n == 0)
     matchOnce :: String -> Eval [Val]
     matchOnce str = do
@@ -149 +152 @@
         if not (matchOk match) then return [] else do
         rest <- matchOnce (genericDrop (matchTo match) str)
-        return $ matchSubPos match ++ rest
+        return $ if hasSubpatterns
+                 then (matchSubPos match) ++ rest
+                 else (VMatch match):rest
 
 op2Match x (VRule rx) = do