sync runplugs from lambdabot

testsuite/plugs/runplugs/Main.hs

@@ -9,9 +9,11 @@
 --
 import System.Eval.Haskell             (unsafeEval)
 
+import Data.Char                (chr)
 import Data.Maybe               (isJust, fromJust)
-import Control.Monad            (when) 
+import Control.Monad
 
+import System.Random
 import System.Exit              (exitWith, ExitCode(ExitSuccess))
 import System.IO                (getContents, putStrLn)
 import System.Posix.Resource    (setResourceLimit,
@@ -19,13 +21,17 @@ import System.Posix.Resource    (setResourceLimit,
                                  ResourceLimits(ResourceLimits),
 			         ResourceLimit(ResourceLimit))
 
+import qualified Control.Exception (catch)
+
 rlimit = ResourceLimit 3
 
 context = prehier ++ datas ++ qualifieds ++ controls
 
 prehier = ["Char", "List", "Maybe", "Numeric", "Random" ]
 
-qualifieds = ["qualified Data.Map as M", "qualified Data.Set as S"]
+qualifieds = ["qualified Data.Map as M"
+             ,"qualified Data.Set as S"
+             ,"qualified Data.IntSet as I"]
 
 datas   = map ("Data." ++) [
                 "Bits", "Bool", "Char", "Dynamic", "Either", 
@@ -36,10 +42,16 @@ datas   = map ("Data." ++) [
 controls = map ("Control." ++) ["Monad", "Monad.Reader", "Monad.Fix", "Arrow"]
 
 main = do
-        setResourceLimit ResourceCPUTime (ResourceLimits rlimit rlimit)
-        s <- getContents
-        when (not . null $ s) $ do
-                s <- unsafeEval ("(take 2048 (show ("++s++")))") context
-                when (isJust s) (putStrLn (fromJust s))
-        exitWith ExitSuccess
+    setResourceLimit ResourceCPUTime (ResourceLimits rlimit rlimit)
+    s <- getLine
+    when (not . null $ s) $ do
+        x <- sequence (take 3 (repeat $ getStdRandom (randomR (97,122)) >>= return . chr))
+        s <- unsafeEval ("let { "++x++
+                         " = \n# 1 \"<irc>\"\n"++s++
+                         "\n} in take 2048 (show "++x++
+                         ")") context
+        when (isJust s) $ Control.Exception.catch 
+                    (putStrLn $ fromJust s)
+                    (\e -> putStrLn $ "Exception: " ++ show e )
+    exitWith ExitSuccess