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

Timestamp:

09/30/06 11:25:30 (2 years ago)

Author:

audreyt

Message:

* In m:g/(1)|(2)/, only return the successfully matched subcaptures,

not the unsuccessful ones. This is such that "1212" matched against
the regex will evaluate to ('1', '2', '1', '2'), instead of
('1', , , '2', '1', , , '2').

Files:

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

src/Pugs/Prim/Match.hs

@@ -201 +201 @@
         if not (matchOk match) then return [] else do
         let ret x = return $ if hasSubpatterns
-                        then (matchSubPos match) ++ x
+                        then [ m | m@(VMatch MkMatch{ matchOk = True }) <- matchSubPos match ] ++ x
                         else (VMatch match):x
         case (matchTo match, matchFrom match) of