Merge pull request #137 from scratchcpp/compiler_test

Complete Compiler test

Author: adazem009

include/scratchcpp/compiler.h

@@ -51,11 +51,11 @@ class LIBSCRATCHCPP_EXPORT Compiler
 
         const std::vector<List *> &lists() const;
 
-        void addInstruction(vm::Opcode opcode, std::initializer_list<unsigned int> args = {});
+        void addInstruction(vm::Opcode opcode, const std::initializer_list<unsigned int> &args = {});
         void addInput(Input *input);
         void addInput(int id);
         void addFunctionCall(BlockFunc f);
-        void addProcedureArg(std::string procCode, std::string argName);
+        void addProcedureArg(const std::string &procCode, const std::string &argName);
         void moveToSubstack(std::shared_ptr<Block> substack1, std::shared_ptr<Block> substack2, SubstackType type);
         void moveToSubstack(std::shared_ptr<Block> substack, SubstackType type);
         void breakAtomicScript();
@@ -67,8 +67,8 @@ class LIBSCRATCHCPP_EXPORT Compiler
         unsigned int variableIndex(std::shared_ptr<Entity> varEntity);
         unsigned int listIndex(std::shared_ptr<Entity> listEntity);
         unsigned int constIndex(InputValue *value);
-        unsigned int procedureIndex(std::string proc);
-        long procedureArgIndex(std::string procCode, std::string argName);
+        unsigned int procedureIndex(const std::string &proc);
+        long procedureArgIndex(const std::string &procCode, const std::string &argName);
 
         const std::vector<std::string> &procedures() const;
 

src/engine/compiler.cpp

@@ -103,7 +103,7 @@ const std::vector<List *> &Compiler::lists() const
 }
 
 /*! Adds an instruction to the bytecode. */
-void Compiler::addInstruction(Opcode opcode, std::initializer_list<unsigned int> args)
+void Compiler::addInstruction(Opcode opcode, const std::initializer_list<unsigned int> &args)
 {
     impl->addInstruction(opcode, args);
 }
@@ -165,8 +165,15 @@ void Compiler::addFunctionCall(BlockFunc f)
 }
 
 /*! Adds an argument to a procedure (custom block). */
-void Compiler::addProcedureArg(std::string procCode, std::string argName)
+void Compiler::addProcedureArg(const std::string &procCode, const std::string &argName)
 {
+    if (impl->procedureArgs.find(procCode) != impl->procedureArgs.cend()) {
+        const auto &procedure = impl->procedureArgs[procCode];
+
+        if (std::find(procedure.begin(), procedure.end(), argName) != procedure.end())
+            return;
+    }
+
     impl->procedureArgs[procCode].push_back(argName);
 }
 
@@ -254,7 +261,7 @@ unsigned int Compiler::constIndex(InputValue *value)
 }
 
 /*! Returns the index of the procedure code of the given block. */
-unsigned int Compiler::procedureIndex(std::string proc)
+unsigned int Compiler::procedureIndex(const std::string &proc)
 {
     auto it = std::find(impl->procedures.begin(), impl->procedures.end(), proc);
     if (it != impl->procedures.end())
@@ -264,7 +271,7 @@ unsigned int Compiler::procedureIndex(std::string proc)
 }
 
 /*! Returns the index of the argument of the given procedure (custom block). */
-long Compiler::procedureArgIndex(std::string procCode, std::string argName)
+long Compiler::procedureArgIndex(const std::string &procCode, const std::string &argName)
 {
     if (impl->procedureArgs.count(procCode) == 0) {
         std::cout << "warning: could not find custom block '" << procCode << "'" << std::endl;

src/engine/compiler_p.cpp

@@ -42,7 +42,14 @@ void CompilerPrivate::substackEnd()
                 addInstruction(OP_ENDIF);
             break;
     }
-    block = parent.first.first->next();
+
+    auto parentBlock = parent.first.first;
+
+    if (parentBlock)
+        block = parentBlock->next();
+    else
+        block = nullptr;
+
     substackTree.pop_back();
     if (!block && !substackTree.empty())
         substackEnd();

test/compiler/CMakeLists.txt

@@ -1,6 +1,8 @@
 add_executable(
   compiler_test
   compiler_test.cpp
+  testblocksection.cpp
+  testblocksection.h
 )
 
 target_link_libraries(