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

Timestamp:

05/10/05 21:29:10 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

4498

Message:

* named rules and subrule support.

Files:

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

src/Pugs/Prim/Match.hs

@@ -20 +20 @@
     hasSrc <- liftIO $ doesDirectoryExist pwd2
     let pwd = if hasSrc then pwd2 else pwd1
-    pge <- liftIO $ evalPGE pwd (encodeUTF8 cs) (encodeUTF8 re)
+    glob    <- askGlobal
+    let syms = [ (name, tvar) | (('<':name), [(_, tvar)]) <- padToList glob ]
+    subrules <- forM syms $ \(name, tvar) -> do
+        ref  <- liftSTM $ readTVar tvar
+        (VRule rule) <- fromVal =<< readRef ref
+        return (name, rxRule rule)
+    pge <- liftIO $ evalPGE pwd (encodeUTF8 cs) (encodeUTF8 re) subrules
     rv  <- tryIO Nothing $ fmap Just (readIO $ decodeUTF8 pge) 
     let matchToVal PGE_Fail = VMatch mkMatchFail
@@ -32 +38 @@
     case rv of
         Just m  -> fromVal (matchToVal m)
-        Nothing -> fail ("Cannot parse PGE: " ++ pge)
+        Nothing -> do
+            liftIO $ putStrLn ("*** Cannot parse PGE: " ++ re ++ "\n*** Error: " ++ pge)
+            return mkMatchFail
 
 doMatch cs MkRulePCRE{ rxRegex = re } = do