Compiler: Add inputs by ID

Author: adazem009

src/engine/compiler.cpp

@@ -103,12 +103,13 @@ void Compiler::addInstruction(Opcode opcode, std::initializer_list<unsigned int>
         m_bytecode.push_back(arg);
 }
 
-/*! Compiles the given input and adds it to the bytecode. */
-void Compiler::addInput(Input *input)
+/*! Compiles the given input (resolved by ID) and adds it to the bytecode. */
+void Compiler::addInput(int id)
 {
-    switch (input->type()) {
+    auto in = input(id);
+    switch (in->type()) {
         case Input::Type::Shadow:
-            addInstruction(OP_CONST, { constIndex(input->primaryValue()) });
+            addInstruction(OP_CONST, { constIndex(in->primaryValue()) });
             break;
 
         case Input::Type::NoShadow:
@@ -150,6 +151,17 @@ unsigned int Compiler::variableIndex(std::shared_ptr<IEntity> varEntity)
     return m_variables.size() - 1;
 }
 
+/*! Returns the index of the given list. */
+unsigned int Compiler::listIndex(std::shared_ptr<IEntity> listEntity)
+{
+    auto list = dynamic_cast<List *>(listEntity.get());
+    auto it = std::find(m_lists.begin(), m_lists.end(), list);
+    if (it != m_lists.end())
+        return it - m_lists.begin();
+    m_lists.push_back(list);
+    return m_lists.size() - 1;
+}
+
 unsigned int Compiler::constIndex(InputValue *value)
 {
     auto it = std::find(m_constValues.begin(), m_constValues.end(), value);

src/engine/compiler.h

@@ -31,12 +31,13 @@ class LIBSCRATCHCPP_EXPORT Compiler
         void setLists(std::vector<List *> lists);
 
         void addInstruction(vm::Opcode opcode, std::initializer_list<unsigned int> args = {});
-        void addInput(Input *input);
+        void addInput(int id);
         void addFunctionCall(BlockFunc f);
 
         Input *input(int id) const;
         Field *field(int id) const;
         unsigned int variableIndex(std::shared_ptr<IEntity> varEntity);
+        unsigned int listIndex(std::shared_ptr<IEntity> listEntity);
 
     private:
         unsigned int constIndex(InputValue *value);