Add if codegen

Author: shelojara

AST/StatementAST.hpp

@@ -187,6 +187,21 @@ class IfAST : public StatementAST
             condition(condition), thenBlock(thenBlock), elseBlock(elseBlock)
     {}
 
+    std::shared_ptr<ExpressionAST> getCondition()
+    {
+        return condition;
+    }
+
+    std::shared_ptr<BlockAST> getThenBlock()
+    {
+        return thenBlock;
+    }
+
+    std::shared_ptr<BlockAST> getElseBlock()
+    {
+        return elseBlock;
+    }
+
     virtual llvm::Value * accept(Demux * demux) override;
 };
 

CMakeLists.txt

@@ -29,6 +29,6 @@ set(SOURCES
         TypeSystem/Types.cpp
         AST/StructAST.cpp
         CodeGen/AssignmentGen.cpp
-        CodeGen/VarDeclGen.cpp CodeGen/ForGen.cpp CodeGen/ForGen.hpp CodeGen/BuiltInFuncGen.cpp CodeGen/BuiltInFuncGen.hpp)
+        CodeGen/VarDeclGen.cpp CodeGen/ForGen.cpp CodeGen/ForGen.hpp CodeGen/BuiltInFuncGen.cpp CodeGen/BuiltInFuncGen.hpp CodeGen/IfGen.cpp CodeGen/IfGen.hpp)
 
 add_executable(vflc Main.cpp ${SOURCES})

CodeGen/IfGen.cpp

@@ -0,0 +1,48 @@
+#include "IfGen.hpp"
+
+#include "../AST/FunctionAST.hpp"
+
+llvm::Value * IfGen::emit(VflModule & module, IfAST & node)
+{
+    auto condition = module.loadIfPtr(demux, node.getCondition());
+
+    auto function = module.getBuilder().GetInsertBlock()->getParent();
+
+    auto thenBlock = llvm::BasicBlock::Create(llvm::getGlobalContext(), "then", function);
+    auto elseBlock = llvm::BasicBlock::Create(llvm::getGlobalContext(), "else");
+    auto mergeBlock = llvm::BasicBlock::Create(llvm::getGlobalContext(), "ifcont");
+
+    if (node.getElseBlock()) {
+        module.getBuilder().CreateCondBr(condition, thenBlock, elseBlock);
+    } else {
+        module.getBuilder().CreateCondBr(condition, thenBlock, mergeBlock);
+    }
+
+    module.getBuilder().SetInsertPoint(thenBlock);
+
+    module.createScope();
+    node.getThenBlock()->accept(demux);
+    module.popScope();
+
+    thenBlock = module.getBuilder().GetInsertBlock();
+
+    if (thenBlock->getTerminator() == nullptr) {
+        module.getBuilder().CreateBr(mergeBlock);
+    }
+
+    if (node.getElseBlock()) {
+        function->getBasicBlockList().push_back(elseBlock);
+        module.getBuilder().SetInsertPoint(elseBlock);
+
+        module.createScope();
+        node.getElseBlock()->accept(demux);
+        module.popScope();
+
+        module.getBuilder().CreateBr(mergeBlock);
+    }
+
+    function->getBasicBlockList().push_back(mergeBlock);
+    module.getBuilder().SetInsertPoint(mergeBlock);
+
+    return nullptr;
+}

CodeGen/IfGen.hpp

@@ -0,0 +1,16 @@
+#ifndef VFL_IFGEN_HPP
+#define VFL_IFGEN_HPP
+
+
+#include "../Demux/DemuxComponent.hpp"
+#include "Generator.hpp"
+#include "../AST/StatementAST.hpp"
+
+class IfGen : public DemuxComponent, public Generator<IfAST>
+{
+public:
+    virtual llvm::Value * emit(VflModule & module, IfAST & node) override;
+};
+
+
+#endif //VFL_IFGEN_HPP

Demux/Demux.cpp

@@ -117,7 +117,7 @@ llvm::Value * Demux::visit(ReturnAST & node)
 
 llvm::Value * Demux::visit(IfAST & node)
 {
-    return nullptr; // ifGen.emit(module, node);
+    return ifGen.emit(module, node);
 }
 
 llvm::Value * Demux::visit(PrintAST & node)

Demux/Demux.hpp

@@ -20,6 +20,7 @@
 #include "../CodeGen/VarDeclGen.hpp"
 #include "../CodeGen/ForGen.hpp"
 #include "../CodeGen/BuiltInFuncGen.hpp"
+#include "../CodeGen/IfGen.hpp"
 
 class FunctionAST;
 class Program;
@@ -57,6 +58,8 @@ class Demux : private NonCopyable
 
     BuiltInFuncGen builtInFuncGen;
 
+    IfGen ifGen;
+
 public:
     Demux(VflModule & module) :
             module(module)
@@ -73,6 +76,7 @@ class Demux : private NonCopyable
         varDeclGen.setDemux(this);
         forGen.setDemux(this);
         builtInFuncGen.setDemux(this);
+        ifGen.setDemux(this);
     }
 
     void walkAST(Program & program);

examples/demo.vfl

@@ -1,5 +1,7 @@
 @Main ()
-    for i = 0, i < 4 {
-        print i
+    if true {
+
+    } else {
+
     }
 End

tools/vfsc

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+s="$1"
+s=${s##*/}
+s=${s%.*}
+
+/Users/mijara/Projects/vfs/build/vfsc $1 2> "$s.bc"
+/usr/local/opt/llvm/bin/llc -filetype=obj "$s.bc"
+clang "$s.o" -o "$s" 2> /dev/null
+rm -f "$s.bc" "$s.o"

tools/vfsr

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+s="$1"
+s=${s##*/}
+s=${s%.*}
+
+vfsc $1
+./$s
+rm -f $s