fix dynamic variable address tracking and conversion of non ints to int

mikke89 · Dec 14, 2023 · a47a099 · a47a099
1 parent 54c4e7b
commit a47a099
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/Source/Core/DataExpression.cpp b/Source/Core/DataExpression.cpp
@@ -88,6 +88,7 @@ enum class Instruction {
 	EventFnc        = 'E',     //       DataModel.EventCallback(D, A); S -= R;
 	Assign          = 'A',     //       DataModel.SetVariable(D, R)
 	DynamicVariable = 'Y',     //       DataModel.GetVariable(DataModel.ParseAddress(R)) (Looks up a variable by path in R)
+	CastToInt       = 'I'      //       R = (int)R
 	// clang-format on
 };
 
@@ -275,6 +276,18 @@ class DataParser {
 		program_states.pop_back();
 	}
 
+	bool Address(const String& name)
+	{
+		DataAddress address = expression_interface.ParseAddress(name);
+		if (address.empty())
+		{
+			return false;
+		}
+
+		variable_addresses.push_back(std::move(address));
+		return true;
+	}
+
 private:
 	void VariableGetSet(const String& name, bool is_assignment)
 	{
@@ -629,6 +642,7 @@ namespace Parse {
 		{
 			parser.Next();
 			String prefix = address_prefix;
+
 			prefix.push_back('[');
 
 			parser.PushState();
@@ -649,6 +663,7 @@ namespace Parse {
 				parser.Push();
 
 				Expression(parser);
+				parser.Emit(Instruction::CastToInt);
 				parser.Push();
 
 				parser.Match(']');
@@ -719,6 +734,9 @@ namespace Parse {
 			}
 			else
 			{
+				// add the root of a variable expression as dependency into the address list
+				parser.Address(name);
+
 				parser.DiscardState();
 				parser.Emit(Instruction::DynamicVariable, Variant());
 			}
@@ -994,7 +1012,8 @@ class DataInterpreter {
 		break;
 		case Instruction::DynamicVariable:
 		{
-			auto address = expression_interface.ParseAddress(R.Get<String>());
+			auto str = R.Get<String>();
+			auto address = expression_interface.ParseAddress(str);
 			if (address.empty())
 				return Error("Variable address not found.");
 			R = expression_interface.GetValue(address);
@@ -1093,6 +1112,10 @@ class DataInterpreter {
 			else
 				return Error("Variable address not found.");
 		}
+		case Instruction::CastToInt:
+		{
+			R = R.Get<int>();
+		}
 		break;
 		default: RMLUI_ERRORMSG("Instruction not implemented."); break;
 		}

diff --git a/Tests/Source/UnitTests/DataBinding.cpp b/Tests/Source/UnitTests/DataBinding.cpp
@@ -550,6 +550,13 @@ TEST_CASE("databinding.dynamic_variables")
 	CHECK(document->QuerySelector("p:nth-child(4)")->GetInnerRML() == "c3");
 	CHECK(document->QuerySelector("p:nth-child(5)")->GetInnerRML() == "c3");
 
+	*globals.i1 = 0;
+	context->GetDataModel("basics").GetModelHandle().DirtyVariable("i1");
+	TestsShell::RenderLoop();
+
+	CHECK(document->QuerySelector("p:nth-child(3)")->GetInnerRML() == "20");
+	CHECK(document->QuerySelector("p:nth-child(4)")->GetInnerRML() == "c2");
+
 	document->Close();
 
 	TestsShell::ShutdownShell();