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

Timestamp:

09/01/06 15:33:17 (2 years ago)

Author:

audreyt

Message:

* Proper support for PCRE submatch counts.
* Disable explicit imports from RRegex.PCRE, in preparation

for a #ifdef PUGS_HAVE_PERL5 hook in RRegex.hs so that we
can switch into RRegex.Perl5 some day.

Files:

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

src/Pugs/Prim/Match.hs

@@ -10 +10 @@
 import Pugs.Config
 import Pugs.Prim.Code
-import qualified RRegex.PCRE as PCRE
 import qualified Data.Map as Map
 import qualified Data.Array as Array
@@ -67 +66 @@
 
 doMatch csChars MkRulePCRE{ rxRegex = re } = do
-    rv <- liftIO $ PCRE.execute re csBytes 0
+    rv <- liftIO $ matchRegexWithPCRE re csBytes 0
     if isNothing rv then return mkMatchFail else do
     let ((fromBytes, lenBytes):subs) = Array.elems (fromJust rv)