fix: bug with implicit returns in TVoid function and test compilation

Jabolol · Jan 12, 2025 · 48c1e8f · 48c1e8f
1 parent 5cce6fb
commit 48c1e8f
Show file tree

Hide file tree

Showing 7 changed files with 347 additions and 198 deletions.
diff --git a/glados.cabal b/glados.cabal
@@ -71,7 +71,6 @@ test-suite glados-test
     Ast.Parser.TypeDefinitionSpec
     Ast.Parser.TypeSpec
     Ast.Parser.ExprSpec
-    Ast.ParserSpec
     Codegen.CodegenSpec
 
   hs-source-dirs: test

diff --git a/lib/Ast/Parser/Expr.hs b/lib/Ast/Parser/Expr.hs
@@ -119,12 +119,15 @@ parseFunction = do
   name <- PU.identifier
   ft <- PU.symbol ":" *> PT.parseType
   case ft of
-    (AT.TFunction {AT.paramTypes = pts}) -> do
+    (AT.TFunction ret pts _) -> do
       params <- PU.symbol "=" *> M.many (PU.lexeme PU.identifier)
       mapM_ (\(p, t) -> S.modify (PS.insertVar p t)) $ zip params pts
       S.modify (PS.insertVar name ft)
       block <- parseBlock
-      let body = implicitReturn block
+      let body =
+            if ret /= AT.TVoid
+              then implicitReturn block
+              else block
       return $ AT.Function {AT.funcLoc = srcLoc, AT.funcName = name, AT.funcType = ft, AT.funcParams = params, AT.funcBody = body}
     _ -> M.customFailure $ AU.InvalidFunctionType name ft