Remove old compiler and VM code

Author: adazem009

CMakeLists.txt

@@ -37,7 +37,6 @@ target_sources(scratchcpp
     include/scratchcpp/field.h
     include/scratchcpp/script.h
     include/scratchcpp/broadcast.h
-    include/scratchcpp/virtualmachine.h
     include/scratchcpp/blockprototype.h
     include/scratchcpp/block.h
     include/scratchcpp/istagehandler.h

include/scratchcpp/block.h

@@ -10,9 +10,7 @@ namespace libscratchcpp
 
 class IEngine;
 class Target;
-#ifdef USE_LLVM
 class CompilerValue;
-#endif
 class Input;
 class Field;
 class Comment;
@@ -28,11 +26,7 @@ class LIBSCRATCHCPP_EXPORT Block : public Entity
         Block(const std::string &id, const std::string &opcode);
         Block(const Block &) = delete;
 
-#ifdef USE_LLVM
         CompilerValue *compile(Compiler *compiler);
-#else
-        void compile(Compiler *compiler);
-#endif
 
         const std::string &opcode() const;
 

include/scratchcpp/compiler.h

@@ -23,36 +23,17 @@
 namespace libscratchcpp
 {
 
-class VirtualMachine;
 class Compiler;
-#ifdef USE_LLVM
 class CompilerValue;
-#endif
 class Block;
 class Value;
 
-/*!
- * \typedef BlockFunc
- *
- * BlockFunc is a function pointer for block implementation functions.
- */
-using BlockFunc = unsigned int (*)(VirtualMachine *vm);
-
-#ifdef USE_LLVM
 /*!
  * \typedef BlockComp
  *
  * BlockComp is a function pointer for functions which are used to compile blocks.
  */
 using BlockComp = CompilerValue *(*)(Compiler *);
-#else
-/*!
- * \typedef BlockComp
- *
- * BlockComp is a function pointer for functions which are used to compile blocks to bytecode.
- */
-using BlockComp = void (*)(Compiler *);
-#endif // USE_LLVM
 
 /*!
  * \typedef MonitorNameFunc
@@ -68,21 +49,12 @@ using MonitorNameFunc = const std::string &(*)(Block *);
  */
 using MonitorChangeFunc = void (*)(Block *, const Value &newValue);
 
-#ifdef USE_LLVM
 /*!
  * \typedef HatPredicateCompileFunc
  *
  * HatPredicateCompileFunc is a function pointer for functions which are used to compile edge-activated hat predicates.
  */
 using HatPredicateCompileFunc = CompilerValue *(*)(Compiler *vm);
-#else
-/*!
- * \typedef HatPredicateCompileFunc
- *
- * HatPredicateCompileFunc is a function pointer for functions which are used to compile edge-activated hat predicates to bytecode.
- */
-using HatPredicateCompileFunc = void (*)(Compiler *vm);
-#endif // USE_LLVM
 
 } // namespace libscratchcpp
 

include/scratchcpp/global.h

@@ -6,7 +6,6 @@
 #include <vector>
 #include <unordered_map>
 #include <unordered_set>
-#include <functional>
 
 #include "global.h"
 #include "signal.h"
@@ -219,12 +218,6 @@ class LIBSCRATCHCPP_EXPORT IEngine
         /*! Returns the timer of the project. */
         virtual ITimer *timer() const = 0;
 
-        /*! Returns the index of the given block function. */
-        virtual unsigned int functionIndex(BlockFunc f) = 0;
-
-        /*! Returns the list of block functions. */
-        virtual const std::vector<BlockFunc> &blockFunctions() const = 0;
-
         /*!
          * Call this from IExtension#registerBlocks() to add a compile function to a block section.
          * \see <a href="extensions.html">Extensions</a>

include/scratchcpp/iengine.h

@@ -17,7 +17,8 @@ class LIBSCRATCHCPP_EXPORT IMonitorHandler
 
         virtual void init(Monitor *monitor) = 0;
 
-        virtual void onValueChanged(const VirtualMachine *vm) = 0;
+        // TODO: Add onValueChanged()
+        // virtual void onValueChanged(const VirtualMachine *vm) = 0;
         virtual void onXChanged(int x) = 0;
         virtual void onYChanged(int y) = 0;
         virtual void onVisibleChanged(bool visible) = 0;

include/scratchcpp/imonitorhandler.h

@@ -10,9 +10,7 @@
 namespace libscratchcpp
 {
 
-#ifdef USE_LLVM
 class CompilerValue;
-#endif
 class Block;
 class Entity;
 class InputValuePrivate;
@@ -37,11 +35,7 @@ class LIBSCRATCHCPP_EXPORT InputValue
 
         InputValue(Type type = Type::Number);
 
-#ifdef USE_LLVM
         CompilerValue *compile(Compiler *compiler);
-#else
-        void compile(Compiler *compiler);
-#endif
 
         Type type() const;
         void setType(Type newType);

include/scratchcpp/inputvalue.h

@@ -56,7 +56,8 @@ class LIBSCRATCHCPP_EXPORT Monitor : public Entity
 
         const std::string &opcode() const;
 
-        void updateValue(const VirtualMachine *vm);
+        // TODO: Add updateValue()
+        // void updateValue(const VirtualMachine *vm);
 
         void setValueChangeFunction(MonitorChangeFunc f);
         void changeValue(const Value &newValue);

include/scratchcpp/monitor.h

@@ -14,13 +14,8 @@ namespace libscratchcpp
 class Target;
 class Block;
 class IEngine;
-#ifdef USE_LLVM
 class ExecutableCode;
-#endif
-class Value;
 class Thread;
-class Variable;
-class List;
 class ScriptPrivate;
 
 /*! \brief The Script class represents a compiled Scratch script. */
@@ -33,29 +28,15 @@ class LIBSCRATCHCPP_EXPORT Script
         Target *target() const;
         std::shared_ptr<Block> topBlock() const;
 
-        unsigned int *bytecode() const;
-        const std::vector<unsigned int> &bytecodeVector() const;
-        void setBytecode(const std::vector<unsigned int> &code);
-
-#ifdef USE_LLVM
         ExecutableCode *code() const;
         void setCode(std::shared_ptr<ExecutableCode> code);
-#endif
 
-        void setHatPredicateBytecode(const std::vector<unsigned int> &code);
         bool runHatPredicate(Target *target);
 
-        void setProcedures(const std::vector<unsigned int *> &procedures);
-        void setConstValues(const std::vector<Value> &values);
-        void setVariables(const std::vector<Variable *> &variables);
-        void setLists(const std::vector<List *> &lists);
-
         std::shared_ptr<Thread> start();
         std::shared_ptr<Thread> start(Target *target);
 
     private:
-        BlockFunc *getFunctions() const;
-
         spimpl::unique_impl_ptr<ScriptPrivate> impl;
 };
 

include/scratchcpp/script.h

@@ -8,11 +8,8 @@
 namespace libscratchcpp
 {
 
-class VirtualMachine;
 class Target;
-#ifdef USE_LLVM
 class Promise;
-#endif
 class IEngine;
 class Script;
 class ThreadPrivate;
@@ -24,7 +21,6 @@ class LIBSCRATCHCPP_EXPORT Thread
         Thread(Target *target, IEngine *engine, Script *script);
         Thread(const Thread &) = delete;
 
-        VirtualMachine *vm() const;
         Target *target() const;
         IEngine *engine() const;
         Script *script() const;
@@ -35,13 +31,8 @@ class LIBSCRATCHCPP_EXPORT Thread
 
         bool isFinished() const;
 
-#ifdef USE_LLVM
         std::shared_ptr<Promise> promise() const;
         void setPromise(std::shared_ptr<Promise> promise);
-#else
-        void promise();
-        void resolvePromise();
-#endif
 
     private:
         spimpl::unique_impl_ptr<ThreadPrivate> impl;