Merge branch 'main' into 103-parse-expr

Jabolol · Jan 8, 2025 · 939c009 · 939c009
2 parents 7f433ec + 560a9bc
commit 939c009
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/lib/Ast/Parser/Expr.hs b/lib/Ast/Parser/Expr.hs
@@ -99,7 +99,7 @@ parseCall = do
 parseIf :: PU.Parser AT.Expr
 parseIf = do
   srcLoc <- PU.parseSrcLoc
-  cond <- PU.symbol "if" *> parseExpr
+  cond <- PU.symbol "if" *> PU.lexeme parseExpr
   then' <- parseBlock
   else' <- M.optional $ PU.symbol "else" *> parseBlock
   return $ AT.If {AT.ifLoc = srcLoc, AT.ifCond = cond, AT.ifThen = then', AT.ifElse = else'}

diff --git a/lib/Codegen/Codegen.hs b/lib/Codegen/Codegen.hs
@@ -310,17 +310,25 @@ generateIf (AT.If _ cond then_ else_) = mdo
 
   thenBlock <- IRM.block `IRM.named` U.stringToByteString "if.then"
   thenValue <- generateExpr then_
-  I.br mergeBB
+
+  case TD.typeOf thenValue of
+    T.VoidType -> I.br mergeBB
+    _ -> pure ()
 
   elseBlock <- IRM.block `IRM.named` U.stringToByteString "if.else"
   elseValue <- case else_ of
     Just e -> generateExpr e
     Nothing -> pure $ AST.ConstantOperand $ C.Undef T.void
-  I.br mergeBB
+
+  case TD.typeOf elseValue of
+    T.VoidType -> I.br mergeBB
+    _ -> pure ()
 
   mergeBB <- IRM.block `IRM.named` U.stringToByteString "if.merge"
 
-  I.phi [(thenValue, thenBlock), (elseValue, elseBlock)]
+  case TD.typeOf elseValue of
+    T.VoidType -> I.phi [(thenValue, elseBlock)]
+    _ -> I.phi [(thenValue, thenBlock), (elseValue, elseBlock)]
 generateIf expr =
   E.throwError $ CodegenError (U.getLoc expr) $ UnsupportedDefinition expr