Kalakoi/GDevelop
1
0
Fork 0
mirror of https://github.com/4ian/GDevelop.git synced 2025-10-15 10:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix initialization of local array variables (#6777)

Browse Source
This commit is contained in:
D8H
2024-07-22 11:07:47 +02:00
committed by GitHub
parent 7ac600e92d
commit 45d73df6fb
6 changed files with 100 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
GDJS/GDJS/Extensions/Builtin/CommonInstructionsExtension.cpp
View File

@@ -892,22 +892,28 @@ void CommonInstructionsExtension::GenerateLocalVariableInitializationCode(
code += variableCodeName + ".setString(" +
EventsCodeGenerator::ConvertToStringExplicit(variable.GetString()) +
");\n";
} else if (variable.GetType() == gd::Variable::Structure ||
variable.GetType() == gd::Variable::Array) {
} else if (variable.GetType() == gd::Variable::Structure) {
const auto &childrenNames = variable.GetAllChildrenNames();
for (const auto& childName : variable.GetAllChildrenNames()) {
for (const auto &childName : variable.GetAllChildrenNames()) {
auto &child = variable.GetChild(childName);
code += "{\n";
GenerateLocalVariableInitializationCode(child, code, depth + 1);
auto childCodeName = "variable" + gd::String::From(depth + 1);
code += variableCodeName + ".addChild(" +
EventsCodeGenerator::ConvertToStringExplicit(childName) +
", " + childCodeName + ");\n";
EventsCodeGenerator::ConvertToStringExplicit(childName) + ", " +
childCodeName + ");\n";
code += "}\n";
}
if (variable.GetType() == gd::Variable::Array) {
code += variableCodeName + ".castTo('array');\n";
} else if (variable.GetType() == gd::Variable::Array) {
for (std::size_t i = 0; i < variable.GetChildrenCount(); i++) {
auto &child = variable.GetAtIndex(i);
code += "{\n";
GenerateLocalVariableInitializationCode(child, code, depth + 1);
auto childCodeName = "variable" + gd::String::From(depth + 1);
code += variableCodeName + "._pushVariable(" + childCodeName + ");\n";
code += "}\n";
}
}
}

10
GDJS/Runtime/variable.ts
View File

@@ -620,6 +620,16 @@ namespace gdjs {
this._childrenArray.push(variable.clone());
}
/**
* Pushes a variable into the array without duplicating it first.
* This should only be used by generated code.
*/
_pushVariable(variable: gdjs.Variable) {
if (this._type !== 'array') this.castTo('array');
this._childrenArray.push(variable);
}
/**
* Pushes a value into the array.
*/

1
GDJS/Runtime/variablescontainer.ts
View File

@@ -521,6 +521,7 @@ namespace gdjs {
return [];
},
pushVariableCopy: () => {},
_pushVariable: () => {},
pushValue: () => {},
removeAtIndex: function () {
return;

7
GDevelop.js/TestUtils/GDJSMocks.js
View File

@@ -252,6 +252,13 @@ class Variable {
this._childrenArray.push(variable.clone());
return this;
}
/**
* @param {Variable} variable
*/
_pushVariable(variable) {
this._childrenArray.push(variable);
}
/**
*

37
GDevelop.js/__tests__/GDJSExtensionVariableCodeGenerationIntegrationTests.js
View File

@@ -420,7 +420,7 @@ describe('libGD.js - GDJS Code Generation integration tests', function () {
).toBe(1);
});
it('can generate a local child-variable condition', function () {
it('can generate a local child-variable condition on a structure', function () {
extension.getSceneVariables().insertNew('SuccessVariable', 0).setValue(0);
const runtimeScene = generateAndRunEventsForFunction([
{
@@ -455,6 +455,41 @@ describe('libGD.js - GDJS Code Generation integration tests', function () {
).toBe(1);
});
it('can generate a local child-variable condition on an array', function () {
extension.getSceneVariables().insertNew('SuccessVariable', 0).setValue(0);
const runtimeScene = generateAndRunEventsForFunction([
{
type: 'BuiltinCommonInstructions::Standard',
variables: [
{
name: 'MyLocalVariable',
type: 'array',
children: [{ name: '0', type: 'number', value: 123 }],
},
],
conditions: [
{
type: { inverted: false, value: 'NumberVariable' },
parameters: ['MyLocalVariable[0]', '=', '123'],
},
],
actions: [
{
type: { value: 'SetNumberVariable' },
parameters: ['SuccessVariable', '=', '1'],
},
],
events: [],
},
]);
expect(
runtimeScene
.getVariablesForExtension('Extension')
.get('SuccessVariable')
.getAsNumber()
).toBe(1);
});
it('can generate a local variable condition giving precedence to the closest local variable', function () {
extension.getSceneVariables().insertNew('SuccessVariable', 0).setValue(0);

34
GDevelop.js/__tests__/GDJSSceneVariableCodeGenerationIntegrationTests.js
View File

@@ -346,7 +346,7 @@ describe('libGD.js - GDJS Code Generation integration tests', function () {
).toBe(1);
});
it('can generate a local child-variable condition', function () {
it('can generate a local child-variable condition on a structure', function () {
scene.getVariables().insertNew('SuccessVariable', 0).setValue(0);
const runtimeScene = generateAndRunEventsForLayout([
{
@@ -378,6 +378,38 @@ describe('libGD.js - GDJS Code Generation integration tests', function () {
).toBe(1);
});
it('can generate a local child-variable condition on an array', function () {
scene.getVariables().insertNew('SuccessVariable', 0).setValue(0);
const runtimeScene = generateAndRunEventsForLayout([
{
type: 'BuiltinCommonInstructions::Standard',
variables: [
{
name: 'MyLocalVariable',
type: 'array',
children: [{ name: '0', type: 'number', value: 123 }],
},
],
conditions: [
{
type: { inverted: false, value: 'NumberVariable' },
parameters: ['MyLocalVariable[0]', '=', '123'],
},
],
actions: [
{
type: { value: 'SetNumberVariable' },
parameters: ['SuccessVariable', '=', '1'],
},
],
events: [],
},
]);
expect(
runtimeScene.getVariables().get('SuccessVariable').getAsNumber()
).toBe(1);
});
it('can generate a local variable condition giving precedence to the closest local variable', function () {
scene.getVariables().insertNew('SuccessVariable', 0).setValue(0);