fix #545: Add variables and lists to edge-activated hats

Author: adazem009

src/engine/script.cpp

@@ -58,6 +58,8 @@ void Script::setHatPredicateBytecode(const std::vector<unsigned int> &code)
         impl->hatPredicateVm = std::make_shared<VirtualMachine>(impl->engine->stage(), impl->engine, this);
         impl->hatPredicateVm->setBytecode(impl->hatPredicateBytecodeVector.data());
         impl->hatPredicateVm->setConstValues(impl->constValues);
+        impl->hatPredicateVm->setVariables(impl->variableValues.data());
+        impl->hatPredicateVm->setLists(impl->lists.data());
     }
 }
 
@@ -174,12 +176,18 @@ void Script::setVariables(const std::vector<Variable *> &variables)
 
     for (const auto &var : variables)
         impl->variableValues.push_back(var->valuePtr());
+
+    if (impl->hatPredicateVm)
+        impl->hatPredicateVm->setVariables(impl->variableValues.data());
 }
 
 /*! Sets the list of lists. */
 void Script::setLists(const std::vector<List *> &lists)
 {
     impl->lists = lists;
+
+    if (impl->hatPredicateVm)
+        impl->hatPredicateVm->setLists(impl->lists.data());
 }
 
 BlockFunc *Script::getFunctions() const

test/script/script_test.cpp

@@ -45,6 +45,8 @@ TEST_F(ScriptTest, Bytecode)
 static Target *stageTest = nullptr;
 static IEngine *engineTest = nullptr;
 static Script *scriptTest = nullptr;
+static Value **variablesTest = nullptr;
+static List **listsTest = nullptr;
 
 TEST_F(ScriptTest, HatPredicate)
 {
@@ -60,6 +62,8 @@ TEST_F(ScriptTest, HatPredicate)
         stageTest = vm->target();
         engineTest = vm->engine();
         scriptTest = vm->script();
+        variablesTest = vm->variables();
+        listsTest = vm->lists();
         return 0;
     };
 
@@ -71,16 +75,28 @@ TEST_F(ScriptTest, HatPredicate)
         stageTest = vm->target();
         engineTest = vm->engine();
         scriptTest = vm->script();
+        variablesTest = vm->variables();
+        listsTest = vm->lists();
         return 0;
     };
 
     std::vector<BlockFunc> functions1 = { f1 };
     std::vector<BlockFunc> functions2 = { f1, f2, f3 };
 
+    Variable var1("", "var1", "a");
+    Variable var2("", "var2", 4);
+    script.setVariables({ &var1, &var2 });
+
+    List list1("", "list1");
+    List list2("", "list2");
+    script.setLists({ &list1, &list2 });
+
     EXPECT_CALL(m_engine, blockFunctions()).WillOnce(ReturnRef(functions1));
     stageTest = nullptr;
     engineTest = nullptr;
     scriptTest = nullptr;
+    variablesTest = nullptr;
+    listsTest = nullptr;
     script.setConstValues({ "test" });
     script.setHatPredicateBytecode({ vm::OP_START, vm::OP_CONST, 0, vm::OP_PRINT, vm::OP_EXEC, 0, vm::OP_HALT });
     testing::internal::CaptureStdout();
@@ -89,11 +105,19 @@ TEST_F(ScriptTest, HatPredicate)
     ASSERT_EQ(stageTest, &stage);
     ASSERT_EQ(engineTest, &m_engine);
     ASSERT_EQ(scriptTest, &script);
+    ASSERT_TRUE(variablesTest);
+    ASSERT_EQ(variablesTest[0], var1.valuePtr());
+    ASSERT_EQ(variablesTest[1], var2.valuePtr());
+    ASSERT_TRUE(listsTest);
+    ASSERT_EQ(listsTest[0], &list1);
+    ASSERT_EQ(listsTest[1], &list2);
 
     EXPECT_CALL(m_engine, blockFunctions()).WillOnce(ReturnRef(functions2));
     stageTest = nullptr;
     engineTest = nullptr;
     scriptTest = nullptr;
+    variablesTest = nullptr;
+    listsTest = nullptr;
     script.setHatPredicateBytecode({ vm::OP_START, vm::OP_CONST, 0, vm::OP_PRINT, vm::OP_EXEC, 1, vm::OP_HALT });
     script.setConstValues({ 5 });
     testing::internal::CaptureStdout();
@@ -107,6 +131,8 @@ TEST_F(ScriptTest, HatPredicate)
     stageTest = nullptr;
     engineTest = nullptr;
     scriptTest = nullptr;
+    variablesTest = nullptr;
+    listsTest = nullptr;
     script.setHatPredicateBytecode({ vm::OP_START, vm::OP_EXEC, 2, vm::OP_HALT });
     ASSERT_FALSE(script.runHatPredicate());
     ASSERT_EQ(stageTest, &stage);