Changeset 3004

Timestamp:

05/12/05 03:50:34 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

4536

Message:

* deal with PCRE's like of negative indexes.

Files:

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

src/Pugs/Prim/Match.hs

@@ -47 +47 @@
     if isNothing rv then return mkMatchFail else do
     let ((fromBytes, lenBytes):subs) = Array.elems (fromJust rv)
-        substr str from len = genericTake len (genericDrop from str)
+        substr str from len = take len (drop from str)
         subsMatch = [
             VMatch $ mkMatchOk
@@ -54 +54 @@
                 [] Map.empty
             | (fBytes, lBytes) <- subs
-            , let fChars = chars $ genericTake fBytes csBytes
+            , let fChars = chars $ take fBytes csBytes
             , let lChars = chars $ substr csBytes fBytes lBytes
             ]
-        fromChars = chars $ genericTake fromBytes csBytes
+        fromChars = chars $ take fromBytes csBytes
         lenChars  = chars $ substr csBytes fromBytes lenBytes
         chars = genericLength . decodeUTF8