Changeset 6109 for src/RRegex/PCRE.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/RRegex/PCRE.hs (modified) (2 diffs)

src/RRegex/PCRE.hs

@@ -23 +23 @@
     pcreUtf8,       --  UTF-8 semantics
     
+    numSubs,
+
     getVersion
     ) where
@@ -59 +61 @@
             return $ Left (fi eo,es)
           else fmap (Right . Regex) (newForeignPtr_ v)
+
+numSubs :: Regex -> IO Int
+numSubs (Regex pcre_fptr) = withForeignPtr pcre_fptr $ \pcre_ptr -> do
+    nsub <- getNumSubs pcre_ptr 
+    return $ fromIntegral nsub
 
 getNumSubs :: Ptr PCRE -> IO CInt