fix failed tests

src/Util/Graph.hs

@@ -32,6 +32,7 @@ module Util.Graph
   , build
   , strictlyDominate
   , strictlyPostDominate
+  , traverseM_
   ) where
 
 import Control.Lens ((%=))

test/LexerSpec.hs

@@ -16,6 +16,7 @@ import Data.Either (isLeft)
 import Lexer
 import qualified Util.SourceLoc as SL
 import Test.Hspec
+import Types
 
 spec :: Spec
 spec = do
@@ -26,23 +27,26 @@ spec = do
     scanFunction
     scannerLoc
 
-getTokens :: [Either String (SL.Located Token)] -> [Token]
-getTokens = fmap $ \(Right (SL.LocatedAt _ t)) -> t
+getTokens :: Either [CompileError] [SL.Located Token] -> [Token]
+getTokens (Left _) = [] 
+getTokens (Right toks) = fmap SL.unLoc toks
+
+scanTokens :: ByteString -> [Token]
+scanTokens inp = getTokens $ scan inp
 
 compareTokenStream :: ByteString -> [Token] -> Bool
-compareTokenStream inp toks =
-  let res = scan inp
-   in getTokens res == toks
+compareTokenStream inp toks = scanTokens inp == toks
 
 shouldErrorOut :: ByteString -> Bool
 shouldErrorOut inp =
-  let res = scan inp
-   in length res == 1 && isLeft (head res)
+  case scan inp of
+    Right _ -> False
+    Left errs -> not $ null errs
 
 checkLoc :: ByteString -> Int -> SL.Range -> Bool
 checkLoc inp idxEle range =
-  let res = scan inp
-      (Right (SL.LocatedAt pos _)) = res !! idxEle
+  let (Right res) = scan inp
+      (SL.LocatedAt pos _) = res !! idxEle
    in pos == range
 
 scanSingleElement :: SpecWith ()

test/SemanticSpec.hs

@@ -39,7 +39,7 @@ typeCheckSpec = do
       in view #tpe expr
     pred program =
       let (Right p) = Parser.parse program
-          (Right (AST.ASTRoot imports vars methods, _, st)) = Semantic.runSemanticAnalysis p
+          (Right (AST.ASTRoot imports vars methods, st)) = Semantic.analyze p
           stmts = view #stmts $ view #block $ head methods
           AST.Statement (AST.AssignStmt (AST.Assignment _ _ (Just expr) _)) _ = head stmts
           tpe = view #tpe expr