Implement block function static types

Author: adazem009

include/scratchcpp/dev/compiler.h

@@ -3,6 +3,7 @@
 #pragma once
 
 #include <unordered_set>
+#include <vector>
 
 #include "../global.h"
 #include "../spimpl.h"
@@ -23,6 +24,14 @@ class CompilerPrivate;
 class LIBSCRATCHCPP_EXPORT Compiler
 {
     public:
+        enum class StaticType
+        {
+            Void,
+            Number,
+            Bool,
+            String
+        };
+
         Compiler(IEngine *engine, Target *target);
         Compiler(const Compiler &) = delete;
 
@@ -32,7 +41,7 @@ class LIBSCRATCHCPP_EXPORT Compiler
 
         std::shared_ptr<ExecutableCode> compile(std::shared_ptr<Block> startBlock);
 
-        void addFunctionCall(const std::string &functionName, int argCount, bool returns);
+        void addFunctionCall(const std::string &functionName, StaticType returnType = StaticType::Void, const std::vector<StaticType> &argTypes = {});
         void addConstValue(const Value &value);
         void addVariableValue(Variable *variable);
         void addListContents(List *list);

src/dev/engine/compiler.cpp

@@ -73,9 +73,9 @@ std::shared_ptr<ExecutableCode> Compiler::compile(std::shared_ptr<Block> startBl
  * Adds a call to the given function.\n
  * For example: extern "C" some_block(ValueData *ret, ValueData *arg1, ValueData *arg2) has 2 arguments
  */
-void Compiler::addFunctionCall(const std::string &functionName, int argCount, bool returns)
+void Compiler::addFunctionCall(const std::string &functionName, StaticType returnType, const std::vector<StaticType> &argTypes)
 {
-    impl->builder->addFunctionCall(functionName, argCount, returns);
+    impl->builder->addFunctionCall(functionName, returnType, argTypes);
 }
 
 /*! Adds a constant value to the compiled code. */

src/dev/engine/internal/icodebuilder.h

@@ -2,8 +2,7 @@
 
 #pragma once
 
-#include <string>
-#include <memory>
+#include <scratchcpp/dev/compiler.h>
 
 namespace libscratchcpp
 {
@@ -20,7 +19,7 @@ class ICodeBuilder
 
         virtual std::shared_ptr<ExecutableCode> finalize() = 0;
 
-        virtual void addFunctionCall(const std::string &functionName, int argCount, bool returns) = 0;
+        virtual void addFunctionCall(const std::string &functionName, Compiler::StaticType returnType, const std::vector<Compiler::StaticType> &argTypes) = 0;
         virtual void addConstValue(const Value &value) = 0;
         virtual void addVariableValue(Variable *variable) = 0;
         virtual void addListContents(List *list) = 0;