Merge pull request #592 from scratchcpp/llvm_function_static_types

LLVM: Implement 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);

include/scratchcpp/value_functions.h

@@ -36,8 +36,14 @@ extern "C"
     LIBSCRATCHCPP_EXPORT double value_toDouble(const ValueData *v);
     LIBSCRATCHCPP_EXPORT bool value_toBool(const ValueData *v);
     LIBSCRATCHCPP_EXPORT void value_toString(const ValueData *v, std::string *dst);
+    LIBSCRATCHCPP_EXPORT char *value_toCString(const ValueData *v);
     LIBSCRATCHCPP_EXPORT void value_toUtf16(const ValueData *v, std::u16string *dst);
 
+    LIBSCRATCHCPP_EXPORT char *value_doubleToCString(double v);
+    LIBSCRATCHCPP_EXPORT const char *value_boolToCString(bool v);
+    LIBSCRATCHCPP_EXPORT double value_stringToDouble(const char *s);
+    LIBSCRATCHCPP_EXPORT bool value_stringToBool(const char *s);
+
     LIBSCRATCHCPP_EXPORT void value_add(const ValueData *v1, const ValueData *v2, ValueData *dst);
     LIBSCRATCHCPP_EXPORT void value_subtract(const ValueData *v1, const ValueData *v2, ValueData *dst);
     LIBSCRATCHCPP_EXPORT void value_multiply(const ValueData *v1, const ValueData *v2, ValueData *dst);

include/scratchcpp/valuedata.h

@@ -18,10 +18,9 @@ enum class LIBSCRATCHCPP_EXPORT SpecialValue
 
 enum class LIBSCRATCHCPP_EXPORT ValueType
 {
-    Integer = 0,
-    Double = 1,
-    Bool = 2,
-    String = 3,
+    Number = 0,
+    Bool = 1,
+    String = 2,
     Infinity = -1,
     NegativeInfinity = -2,
     NaN = -3
@@ -35,8 +34,7 @@ extern "C"
             // NOTE: Any changes must also be done in the LLVM code builder!
             union
             {
-                    long intValue;
-                    double doubleValue;
+                    double numberValue;
                     bool boolValue;
                     char *stringValue;
             };

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;