Changeset 3538

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:

• inc/Module/Install/Pugs.pm (modified) (1 diff)
• src/Main.hs (modified) (1 diff)
• src/Pugs/Embed.hs (modified) (1 diff)
• src/Pugs/Embed/Haskell.hs (modified) (2 diffs)
• src/Pugs/Prim.hs (modified) (3 diffs)
• src/Pugs/Prim/Eval.hs (modified) (1 diff)
• src/Pugs/Prim/List.hs (modified) (1 diff)

inc/Module/Install/Pugs.pm

@@ -165 +165 @@
     my $ghc_flags = "-H0 -L. -Lsrc -Lsrc/syck -Lsrc/pcre -I. -Isrc -Isrc/pcre -Isrc/syck";
     $ghc_flags .= " -i. -isrc -isrc/pcre -isrc/syck -static ";
-    $ghc_flags .= " -Wall -Werror "
+    $ghc_flags .= " -Wall "
       unless $self->is_extension_build;
-    $ghc_flags .= " -fno-warn-missing-signatures -fno-warn-name-shadowing ";
+    $ghc_flags .= " -fno-warn-name-shadowing ";
     $ghc_flags .= " -I../../src -i../../src "
       if $self->is_extension_build;

src/Main.hs

@@ -89 +89 @@
         else run ["-"]
 
+readStdin :: IO String
 readStdin = do
     eof     <- isEOF

src/Pugs/Embed.hs

@@ -25 +25 @@
 evalEmbedded "Parrot"  code = do
     evalParrot code
-evalEmbedded "Haskell" code = do
+{- evalEmbedded "Haskell" code = do
     evalHaskell code
-    return ()
+    return () -}
 evalEmbedded "Perl5" code = do
     interp <- initPerl5 ""

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

src/Pugs/Prim.hs

@@ -472 +472 @@
 op1 other   = \_ -> fail ("Unimplemented unaryOp: " ++ other)
 
+op1Return :: Eval Val -> Eval Val
 op1Return action = do
     depth <- asks envDepth
@@ -480 +481 @@
         _       -> fail $ "cannot return() from a " ++ pretty (subType sub)
 
+op1Yield :: Eval Val -> Eval Val
 op1Yield action = do
     depth <- asks envDepth
@@ -490 +492 @@
             action
 
+op1ShiftOut :: Val -> Eval Val
 op1ShiftOut v = shiftT . const $ do
     evl <- asks envEval

src/Pugs/Prim/Eval.hs

@@ -32 +32 @@
 op1EvalHaskell cv = do
     str     <- fromVal cv :: Eval String
-    ret     <- liftIO (evalHaskell str)
-    glob    <- askGlobal
-    errSV   <- findSymRef "$!" glob
-    case ret of
-        Right str -> do
-            writeRef errSV VUndef
-            return $ VStr str
-        Left  err -> do
-            writeRef errSV (VStr err)
-            retEmpty
+    evalHaskell str
 
 opEval :: Maybe Bool -> String -> String -> Eval Val

src/Pugs/Prim/List.hs

@@ -102 +102 @@
         return $ if min_or_max (cmp > (0::VInt)) then a else b
 
+op1Uniq :: Val -> Eval Val
 op1Uniq v = do
     -- We want to have a real Haskell list