TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 11:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix foreach/foreach$ loops.

Browse source
This commit is contained in:
Jeff Hutchinson 2021-04-04 00:50:37 -04:00
parent 3e04196a53
commit 4e678292e1
4 changed files with 176 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

88
Engine/source/console/test/ScriptTest.cpp
View file

@ -241,9 +241,11 @@ TEST(Script, Basic_Loop_Statements)
ASSERT_STREQ(forValue.getString(), "aaa");
ConsoleValue forIfValue = RunScript(R"(
function t() {
function t()
{
%str = "";
for (%i = 0; %i < 5; %i++) {
for (%i = 0; %i < 5; %i++)
{
%loopValue = %i;
@ -261,6 +263,82 @@ TEST(Script, Basic_Loop_Statements)
ASSERT_STREQ(forIfValue.getString(), "0, 1, 2, 3, 4");
}
TEST(Script, ForEachLoop)
{
ConsoleValue forEach1 = RunScript(R"(
$theSimSet = new SimSet();
$theSimSet.add(new SimObject());
$theSimSet.add(new SimObject());
$counter = 0;
foreach ($obj in $theSimSet)
{
$counter++;
}
$theSimSet.delete();
return $counter;
)");
ASSERT_EQ(forEach1.getInt(), 2);
ConsoleValue forEach2 = RunScript(R"(
$counter = 0;
foreach$ ($word in "a b c d")
{
$counter++;
}
return $counter;
)");
ASSERT_EQ(forEach2.getInt(), 4);
ConsoleValue forEach3 = RunScript(R"(
function SimObject::addOne(%this)
{
return 1;
}
function test()
{
%set = new SimSet();
%set.add(new SimObject());
%set.add(new SimObject());
%count = 0;
foreach (%obj in %set)
%count += %obj.addOne();
%set.delete();
return %count;
}
return test();
)");
ASSERT_EQ(forEach3.getInt(), 2);
ConsoleValue forEach4 = RunScript(R"(
function test()
{
%string = "a b c d e";
%count = 0;
foreach$ (%word in %string)
%count++;
return %count;
}
return test();
)");
ASSERT_EQ(forEach4.getInt(), 5);
}
TEST(Script, TorqueScript_Array_Testing)
{
ConsoleValue value = RunScript(R"(
@ -281,7 +359,8 @@ TEST(Script, TorqueScript_Array_Testing)
TEST(Script, Basic_SimObject)
{
ConsoleValue object = RunScript(R"(
return new SimObject(FudgeCollector) {
return new SimObject(FudgeCollector)
{
fudge = "Chocolate";
};
)");
@ -329,7 +408,8 @@ TEST(Script, Basic_Package)
{
ConsoleValue value = RunScript(R"(
function a() { return 3; }
package overrides {
package overrides
{
function a() { return 5; }
};
return a();