Fix local variables.

4ian · May 3, 2024 · 6f44dbc · 6f44dbc
1 parent 4ceda58
commit 6f44dbc
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/GDJS/GDJS/Extensions/Builtin/CommonInstructionsExtension.cpp b/GDJS/GDJS/Extensions/Builtin/CommonInstructionsExtension.cpp
@@ -876,8 +876,11 @@ void CommonInstructionsExtension::GenerateLocalVariablesInitializationCode(
   for (std::size_t i = 0; i < variablesContainer.Count(); i++) {
     auto &variable = variablesContainer.Get(i);
     code += "{\n";
-    code += "const variable = variables.getFromIndex(" + gd::String::From(i) + ");\n";
     GenerateLocalVariableInitializationCode(variable, code);
+    code += "variables._declare(" +
+            EventsCodeGenerator::ConvertToStringExplicit(
+                variablesContainer.GetNameAt(i)) +
+            ", variable);\n";
     code += "}\n";
   }
   code +=
@@ -889,9 +892,7 @@ void CommonInstructionsExtension::GenerateLocalVariableInitializationCode(
     gd::Variable &variable, gd::String &code, std::size_t depth) {
   const gd::String variableCodeName =
       "variable" + (depth == 0 ? "" : gd::String::From(depth));
-  if (depth > 0) {
-    code += "const " + variableCodeName + " = new gdjs.Variable();\n";
-  }
+  code += "const " + variableCodeName + " = new gdjs.Variable();\n";
   if (variable.GetType() == gd::Variable::Number) {
     code += variableCodeName + ".setNumber(" +
             gd::String::From(variable.GetValue()) + ");\n";

diff --git a/GDJS/Runtime/variablescontainer.ts b/GDJS/Runtime/variablescontainer.ts
@@ -86,6 +86,18 @@ namespace gdjs {
       }
     }
 
+    /**
+     * Declare a new variable.
+     * This should only be used by generated code.
+     *
+     * @param name Variable name
+     * @param newVariable The variable to be declared
+     */
+    _declare(name: string, newVariable: gdjs.Variable): void {
+      this._variables.put(name, newVariable);
+      this._variablesArray.push(newVariable);
+    }
+
     /**
      * Add a new variable.
      * This can be costly, don't use in performance sensitive paths.
@@ -205,6 +217,9 @@ namespace gdjs {
       add: function () {
         return;
       },
+      declare: function () {
+        return;
+      },
       initFrom: function () {
         return;
       },

diff --git a/GDevelop.js/TestUtils/GDJSMocks.js b/GDevelop.js/TestUtils/GDJSMocks.js
@@ -307,6 +307,11 @@ class VariablesContainer {
     }
   }
 
+  _declare(name, newVariable) {
+    this._variables.put(name, newVariable);
+    this._indexedVariables.push(newVariable);
+  }
+
   /**
    * @param {string} name
    * @returns {Variable}