Changeset 2158 for src/Pugs/Embed/Haskell.hs

Timestamp:

04/20/05 17:53:21 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

3669

Message:

* eval_haskell errors are now catchable.

Files:

• src/Pugs/Embed/Haskell.hs (modified) (1 diff)

src/Pugs/Embed/Haskell.hs

@@ -6 +6 @@
 #if !defined(PUGS_HAVE_HSPLUGINS)
 
-evalHaskell :: String -> IO String
-evalHaskell _ = do error "need hs-plugins for eval_haskell"
+evalHaskell :: String -> IO (Either String String)
+evalHaskell _ = return $ Left "need hs-plugins for eval_haskell"
 
 #else
 
-import Eval
+import qualified Eval
 
-evalHaskell :: String -> IO String
+evalHaskell :: String -> IO (Either String String)
 evalHaskell code = do
     let imports = []
-    -- eval_ code [import] [flags] [package.confs] [load paths] -> IO (Either [error-strings] (Maybe a))
-    ret <- eval code imports
+    -- eval_ code [import] [flags] [package.confs] [load paths]
+    --   -> IO (Either [error-strings] (Maybe a))
+    ret <- Eval.eval code imports
     case ret of
-        Just x  -> return x
-        Nothing -> fail $ "Couldn't eval haskell code: " ++ code
+        Just x  -> return $ Right x
+        Nothing -> return $ Left "Couldn't eval haskell code"
 
 #endif