Merge pull request #596 from scratchcpp/llvm_operators

LLVM: Implement operators

Author: adazem009

include/scratchcpp/dev/compiler.h

@@ -29,7 +29,8 @@ class LIBSCRATCHCPP_EXPORT Compiler
             Void,
             Number,
             Bool,
-            String
+            String,
+            Unknown
         };
 
         Compiler(IEngine *engine, Target *target);
@@ -47,6 +48,15 @@ class LIBSCRATCHCPP_EXPORT Compiler
         void addListContents(List *list);
         void addInput(const std::string &name);
 
+        void createAdd();
+        void createSub();
+        void createMul();
+        void createDiv();
+
+        void createCmpEQ();
+        void createCmpGT();
+        void createCmpLT();
+
         void moveToIf(std::shared_ptr<Block> substack);
         void moveToIfElse(std::shared_ptr<Block> substack1, std::shared_ptr<Block> substack2);
         void moveToRepeatLoop(std::shared_ptr<Block> substack);

src/dev/engine/compiler.cpp

@@ -102,6 +102,48 @@ void Compiler::addInput(const std::string &name)
     addInput(impl->block->inputAt(impl->block->findInput(name)).get());
 }
 
+/*! Creates an add instruction from the last 2 values. */
+void Compiler::createAdd()
+{
+    impl->builder->createAdd();
+}
+
+/*! Creates a subtract instruction from the last 2 values. */
+void Compiler::createSub()
+{
+    impl->builder->createSub();
+}
+
+/*! Creates a multiply instruction from the last 2 values. */
+void Compiler::createMul()
+{
+    impl->builder->createMul();
+}
+
+/*! Creates a divide instruction from the last 2 values. */
+void Compiler::createDiv()
+{
+    impl->builder->createDiv();
+}
+
+/*! Creates an equality comparison instruction using the last 2 values. */
+void Compiler::createCmpEQ()
+{
+    impl->builder->createCmpEQ();
+}
+
+/*! Creates a greater than comparison instruction using the last 2 values. */
+void Compiler::createCmpGT()
+{
+    impl->builder->createCmpGT();
+}
+
+/*! Creates a lower than comparison instruction using the last 2 values. */
+void Compiler::createCmpLT()
+{
+    impl->builder->createCmpLT();
+}
+
 /*! Jumps to the given if substack. */
 void Compiler::moveToIf(std::shared_ptr<Block> substack)
 {

src/dev/engine/internal/icodebuilder.h

@@ -24,6 +24,19 @@ class ICodeBuilder
         virtual void addVariableValue(Variable *variable) = 0;
         virtual void addListContents(List *list) = 0;
 
+        virtual void createAdd() = 0;
+        virtual void createSub() = 0;
+        virtual void createMul() = 0;
+        virtual void createDiv() = 0;
+
+        virtual void createCmpEQ() = 0;
+        virtual void createCmpGT() = 0;
+        virtual void createCmpLT() = 0;
+
+        virtual void createAnd() = 0;
+        virtual void createOr() = 0;
+        virtual void createNot() = 0;
+
         virtual void beginIfStatement() = 0;
         virtual void beginElseBranch() = 0;
         virtual void endIf() = 0;