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

Timestamp:

04/20/05 18:08:24 (4 years ago)

Author:

theorbtwo

svk:copy_cache_prev:

3669

Message:

Return useful error message.

Files:

• src/Pugs/Embed/Haskell.hs (modified) (2 diffs)

src/Pugs/Embed/Haskell.hs

@@ -13 +13 @@
 import qualified Eval
 
+{- Return is either (left) an error message, or (right) the return of the
+eval) -}
 evalHaskell :: String -> IO (Either String String)
 evalHaskell code = do
@@ -18 +20 @@
     -- eval_ code [import] [flags] [package.confs] [load paths]
     --   -> IO (Either [error-strings] (Maybe a))
-    ret <- Eval.eval code imports
+    ret <- Eval.eval_ code imports [] [] []
     case ret of
-        Just x  -> return $ Right x
-        Nothing -> return $ Left "Couldn't eval haskell code"
+        Right (Just x) -> return $ Right x
+        Right Nothing  -> return $ Left "Something strange happened"
+        Left x         -> return $ Left $ unlines x
 
 #endif