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

Timestamp:

05/20/05 23:49:16 (4 years ago)

Author:

theorbtwo

svk:copy_cache_prev:

5107

Message:

More signatures. If I could fiture out a signature for mainCC in
src/Pugs/Compile/Haskell.hs that doesn't make the compiler croak, we could
turn off the option to not warn (and thus error, since we -Werror) on
missing signatures.

Files:

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

src/Pugs/Embed/Haskell.hs

@@ -6 +6 @@
 #if !defined(PUGS_HAVE_HSPLUGINS)
 
-evalHaskell :: String -> IO (Either String String)
-evalHaskell _ = return $ Left "need hs-plugins for eval_haskell"
+import Pugs.AST
+
+evalHaskell :: String -> Eval Val
+evalHaskell _ = fail "need hs-plugins for eval_haskell"
 
 #else
 
 import qualified Eval
+import Pugs.AST
 
-{- Return is either (left) an error message, or (right) the return of the
-eval) -}
-evalHaskell :: String -> IO (Either String String)
+evalHaskell :: String -> Eval Val
 evalHaskell code = do
     let imports = []
@@ -22 +23 @@
     ret <- Eval.eval_ code imports [] [] []
     case ret of
-        Right (Just x) -> return $ Right x
-        Right Nothing  -> return $ Left "Something strange happened"
-        Left x         -> return $ Left $ unlines x
+        Right (Just x) -> return x
+        Right Nothing  -> fail "Something strange happened"
+        Left x         -> fail $ unlines x
 
 #endif