Review changes: add a test with create and return object actions.

.circleci/config.yml

@@ -11,24 +11,13 @@
 version: 2.1
 orbs:
   aws-cli: circleci/aws-cli@2.0.6
-  macos: circleci/macos@2.5.1 # For Rosetta (see below)
-  node: circleci/node@5.2.0 # For a recent npm version (see below)
 jobs:
   # Build the **entire** app for macOS.
   build-macos:
     macos:
       xcode: 14.2.0
-    resource_class: macos.m1.large.gen1
     steps:
       - checkout
-      # Install Rosetta for AWS CLI and disable TSO to speed up S3 uploads (https://support.circleci.com/hc/en-us/articles/19334402064027-Troubleshooting-slow-uploads-to-S3-for-jobs-using-an-m1-macOS-resource-class)
-      - macos/install-rosetta
-      - run: sudo sysctl net.inet.tcp.tso=0
-
-      # Install a recent version of npm to workaround a notarization issue because of a symlink made by npm: https://github.com/electron-userland/electron-builder/issues/7755
-      # Node.js v20.14.0 comes with npm v10.7.0.
-      - node/install:
-          node-version: "20.14.0"
 
       # System dependencies (for Emscripten and upload)
       - run:
@@ -41,7 +30,7 @@ jobs:
 
       - run:
           name: Install Emscripten (for GDevelop.js)
-          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
 
       # GDevelop.js dependencies
       - restore_cache:
@@ -118,7 +107,7 @@ jobs:
 
       - run:
           name: Install Emscripten (for GDevelop.js)
-          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
 
       - run:
           name: Install system dependencies for Electron builder
@@ -138,8 +127,7 @@ jobs:
       # Build GDevelop.js (and run tests to ensure it works)
       - run:
           name: Build GDevelop.js
-          # Use "--runInBand" as it's faster and avoid deadlocks on CircleCI Linux machines (probably because limited in processes number).
-          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test -- --runInBand && cd ..
+          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test && cd ..
 
       # GDevelop IDE dependencies (after building GDevelop.js to avoid downloading a pre-built version)
       - run:
@@ -196,7 +184,7 @@ jobs:
 
       - run:
           name: Install Emscripten (for GDevelop.js)
-          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
 
       # GDevelop.js dependencies
       - restore_cache:
@@ -212,8 +200,7 @@ jobs:
       # Build GDevelop.js (and run tests to ensure it works)
       - run:
           name: Build GDevelop.js
-          # Use "--runInBand" as it's faster and avoid deadlocks on CircleCI Linux machines (probably because limited in processes number).
-          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test -- --runInBand && cd ..
+          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test && cd ..
 
       - save_cache:
           paths:

.gitattributes

@@ -1,11 +1,12 @@
 Core/GDCore/Serialization/rapidjson/rapidjson.h/* linguist-vendored
+Core/GDCore/TinyXml/* linguist-vendored
 Extensions/ParticleSystem/SPARK/* linguist-vendored
 Extensions/PhysicsBehavior/Box2D/* linguist-vendored
 Extensions/PhysicsBehavior/box2djs/* linguist-vendored
 Extensions/Physics2Behavior/box2d.js linguist-vendored
 Extensions/BBText/pixi-multistyle-text/* linguist-vendored
 Extensions/P2P/A_peer.js linguist-vendored
-Extensions/Multiplayer/peer.js linguist-vendored
 Extensions/Shopify/shopify-buy.umd.polyfilled.min.js linguist-vendored
 Extensions/TileMap/pako/* linguist-vendored
 Extensions/TileMap/pixi-tilemap/* linguist-vendored
+Extensions/TweenBehavior/shifty.js linguist-vendored

.github/ISSUE_TEMPLATE/--automatic-crash.yml

@@ -1,37 +0,0 @@
-name: 💥 Automatic crash report
-description: Do not use this template for bug reports. This template is only for automatic crash reports.
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Describe what you were doing when the crash happened
-      description: If applicable, add screenshots to help explain your problem.
-      placeholder: |
-        1. Went to '...'
-        2. Clicked on '...'
-        3. Scrolled down to '...'
-        4. Saw error
-  - type: input
-    id: gdevelop_version
-    attributes:
-      label: GDevelop version
-      description: |
-        The version of GDevelop used. Leave the prefilled value.
-    validations:
-      required: true
-  - type: textarea
-    id: platform_info
-    attributes:
-      label: Platform info
-      description: |
-        The platform you are using GDevelop on. Leave the prefilled value.
-  - type: textarea
-    id: error_stack
-    attributes:
-      label: Additional error context
-      description: Additonal context about the problem. Leave the prefilled value.
-  - type: textarea
-    id: component_stack
-    attributes:
-      label: Additional component context
-      description: Additonal context about the problem. Leave the prefilled value.

.github/ISSUE_TEMPLATE/--bug-report.yml

@@ -2,21 +2,18 @@ name: 🐛Bug report
 description: Create a bug report about GDevelop or the game engine
 body:
   - type: checkboxes
-    id: searched_issues
     attributes:
       label: Is there an existing issue for this?
       options:
-        - label: I have searched the [existing issues](https://github.com/4ian/GDevelop/issues)
-          required: true
+      - label: I have searched the [existing issues](https://github.com/4ian/GDevelop/issues)
+        required: true
   - type: textarea
-    id: description
     attributes:
       label: Describe the bug
       description: A clear and concise description of what the bug is.
     validations:
       required: true
   - type: textarea
-    id: reproduction_steps
     attributes:
       label: Steps to reproduce
       description: |
@@ -30,7 +27,6 @@ body:
     validations:
       required: true
   - type: dropdown
-    id: platform
     attributes:
       label: GDevelop platform
       description: Which platform of GDevelop are you using?
@@ -42,7 +38,6 @@ body:
     validations:
       required: true
   - type: input
-    id: gdevelop_version
     attributes:
       label: GDevelop version
       description: |
@@ -52,7 +47,6 @@ body:
     validations:
       required: true
   - type: textarea
-    id: platform_info
     attributes:
       label: Platform info
       value: |
@@ -72,7 +66,6 @@ body:
 
         </details>
   - type: textarea
-    id: additional_context
     attributes:
       label: Additional context
       description: Add any other context about the problem here.

.github/workflows/update-translations.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 20
+          node-version: 16
           cache: "npm"
           cache-dependency-path: "newIDE/app/package-lock.json"
 
@@ -58,7 +58,7 @@ jobs:
         working-directory: newIDE/app
 
       - name: Create a Pull Request with the changes
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v5
         with:
           commit-message: Update translations [skip ci]
           branch: chore/update-translations

.gitpod.yml

@@ -14,7 +14,7 @@ tasks:
     init: |
           sudo apt-get update 
           sudo apt install cmake python-is-python3 python3-distutils -y
-          git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
+          git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
           cd GDevelop.js
           npm install
           source ../emsdk/emsdk_env.sh && npm run build -- --dev

.semaphore/semaphore.yml

@@ -56,7 +56,6 @@ blocks:
         - name: GDJS typing and documentation generation
           commands:
             - checkout
-            - cache restore newIDE-app-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json)
             - cache restore GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)
             - cache restore GDJS-tests-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/tests/package-lock.json)
             - cd GDJS

.travis.yml

@@ -17,11 +17,11 @@ cache:
 addons:
   apt:
     sources:
-      - ubuntu-toolchain-r-test
+    - ubuntu-toolchain-r-test
     packages:
-      # Build dependencies:
-      - cmake
-      - p7zip-full
+    # Build dependencies:
+    - cmake
+    - p7zip-full
 
 before_install:
   # This workaround is required to avoid libstdc++ errors (Emscripten requires a recent version of libstdc++)
@@ -29,48 +29,47 @@ before_install:
   - sudo dpkg --force-all -i libstdc++6
 
 install:
-  # Ensure we use a recent version of Node.js (and npm).
+# Ensure we use a recent version of Node.js (and npm).
   - nvm install v16 && nvm use v16
-  #Compile the tests only for GDCore
+#Compile the tests only for GDCore
   - mkdir .build-tests
   - cd .build-tests
   - cmake -DBUILD_GDJS=FALSE -DBUILD_TESTS=TRUE -DCMAKE_CXX_COMPILER=$(which $CXX) -DCMAKE_C_COMPILER=$(which $CC) ..
   - make -j 4
   - cd ..
-  # Install Emscripten (for GDevelop.js)
-  # Specify the tag for the core repository to avois breaking changes.
-  - git clone --depth 1 --branch 3.1.21 https://github.com/juj/emsdk.git
-  - cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
-  # Install GDevelop.js dependencies
+# Install Emscripten (for GDevelop.js)
+  - git clone https://github.com/juj/emsdk.git
+  - cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
+# Install GDevelop.js dependencies
   - cd GDevelop.js && npm install && cd ..
-  # Build GDevelop.js
-  # (in a subshell to avoid Emscripten polluting the Node.js and npm version for the rest of the build)
+# Build GDevelop.js
+# (in a subshell to avoid Emscripten polluting the Node.js and npm version for the rest of the build)
   - (set -e; cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && cd ..)
-  # Install newIDE tests dependencies
+# Install newIDE tests dependencies
   - npm -v
   - cd newIDE/app && npm install
   - cd ../..
-  # Install GDJS tests dependencies
+# Install GDJS tests dependencies
   - cd GDJS && npm install && cd tests && npm install
   - cd ../..
 
 script:
-  # GDCore tests:
+# GDCore tests:
   - cd .build-tests
   - Core/GDCore_tests
   - cd ..
-  # GDevelop.js tests
+# GDevelop.js tests
   - cd GDevelop.js
   - npm test
   - cd ..
-  # newIDE tests:
+# newIDE tests:
   - cd newIDE/app
   - npm test
   - npm run flow
   - npm run check-format
   - npm run check-script-types
   - cd ../..
-  # GDJS tests:
+# GDJS tests:
   - cd GDJS
   - npm run check-format
   - cd ..

.vscode/GDevelopExtensions.code-snippets

@@ -107,7 +107,7 @@
     "description": "Define a parameter in a GDevelop extension definition.",
     "prefix": "gdparam",
     "body": [
-      ".addParameter('${1|string,expression,object,behavior,yesorno,stringWithSelector,scenevar,globalvar,objectvar,objectList,objectListWithoutPicking,color,key,sceneName,file,layer,relationalOperator,operator,trueorfalse,musicfile,soundfile,mouse,passwordjoyaxis,camera,objectPtr,forceMultiplier|}', '${2:Parameter description}', '${3:Optional parameter data}', /*parameterIsOptional=*/${4|false,true|})"
+      ".addParameter('${1|string,expression,object,behavior,yesorno,stringWithSelector,scenevar,globalvar,objectvar,objectList,objectListWithoutPicking,color,key,sceneName,file,layer,relationalOperator,operator,trueorfalse,musicfile,soundfile,police,mouse,passwordjoyaxis,camera,objectPtr,forceMultiplier|}', '${2:Parameter description}', '${3:Optional parameter data}', /*parameterIsOptional=*/${4|false,true|})"
     ]
   },
   "Add code only parameter": {

.vscode/settings.json

@@ -113,8 +113,7 @@
     "memory_resource": "cpp",
     "__bits": "cpp",
     "__verbose_abort": "cpp",
-    "variant": "cpp",
-    "charconv": "cpp"
+    "variant": "cpp"
   },
   "files.exclude": {
     "Binaries/*build*": true,

.vscode/tasks.json

@@ -8,7 +8,6 @@
       "group": "build",
       "label": "Start development server",
       "detail": "Starts the GDevelop development server.",
-      "options": { "env": { "NODE_OPTIONS": "--max-old-space-size=8192" } },
       "problemMatcher": [
         {
           "owner": "cra",

Core/CMakeLists.txt

@@ -11,11 +11,6 @@ set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES 1)
 set(GDCORE_include_dir ${GD_base_dir}/Core PARENT_SCOPE)
 set(GDCORE_lib_dir ${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME} PARENT_SCOPE)
 
-# Create VersionPriv.h - only useful for testing.
-if (NOT EMSCRIPTEN)
-	file(WRITE "${GD_base_dir}/Core/GDCore/Tools/VersionPriv.h" "#define GD_VERSION_STRING \"0.0.0-0\"")
-endif()
-
 # Dependencies on external libraries:
 #
 

Core/GDCore/DocMainPage.h

@@ -58,7 +58,99 @@
  * Common functions and tools for programming.
  */
 
+/**
+ * \defgroup TinyXml Integrated TinyXml library
+ *
+ * See the full documentation of TinyXml [here](http://www.grinninglizard.com/tinyxmldocs/index.html).
+ */
+
 /**
  * \defgroup SpriteObjectExtension Standard Sprite Object extension
  * \ingroup BuiltinExtensions
- */
+ */
+
+/**
+ * \class TiXmlAttribute
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlAttributeSet
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlBase
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlComment
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlCursor
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlDeclaration
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlDocument
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlElement
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlHandle
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlNode
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlOutStream
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlParsingData
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlPrinter
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlString
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlText
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlUnknown
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlVisitor
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */

Core/GDCore/Events/Builtin/ForEachChildVariableEvent.cpp

@@ -49,8 +49,7 @@ vector<pair<gd::Expression*, gd::ParameterMetadata> >
     ForEachChildVariableEvent::GetAllExpressionsWithMetadata() {
   vector<pair<gd::Expression*, gd::ParameterMetadata> >
       allExpressionsWithMetadata;
-  auto metadata = gd::ParameterMetadata().SetType("variable");
-  metadata.SetExtraInfo("AllowUndeclaredVariable");
+  auto metadata = gd::ParameterMetadata().SetType("scenevar");
   allExpressionsWithMetadata.push_back(
       std::make_pair(&iterableVariableName, metadata));
   allExpressionsWithMetadata.push_back(
@@ -64,8 +63,7 @@ vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
     ForEachChildVariableEvent::GetAllExpressionsWithMetadata() const {
   vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
       allExpressionsWithMetadata;
-  auto metadata = gd::ParameterMetadata().SetType("variable");
-  metadata.SetExtraInfo("AllowUndeclaredVariable");
+  auto metadata = gd::ParameterMetadata().SetType("scenevar");
   allExpressionsWithMetadata.push_back(
       std::make_pair(&iterableVariableName, metadata));
   allExpressionsWithMetadata.push_back(

Core/GDCore/Events/Builtin/ForEachEvent.cpp

@@ -8,6 +8,7 @@
 #include "GDCore/Events/Serialization.h"
 #include "GDCore/Events/Tools/EventsCodeNameMangler.h"
 #include "GDCore/Serialization/SerializerElement.h"
+#include "GDCore/TinyXml/tinyxml.h"
 
 using namespace std;
 

Core/GDCore/Events/Builtin/GroupEvent.cpp

@@ -10,6 +10,7 @@
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
 #include "GDCore/Events/Serialization.h"
 #include "GDCore/Serialization/SerializerElement.h"
+#include "GDCore/TinyXml/tinyxml.h"
 
 using namespace std;
 

Core/GDCore/Events/Builtin/LinkEvent.cpp

@@ -164,7 +164,7 @@ void LinkEvent::UnserializeFrom(gd::Project& project,
 }
 
 bool LinkEvent::AcceptVisitor(gd::EventVisitor &eventVisitor) {
-  return BaseEvent::AcceptVisitor(eventVisitor) ||
+  return BaseEvent::AcceptVisitor(eventVisitor) |
          eventVisitor.VisitLinkEvent(*this);
 }
 

Core/GDCore/Events/Builtin/RepeatEvent.h

@@ -4,8 +4,8 @@
  * reserved. This project is released under the MIT License.
  */
 
-#pragma once
-
+#ifndef GDCORE_REPEATEVENT_H
+#define GDCORE_REPEATEVENT_H
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/EventsList.h"
 namespace gd {
@@ -36,10 +36,10 @@ class GD_CORE_API RepeatEvent : public gd::BaseEvent {
   const gd::InstructionsList& GetActions() const { return actions; };
   gd::InstructionsList& GetActions() { return actions; };
 
-  const gd::Expression& GetRepeatExpression() const {
-    return repeatNumberExpression;
+  const gd::String& GetRepeatExpression() const {
+    return repeatNumberExpression.GetPlainString();
   };
-  void SetRepeatExpressionPlainString(gd::String repeatNumberExpression_) {
+  void SetRepeatExpression(gd::String repeatNumberExpression_) {
     repeatNumberExpression = gd::Expression(repeatNumberExpression_);
   };
 
@@ -68,3 +68,5 @@ class GD_CORE_API RepeatEvent : public gd::BaseEvent {
 };
 
 }  // namespace gd
+
+#endif  // GDCORE_REPEATEVENT_H

Core/GDCore/Events/Builtin/StandardEvent.cpp

@@ -15,8 +15,7 @@ using namespace std;
 
 namespace gd {
 
-StandardEvent::StandardEvent()
-    : BaseEvent(), variables(gd::VariablesContainer::SourceType::Local) {}
+StandardEvent::StandardEvent() : BaseEvent() {}
 
 StandardEvent::~StandardEvent(){};
 
@@ -58,9 +57,6 @@ void StandardEvent::SerializeTo(SerializerElement& element) const {
   if (!events.IsEmpty())
     gd::EventsListSerialization::SerializeEventsTo(events,
                                                   element.AddChild("events"));
-  if (HasVariables()) {
-    variables.SerializeTo(element.AddChild("variables"));
-  }
 }
 
 void StandardEvent::UnserializeFrom(gd::Project& project,
@@ -75,11 +71,6 @@ void StandardEvent::UnserializeFrom(gd::Project& project,
     gd::EventsListSerialization::UnserializeEventsFrom(
         project, events, element.GetChild("events", 0, "Events"));
   }
-
-  variables.Clear();
-  if (element.HasChild("variables")) {
-    variables.UnserializeFrom(element.GetChild("variables"));
-  }
 }
 
 }  // namespace gd

Core/GDCore/Events/Builtin/StandardEvent.h

@@ -4,13 +4,13 @@
  * reserved. This project is released under the MIT License.
  */
 
-#pragma once
-
+#if defined(GD_IDE_ONLY)
+#ifndef GDCORE_STANDARDEVENT_H
+#define GDCORE_STANDARDEVENT_H
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/EventsList.h"
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/Events/InstructionsList.h"
-#include "GDCore/Project/VariablesContainer.h"
 namespace gd {
 class Instruction;
 class Project;
@@ -33,10 +33,6 @@ class GD_CORE_API StandardEvent : public gd::BaseEvent {
   virtual const gd::EventsList& GetSubEvents() const { return events; };
   virtual gd::EventsList& GetSubEvents() { return events; };
 
-  virtual bool CanHaveVariables() const { return true; }
-  virtual const gd::VariablesContainer& GetVariables() const { return variables; };
-  virtual gd::VariablesContainer& GetVariables() { return variables; };
-
   const gd::InstructionsList& GetConditions() const { return conditions; };
   gd::InstructionsList& GetConditions() { return conditions; };
 
@@ -57,7 +53,9 @@ class GD_CORE_API StandardEvent : public gd::BaseEvent {
   gd::InstructionsList conditions;
   gd::InstructionsList actions;
   EventsList events;
-  VariablesContainer variables;
 };
 
 }  // namespace gd
+
+#endif  // GDCORE_STANDARDEVENT_H
+#endif

Core/GDCore/Events/CodeGeneration/DiagnosticReport.h

@@ -1,117 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-#include <memory>
-#include <vector>
-
-#include "GDCore/String.h"
-#include "GDCore/Tools/MakeUnique.h"
-
-namespace gd {
-
-/**
- * \brief 
- */
-class GD_CORE_API ProjectDiagnostic {
-public:
-  enum ErrorType {
-    UndeclaredVariable,
-    MissingBehavior,
-    UnknownObject,
-    MismatchedObjectType,
-  };
-
-  ProjectDiagnostic(ErrorType type_, const gd::String &message_,
-                    const gd::String &actualValue_,
-                    const gd::String &expectedValue_, const gd::String &objectName_ = "")
-      : type(type_), message(message_), actualValue(actualValue_), expectedValue(expectedValue_),
-        objectName(objectName_){};
-  virtual ~ProjectDiagnostic(){};
-
-  ErrorType GetType() const { return type; };
-  const gd::String &GetMessage() const { return message; }
-  const gd::String &GetObjectName() const { return objectName; }
-  const gd::String &GetActualValue() const { return actualValue; }
-  const gd::String &GetExpectedValue() const { return expectedValue; }
-
-private:
-  ErrorType type;
-  gd::String message;
-  gd::String objectName;
-  gd::String actualValue;
-  gd::String expectedValue;
-};
-
-/**
- * \brief 
- */
-class GD_CORE_API DiagnosticReport {
-public:
-  DiagnosticReport(){};
-  virtual ~DiagnosticReport(){};
-
-  void Add(const gd::ProjectDiagnostic &projectDiagnostic) {
-    projectDiagnostics.push_back(
-        gd::make_unique<gd::ProjectDiagnostic>(projectDiagnostic));
-  };
-
-  const ProjectDiagnostic &Get(std::size_t index) const {
-    return *projectDiagnostics[index].get();
-  };
-
-  std::size_t Count() const { return projectDiagnostics.size(); };
-
-  const gd::String &GetSceneName() const { return sceneName; }
-
-  void SetSceneName(const gd::String &sceneName_) {
-    sceneName = sceneName_;
-  }
-
-private:
-  std::vector<std::unique_ptr<gd::ProjectDiagnostic>> projectDiagnostics;
-  gd::String sceneName;
-};
-
-/**
- * \brief 
- */
-class GD_CORE_API WholeProjectDiagnosticReport {
-public:
-  WholeProjectDiagnosticReport(){};
-  virtual ~WholeProjectDiagnosticReport(){};
-
-  const DiagnosticReport &Get(std::size_t index) const {
-    return *diagnosticReports[index].get();
-  };
-
-  void Clear() {
-    diagnosticReports.clear();
-  };
-
-  DiagnosticReport& AddNewDiagnosticReportForScene(const gd::String &sceneName) {
-    auto diagnosticReport = gd::make_unique<gd::DiagnosticReport>();
-    diagnosticReport->SetSceneName(sceneName);
-    diagnosticReports.push_back(std::move(diagnosticReport));
-    return *diagnosticReports[diagnosticReports.size() - 1].get();
-  };
-
-  std::size_t Count() const { return diagnosticReports.size(); };
-
-  bool HasAnyIssue() {
-    for (auto& diagnosticReport : diagnosticReports) {
-      if (diagnosticReport->Count() > 0) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-private:
-  std::vector<std::unique_ptr<gd::DiagnosticReport>> diagnosticReports;
-};
-
-} // namespace gd

Core/GDCore/Events/CodeGeneration/EffectsCodeGenerator.cpp

@@ -15,7 +15,6 @@
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
-#include "GDCore/Project/EventsFunctionsExtension.h"
 #include "GDCore/IDE/ProjectBrowserHelper.h"
 
 namespace gd {
@@ -48,9 +47,6 @@ void EffectsCodeGenerator::GenerateEffectsIncludeFiles(
   
   // TODO Merge with UsedExtensionsFinder.
 
-  // TODO Factorize with the iteration on all effects for resource exposure.
-  // TODO Implement an ArbitraryEffectWorker and add a method in ProjectBrowserHelper
-
   // See also gd::Project::ExposeResources for a method that traverse the whole
   // project (this time for resources) and
   // WholeProjectRefactorer::ExposeProjectEvents.
@@ -72,27 +68,6 @@ void EffectsCodeGenerator::GenerateEffectsIncludeFiles(
 
   // Add objects effects
   gd::ProjectBrowserHelper::ExposeProjectObjects(project, effectsCodeGenerator);
-
-  // Add event-based objects layouts effects
-  for (std::size_t s = 0; s < project.GetEventsFunctionsExtensionsCount();
-       s++) {
-    auto &eventsFunctionExtension = project.GetEventsFunctionsExtension(s);
-
-    auto &eventsBasedObjects = eventsFunctionExtension.GetEventsBasedObjects();
-    for (std::size_t objectIndex = 0;
-         objectIndex < eventsBasedObjects.GetCount(); ++objectIndex) {
-      auto &eventsBasedObject = eventsBasedObjects.Get(objectIndex);
-
-      auto &layers = eventsBasedObject.GetLayers();
-      for (std::size_t l = 0; l < layers.GetLayersCount(); ++l) {
-        auto &effects = layers.GetLayer(l).GetEffects();
-        for (std::size_t e = 0; e < effects.GetEffectsCount(); ++e) {
-          auto &effect = effects.GetEffect(e);
-          effectsCodeGenerator.AddEffectIncludeFiles(effect);
-        }
-      }
-    }
-  }
 }
 
 }  // namespace gd

Core/GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h

@@ -3,8 +3,8 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
-
+#ifndef EVENTSCODEGENERATIONCONTEXT_H
+#define EVENTSCODEGENERATIONCONTEXT_H
 #include <map>
 #include <memory>
 #include <set>
@@ -325,3 +325,4 @@ class GD_CORE_API EventsCodeGenerationContext {
 };
 
 }  // namespace gd
+#endif  // EVENTSCODEGENERATIONCONTEXT_H

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -14,7 +14,6 @@
 #include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/Extensions/PlatformExtension.h"
-#include "GDCore/IDE/Events/ExpressionVariableNameFinder.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/ObjectsContainersList.h"
@@ -42,15 +41,14 @@ gd::String EventsCodeGenerator::GenerateRelationalOperatorCall(
     const vector<gd::String>& arguments,
     const gd::String& callStartString,
     std::size_t startFromArgument) {
-  std::size_t relationalOperatorIndex = instrInfos.parameters.GetParametersCount();
-  for (std::size_t i = startFromArgument; i < instrInfos.parameters.GetParametersCount();
+  std::size_t relationalOperatorIndex = instrInfos.parameters.size();
+  for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
        ++i) {
-    if (instrInfos.parameters.GetParameter(i).GetType() == "relationalOperator") {
+    if (instrInfos.parameters[i].GetType() == "relationalOperator")
       relationalOperatorIndex = i;
-    }
   }
   // Ensure that there is at least one parameter after the relational operator
-  if (relationalOperatorIndex + 1 >= instrInfos.parameters.GetParametersCount()) {
+  if (relationalOperatorIndex + 1 >= instrInfos.parameters.size()) {
     ReportError();
     return "";
   }
@@ -77,11 +75,11 @@ gd::String EventsCodeGenerator::GenerateRelationalOperatorCall(
 
 /**
  * @brief Generate a relational operation
- *
+ * 
  * @param relationalOperator the operator
  * @param lhs the left hand operand
  * @param rhs the right hand operand
- * @return gd::String
+ * @return gd::String 
  */
 gd::String EventsCodeGenerator::GenerateRelationalOperation(
     const gd::String& relationalOperator,
@@ -123,16 +121,14 @@ gd::String EventsCodeGenerator::GenerateOperatorCall(
     const gd::String& callStartString,
     const gd::String& getterStartString,
     std::size_t startFromArgument) {
-  std::size_t operatorIndex = instrInfos.parameters.GetParametersCount();
-  for (std::size_t i = startFromArgument; i < instrInfos.parameters.GetParametersCount();
+  std::size_t operatorIndex = instrInfos.parameters.size();
+  for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
        ++i) {
-    if (instrInfos.parameters.GetParameter(i).GetType() == "operator") {
-      operatorIndex = i;
-    }
+    if (instrInfos.parameters[i].GetType() == "operator") operatorIndex = i;
   }
 
   // Ensure that there is at least one parameter after the operator
-  if (operatorIndex + 1 >= instrInfos.parameters.GetParametersCount()) {
+  if (operatorIndex + 1 >= instrInfos.parameters.size()) {
     ReportError();
     return "";
   }
@@ -194,16 +190,14 @@ gd::String EventsCodeGenerator::GenerateCompoundOperatorCall(
     const vector<gd::String>& arguments,
     const gd::String& callStartString,
     std::size_t startFromArgument) {
-  std::size_t operatorIndex = instrInfos.parameters.GetParametersCount();
-  for (std::size_t i = startFromArgument; i < instrInfos.parameters.GetParametersCount();
+  std::size_t operatorIndex = instrInfos.parameters.size();
+  for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
        ++i) {
-    if (instrInfos.parameters.GetParameter(i).GetType() == "operator") {
-      operatorIndex = i;
-    }
+    if (instrInfos.parameters[i].GetType() == "operator") operatorIndex = i;
   }
 
   // Ensure that there is at least one parameter after the operator
-  if (operatorIndex + 1 >= instrInfos.parameters.GetParametersCount()) {
+  if (operatorIndex + 1 >= instrInfos.parameters.size()) {
     ReportError();
     return "";
   }
@@ -247,27 +241,25 @@ gd::String EventsCodeGenerator::GenerateMutatorCall(
     const vector<gd::String>& arguments,
     const gd::String& callStartString,
     std::size_t startFromArgument) {
-  std::size_t operatorIndex = instrInfos.parameters.GetParametersCount();
-  for (std::size_t i = startFromArgument; i < instrInfos.parameters.GetParametersCount();
+  std::size_t operatorIndex = instrInfos.parameters.size();
+  for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
        ++i) {
-    if (instrInfos.parameters.GetParameter(i).GetType() == "operator") {
-      operatorIndex = i;
-    }
+    if (instrInfos.parameters[i].GetType() == "operator") operatorIndex = i;
   }
 
   // Ensure that there is at least one parameter after the operator
-  if (operatorIndex + 1 >= instrInfos.parameters.GetParametersCount()) {
+  if (operatorIndex + 1 >= instrInfos.parameters.size()) {
     ReportError();
     return "";
   }
 
   gd::String operatorStr = arguments[operatorIndex];
-  if (operatorStr.size() > 2 && operatorStr[0] == '\"') {
+  if (operatorStr.size() > 2)
     operatorStr = operatorStr.substr(
         1,
         operatorStr.length() - 1 -
             1);  // Operator contains quote which must be removed.
-  }
+
   auto mutators = instrInfos.codeExtraInformation.optionalMutators;
   auto mutator = mutators.find(operatorStr);
   if (mutator == mutators.end()) {
@@ -287,9 +279,6 @@ gd::String EventsCodeGenerator::GenerateMutatorCall(
       argumentsStr += arguments[i];
     }
   }
-  if (instrInfos.GetManipulatedType() == "boolean") {
-    return callStartString + "(" + argumentsStr + ")." + mutator->second;
-  }
 
   return callStartString + "(" + argumentsStr + ")." + mutator->second + "(" +
          rhs + ")";
@@ -323,36 +312,23 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
   }
 
   // Insert code only parameters and be sure there is no lack of parameter.
-  while (condition.GetParameters().size() < instrInfos.parameters.GetParametersCount()) {
+  while (condition.GetParameters().size() < instrInfos.parameters.size()) {
     vector<gd::Expression> parameters = condition.GetParameters();
     parameters.push_back(gd::Expression(""));
     condition.SetParameters(parameters);
   }
 
-  gd::EventsCodeGenerator::CheckBehaviorParameters(condition, instrInfos);
   // Verify that there are no mismatches between object type in parameters.
-  for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
-    if (ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType())) {
+  for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
+    if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType())) {
       gd::String objectInParameter =
           condition.GetParameter(pNb).GetPlainString();
 
-      const auto &expectedObjectType =
-          instrInfos.parameters.GetParameter(pNb).GetExtraInfo();
-      const auto &actualObjectType =
-          GetObjectsContainersList().GetTypeOfObject(objectInParameter);
-      if (!GetObjectsContainersList().HasObjectOrGroupNamed(
-              objectInParameter)) {
-        gd::ProjectDiagnostic projectDiagnostic(
-            gd::ProjectDiagnostic::ErrorType::UnknownObject, "",
-            objectInParameter, "");
-        diagnosticReport->Add(projectDiagnostic);
+      if (!GetObjectsContainersList().HasObjectOrGroupNamed(objectInParameter)) {
         return "/* Unknown object - skipped. */";
-      } else if (!expectedObjectType.empty() &&
-                 actualObjectType != expectedObjectType) {
-        gd::ProjectDiagnostic projectDiagnostic(
-            gd::ProjectDiagnostic::ErrorType::MismatchedObjectType, "",
-            actualObjectType, expectedObjectType, objectInParameter);
-        diagnosticReport->Add(projectDiagnostic);
+      } else if (!instrInfos.parameters[pNb].GetExtraInfo().empty() &&
+                GetObjectsContainersList().GetTypeOfObject(objectInParameter) !=
+                     instrInfos.parameters[pNb].GetExtraInfo()) {
         return "/* Mismatched object type - skipped. */";
       }
     }
@@ -360,7 +336,7 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
 
   if (instrInfos.IsObjectInstruction()) {
     gd::String objectName = condition.GetParameter(0).GetPlainString();
-    if (!objectName.empty() && instrInfos.parameters.GetParametersCount() > 0) {
+    if (!objectName.empty() && !instrInfos.parameters.empty()) {
       std::vector<gd::String> realObjects =
           GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
       for (std::size_t i = 0; i < realObjects.size(); ++i) {
@@ -388,22 +364,15 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
       }
     }
   } else if (instrInfos.IsBehaviorInstruction()) {
-    if (instrInfos.parameters.GetParametersCount() >= 2) {
-      const gd::String &objectName = condition.GetParameter(0).GetPlainString();
-      const gd::String &behaviorName =
-          condition.GetParameter(1).GetPlainString();
-      const gd::String &actualBehaviorType =
-          GetObjectsContainersList().GetTypeOfBehavior(behaviorName);
-
+    gd::String objectName = condition.GetParameter(0).GetPlainString();
+    gd::String behaviorType = GetObjectsContainersList().GetTypeOfBehavior(condition.GetParameter(1).GetPlainString());
+    if (instrInfos.parameters.size() >= 2) {
       std::vector<gd::String> realObjects =
-          GetObjectsContainersList().ExpandObjectName(
-              objectName, context.GetCurrentObject());
-
-      const BehaviorMetadata &autoInfo =
-          MetadataProvider::GetBehaviorMetadata(platform, actualBehaviorType);
-
+          GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
       for (std::size_t i = 0; i < realObjects.size(); ++i) {
         // Setup context
+        const BehaviorMetadata& autoInfo =
+            MetadataProvider::GetBehaviorMetadata(platform, behaviorType);
         AddIncludeFiles(autoInfo.includeFiles);
         context.SetCurrentObject(realObjects[i]);
         context.ObjectsListNeeded(realObjects[i]);
@@ -413,7 +382,7 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
             condition.GetParameters(), instrInfos.parameters, context);
         conditionCode += GenerateBehaviorCondition(
             realObjects[i],
-            behaviorName,
+            condition.GetParameter(1).GetPlainString(),
             autoInfo,
             arguments,
             instrInfos,
@@ -488,33 +457,6 @@ gd::String EventsCodeGenerator::GenerateConditionsListCode(
   return outputCode;
 }
 
-void EventsCodeGenerator::CheckBehaviorParameters(
-    const gd::Instruction &instruction,
-    const gd::InstructionMetadata &instrInfos) {
-  gd::ParameterMetadataTools::IterateOverParameters(
-      instruction.GetParameters(), instrInfos.parameters,
-      [this](const gd::ParameterMetadata &parameterMetadata,
-             const gd::Expression &parameterValue,
-             const gd::String &lastObjectName) {
-        if (ParameterMetadata::IsBehavior(parameterMetadata.GetType())) {
-          const gd::String &behaviorName = parameterValue.GetPlainString();
-          const gd::String &actualBehaviorType =
-              GetObjectsContainersList().GetTypeOfBehaviorInObjectOrGroup(
-                  lastObjectName, behaviorName);
-          const gd::String &expectedBehaviorType =
-              parameterMetadata.GetExtraInfo();
-
-          if (!expectedBehaviorType.empty() &&
-              actualBehaviorType != expectedBehaviorType) {
-            gd::ProjectDiagnostic projectDiagnostic(
-                gd::ProjectDiagnostic::ErrorType::MissingBehavior, "",
-                actualBehaviorType, expectedBehaviorType, lastObjectName);
-            diagnosticReport->Add(projectDiagnostic);
-          }
-        }
-      });
-}
-
 /**
  * Generate code for an action.
  */
@@ -546,35 +488,21 @@ gd::String EventsCodeGenerator::GenerateActionCode(
           : instrInfos.codeExtraInformation.functionCallName;
 
   // Be sure there is no lack of parameter.
-  while (action.GetParameters().size() < instrInfos.parameters.GetParametersCount()) {
+  while (action.GetParameters().size() < instrInfos.parameters.size()) {
     vector<gd::Expression> parameters = action.GetParameters();
     parameters.push_back(gd::Expression(""));
     action.SetParameters(parameters);
   }
 
-  gd::EventsCodeGenerator::CheckBehaviorParameters(action, instrInfos);
   // Verify that there are no mismatches between object type in parameters.
-  for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
-    if (ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType())) {
+  for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
+    if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType())) {
       gd::String objectInParameter = action.GetParameter(pNb).GetPlainString();
-
-      const auto &expectedObjectType =
-          instrInfos.parameters.GetParameter(pNb).GetExtraInfo();
-      const auto &actualObjectType =
-          GetObjectsContainersList().GetTypeOfObject(objectInParameter);
-      if (!GetObjectsContainersList().HasObjectOrGroupNamed(
-              objectInParameter)) {
-        gd::ProjectDiagnostic projectDiagnostic(
-            gd::ProjectDiagnostic::ErrorType::UnknownObject, "",
-            objectInParameter, "");
-        diagnosticReport->Add(projectDiagnostic);
+      if (!GetObjectsContainersList().HasObjectOrGroupNamed(objectInParameter)) {
         return "/* Unknown object - skipped. */";
-      } else if (!expectedObjectType.empty() &&
-                 actualObjectType != expectedObjectType) {
-        gd::ProjectDiagnostic projectDiagnostic(
-            gd::ProjectDiagnostic::ErrorType::MismatchedObjectType, "",
-            actualObjectType, expectedObjectType, objectInParameter);
-        diagnosticReport->Add(projectDiagnostic);
+      } else if (!instrInfos.parameters[pNb].GetExtraInfo().empty() &&
+                 GetObjectsContainersList().GetTypeOfObject(objectInParameter) !=
+                     instrInfos.parameters[pNb].GetExtraInfo()) {
         return "/* Mismatched object type - skipped. */";
       }
     }
@@ -584,7 +512,7 @@ gd::String EventsCodeGenerator::GenerateActionCode(
   if (instrInfos.IsObjectInstruction()) {
     gd::String objectName = action.GetParameter(0).GetPlainString();
 
-    if (instrInfos.parameters.GetParametersCount() > 0) {
+    if (!instrInfos.parameters.empty()) {
       std::vector<gd::String> realObjects =
           GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
       for (std::size_t i = 0; i < realObjects.size(); ++i) {
@@ -612,22 +540,17 @@ gd::String EventsCodeGenerator::GenerateActionCode(
       }
     }
   } else if (instrInfos.IsBehaviorInstruction()) {
-    if (instrInfos.parameters.GetParametersCount() >= 2) {
-      const gd::String &objectName = action.GetParameter(0).GetPlainString();
-      const gd::String &behaviorName = action.GetParameter(1).GetPlainString();
-      const gd::String &actualBehaviorType =
-          GetObjectsContainersList().GetTypeOfBehavior(behaviorName);
+    gd::String objectName = action.GetParameter(0).GetPlainString();
+    gd::String behaviorType = GetObjectsContainersList().GetTypeOfBehavior(action.GetParameter(1).GetPlainString());
 
+    if (instrInfos.parameters.size() >= 2) {
       std::vector<gd::String> realObjects =
-          GetObjectsContainersList().ExpandObjectName(
-              objectName, context.GetCurrentObject());
-
-      const BehaviorMetadata &autoInfo =
-          MetadataProvider::GetBehaviorMetadata(platform, actualBehaviorType);
-
-      AddIncludeFiles(autoInfo.includeFiles);
+          GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
       for (std::size_t i = 0; i < realObjects.size(); ++i) {
         // Setup context
+        const BehaviorMetadata& autoInfo =
+            MetadataProvider::GetBehaviorMetadata(platform, behaviorType);
+        AddIncludeFiles(autoInfo.includeFiles);
         context.SetCurrentObject(realObjects[i]);
         context.ObjectsListNeeded(realObjects[i]);
 
@@ -636,7 +559,7 @@ gd::String EventsCodeGenerator::GenerateActionCode(
             action.GetParameters(), instrInfos.parameters, context);
         actionCode +=
             GenerateBehaviorAction(realObjects[i],
-                                   behaviorName,
+                                   action.GetParameter(1).GetPlainString(),
                                    autoInfo,
                                    functionCallName,
                                    arguments,
@@ -660,29 +583,6 @@ gd::String EventsCodeGenerator::GenerateActionCode(
   return actionCode;
 }
 
-gd::String EventsCodeGenerator::GenerateLocalVariablesStackAccessor() {
-  return (HasProjectAndLayout() ? GetCodeNamespace()
-                                : "eventsFunctionContext") +
-         ".localVariables";
-}
-
-gd::String EventsCodeGenerator::GenerateAnyOrSceneVariableGetter(
-    const gd::Expression &variableExpression,
-    EventsCodeGenerationContext &context) {
-  const auto variableName = gd::ExpressionVariableNameFinder::GetVariableName(
-      *variableExpression.GetRootNode());
-
-  gd::String variableParameterType =
-      GetProjectScopedContainers().GetVariablesContainersList().Has(
-          variableName)
-          ? "variable"
-          : "scenevar";
-
-  return gd::ExpressionCodeGenerator::GenerateExpressionCode(
-      *this, context, variableParameterType,
-      variableExpression.GetPlainString(), "", "AllowUndeclaredVariable");
-}
-
 const EventsCodeGenerator::CallbackDescriptor
 EventsCodeGenerator::GenerateCallback(
     const gd::String& callbackID,
@@ -707,23 +607,14 @@ EventsCodeGenerator::GenerateCallback(
     actionsCode += "} //End of subevents\n";
   }
 
-  gd::String restoreLocalVariablesCode;
-  restoreLocalVariablesCode +=
-      "asyncObjectsList.restoreLocalVariablesContainers(" +
-      GenerateLocalVariablesStackAccessor() + ");\n";
-
   // Compose the callback function and add outside main
   const gd::String actionsDeclarationsCode =
       GenerateObjectsDeclarationCode(callbackContext);
 
-  const gd::String clearLocalVariablesCode =
-      GenerateLocalVariablesStackAccessor() + ".length = 0;\n";
-
   const gd::String callbackCode = callbackFunctionName + " = function (" +
                                   GenerateEventsParameters(callbackContext) +
-                                  ") {\n" + restoreLocalVariablesCode +
-                                  actionsDeclarationsCode + actionsCode +
-                                  clearLocalVariablesCode + "}\n";
+                                  ") {\n" + actionsDeclarationsCode +
+                                  actionsCode + "}\n";
 
   AddCustomCodeOutsideMain(callbackCode);
 
@@ -786,13 +677,13 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
 
   if (ParameterMetadata::IsExpression("number", metadata.GetType())) {
     argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
-        *this, context, "number", parameter, lastObjectName, metadata.GetExtraInfo());
+        *this, context, "number", parameter, lastObjectName);
   } else if (ParameterMetadata::IsExpression("string", metadata.GetType())) {
     argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
-        *this, context, "string", parameter, lastObjectName, metadata.GetExtraInfo());
+        *this, context, "string", parameter, lastObjectName);
   } else if (ParameterMetadata::IsExpression("variable", metadata.GetType())) {
     argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
-        *this, context, metadata.GetType(), parameter, lastObjectName, metadata.GetExtraInfo());
+        *this, context, metadata.GetType(), parameter, lastObjectName);
   } else if (ParameterMetadata::IsObject(metadata.GetType())) {
     // It would be possible to run a gd::ExpressionCodeGenerator if later
     // objects can have nested objects, or function returning objects.
@@ -804,8 +695,7 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
   } else if (metadata.GetType() == "operator") {
     argOutput += parameter.GetPlainString();
     if (argOutput != "=" && argOutput != "+" && argOutput != "-" &&
-        argOutput != "/" && argOutput != "*" && argOutput != "True" &&
-        argOutput != "False" && argOutput != "Toggle") {
+        argOutput != "/" && argOutput != "*") {
       cout << "Warning: Bad operator: Set to = by default." << endl;
       argOutput = "=";
     }
@@ -824,11 +714,9 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
              metadata.GetType() == "tilesetResource" ||
              metadata.GetType() == "videoResource" ||
              metadata.GetType() == "model3DResource" ||
-             metadata.GetType() == "atlasResource" ||
-             metadata.GetType() == "spineResource" ||
              // Deprecated, old parameter names:
              metadata.GetType() == "password" || metadata.GetType() == "musicfile" ||
-             metadata.GetType() == "soundfile") {
+             metadata.GetType() == "soundfile" || metadata.GetType() == "police") {
     argOutput = "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
   } else if (metadata.GetType() == "mouse") {
     argOutput = "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
@@ -870,7 +758,7 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
 
 vector<gd::String> EventsCodeGenerator::GenerateParametersCodes(
     const vector<gd::Expression>& parameters,
-    const ParameterMetadataContainer& parametersInfo,
+    const vector<gd::ParameterMetadata>& parametersInfo,
     EventsCodeGenerationContext& context,
     std::vector<std::pair<gd::String, gd::String> >*
         supplementaryParametersTypes) {
@@ -975,11 +863,6 @@ gd::String EventsCodeGenerator::GenerateEventsListCode(
     gd::EventsList& events, EventsCodeGenerationContext& parentContext) {
   gd::String output;
   for (std::size_t eId = 0; eId < events.size(); ++eId) {
-    auto& event = events[eId];
-    if (event.HasVariables()) {
-      GetProjectScopedContainers().GetVariablesContainersList().Push(event.GetVariables());
-    }
-
     // Each event has its own context : Objects picked in an event are totally
     // different than the one picked in another.
     gd::EventsCodeGenerationContext newContext;
@@ -1000,17 +883,13 @@ gd::String EventsCodeGenerator::GenerateEventsListCode(
 
     auto& context = reuseParentContext ? reusedContext : newContext;
 
-    gd::String eventCoreCode = event.GenerateEventCode(*this, context);
+    gd::String eventCoreCode = events[eId].GenerateEventCode(*this, context);
     gd::String scopeBegin = GenerateScopeBegin(context);
     gd::String scopeEnd = GenerateScopeEnd(context);
     gd::String declarationsCode = GenerateObjectsDeclarationCode(context);
 
     output += "\n" + scopeBegin + "\n" + declarationsCode + "\n" +
               eventCoreCode + "\n" + scopeEnd + "\n";
-
-    if (event.HasVariables()) {
-      GetProjectScopedContainers().GetVariablesContainersList().Pop();
-    }
   }
 
   return output;
@@ -1107,10 +986,10 @@ gd::String EventsCodeGenerator::GenerateFreeCondition(
 
   // Add logical not if needed
   bool conditionAlreadyTakeCareOfInversion = false;
-  for (std::size_t i = 0; i < instrInfos.parameters.GetParametersCount();
+  for (std::size_t i = 0; i < instrInfos.parameters.size();
        ++i)  // Some conditions already have a "conditionInverted" parameter
   {
-    if (instrInfos.parameters.GetParameter(i).GetType() == "conditionInverted")
+    if (instrInfos.parameters[i].GetType() == "conditionInverted")
       conditionAlreadyTakeCareOfInversion = true;
   }
   if (!conditionAlreadyTakeCareOfInversion && conditionInverted)
@@ -1131,7 +1010,7 @@ gd::String EventsCodeGenerator::GenerateObjectCondition(
   // Prepare call
   // Add a static_cast if necessary
   gd::String objectFunctionCallNamePart =
-      (!instrInfos.parameters.GetParameter(0).GetExtraInfo().empty())
+      (!instrInfos.parameters[0].GetExtraInfo().empty())
           ? "static_cast<" + objInfo.className + "*>(" +
                 GetObjectListName(objectName, context) + "[i])->" +
                 instrInfos.codeExtraInformation.functionCallName
@@ -1186,13 +1065,7 @@ gd::String EventsCodeGenerator::GenerateFreeAction(
   // Generate call
   gd::String call;
   if (instrInfos.codeExtraInformation.type == "number" ||
-      instrInfos.codeExtraInformation.type == "string" ||
-      // Boolean actions declared with addExpressionAndConditionAndAction uses
-      // MutatorAndOrAccessor even though they don't declare an operator parameter.
-      // Boolean operators are only used with SetMutators or SetCustomCodeGenerator.
-      (instrInfos.codeExtraInformation.type == "boolean" &&
-       instrInfos.codeExtraInformation.accessType ==
-           gd::InstructionMetadata::ExtraInformation::AccessType::Mutators)) {
+      instrInfos.codeExtraInformation.type == "string") {
     if (instrInfos.codeExtraInformation.accessType ==
         gd::InstructionMetadata::ExtraInformation::MutatorAndOrAccessor)
       call = GenerateOperatorCall(
@@ -1376,8 +1249,7 @@ EventsCodeGenerator::EventsCodeGenerator(const gd::Project& project_,
       compilationForRuntime(false),
       maxCustomConditionsDepth(0),
       maxConditionsListsSize(0),
-      eventsListNextUniqueId(0),
-      diagnosticReport(nullptr){};
+      eventsListNextUniqueId(0){};
 
 EventsCodeGenerator::EventsCodeGenerator(
     const gd::Platform& platform_,
@@ -1391,7 +1263,6 @@ EventsCodeGenerator::EventsCodeGenerator(
       compilationForRuntime(false),
       maxCustomConditionsDepth(0),
       maxConditionsListsSize(0),
-      eventsListNextUniqueId(0),
-      diagnosticReport(nullptr){};
+      eventsListNextUniqueId(0){};
 
 }  // namespace gd

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h

@@ -3,7 +3,8 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
+#ifndef GDCORE_EVENTSCODEGENERATOR_H
+#define GDCORE_EVENTSCODEGENERATOR_H
 
 #include <set>
 #include <utility>
@@ -11,10 +12,8 @@
 
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/Instruction.h"
-#include "GDCore/Events/CodeGeneration/DiagnosticReport.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/String.h"
-
 namespace gd {
 class EventsList;
 class Expression;
@@ -128,7 +127,7 @@ class GD_CORE_API EventsCodeGenerator {
    */
   std::vector<gd::String> GenerateParametersCodes(
       const std::vector<gd::Expression>& parameters,
-      const ParameterMetadataContainer& parametersInfo,
+      const std::vector<gd::ParameterMetadata>& parametersInfo,
       EventsCodeGenerationContext& context,
       std::vector<std::pair<gd::String, gd::String> >*
           supplementaryParametersTypes = 0);
@@ -337,16 +336,6 @@ class GD_CORE_API EventsCodeGenerator {
     return projectScopedContainers;
   }
 
-  /**
-   * @brief Give access to the project scoped containers as code generation might
-   * push and pop variable containers (for local variables).
-   * This could be passed as a parameter recursively in code generation, but this requires
-   * heavy refactoring. Instead, we use this single instance.
-   */
-  gd::ProjectScopedContainers& GetProjectScopedContainers() {
-    return projectScopedContainers;
-  }
-
   /**
    * \brief Return true if the code generation is done for a given project and
    * layout. If not, this means that the code is generated for a function.
@@ -383,14 +372,6 @@ class GD_CORE_API EventsCodeGenerator {
    */
   size_t GetMaxConditionsListsSize() const { return maxConditionsListsSize; }
 
-  void SetDiagnosticReport(gd::DiagnosticReport* diagnosticReport_) {
-    diagnosticReport = diagnosticReport_;
-  }
-
-  gd::DiagnosticReport* GetDiagnosticReport() {
-    return diagnosticReport;
-  }
-
   /**
    * \brief Generate the full name for accessing to a boolean variable used for
    * conditions.
@@ -467,7 +448,7 @@ class GD_CORE_API EventsCodeGenerator {
    */
   virtual gd::String GetCodeNamespace() { return ""; };
 
-  enum VariableScope { LAYOUT_VARIABLE = 0, PROJECT_VARIABLE, OBJECT_VARIABLE, ANY_VARIABLE };
+  enum VariableScope { LAYOUT_VARIABLE = 0, PROJECT_VARIABLE, OBJECT_VARIABLE };
 
   /**
    * Generate a single unique number for the specified instruction.
@@ -497,20 +478,7 @@ class GD_CORE_API EventsCodeGenerator {
       const gd::String& lhs,
       const gd::String& rhs);
 
-  /**
-   * \brief Generate the code to access the local variables stack.
-   */
-  virtual gd::String GenerateLocalVariablesStackAccessor();
-
-  /**
-   * \brief Generate an any variable getter that fallbacks on scene variable for
-   * compatibility reason.
-   */
-  gd::String
-  GenerateAnyOrSceneVariableGetter(const gd::Expression &variableExpression,
-                                   EventsCodeGenerationContext &context);
-
-protected:
+ protected:
   virtual const gd::String GenerateRelationalOperatorCodes(
       const gd::String& operatorString);
 
@@ -528,7 +496,7 @@ protected:
   parameter -> string
    * - operator : Used to update a value using a setter and a getter -> string
    * - key, mouse, objectvar, scenevar, globalvar, password, musicfile,
-  soundfile -> string
+  soundfile, police -> string
    * - trueorfalse, yesorno -> boolean ( See GenerateTrue/GenerateFalse ).
    *
    * <br><br>
@@ -566,15 +534,11 @@ protected:
       const VariableScope& scope,
       gd::EventsCodeGenerationContext& context,
       const gd::String& objectName) {
-    // This code is only used as a mock.
-    // See the real implementation in GDJS.
     if (scope == LAYOUT_VARIABLE) {
       return "getLayoutVariable(" + variableName + ")";
 
     } else if (scope == PROJECT_VARIABLE) {
       return "getProjectVariable(" + variableName + ")";
-    } else if (scope == ANY_VARIABLE) {
-      return "getAnyVariable(" + variableName + ")";
     }
 
     return "getVariableForObject(" + objectName + ", " + variableName + ")";
@@ -815,10 +779,6 @@ protected:
   virtual gd::String GenerateGetBehaviorNameCode(
       const gd::String& behaviorName);
 
-  void CheckBehaviorParameters(
-      const gd::Instruction &instruction,
-      const gd::InstructionMetadata &instrInfos);
-
   const gd::Platform& platform;  ///< The platform being used.
 
   gd::ProjectScopedContainers projectScopedContainers;
@@ -849,9 +809,8 @@ protected:
       instructionUniqueIds;  ///< The unique ids generated for instructions.
   size_t eventsListNextUniqueId;  ///< The next identifier to use for an events
                                   ///< list function name.
-
-  gd::DiagnosticReport* diagnosticReport;
 };
 
 }  // namespace gd
 
+#endif  // GDCORE_EVENTSCODEGENERATOR_H

Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.cpp

@@ -31,7 +31,6 @@
 #include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/IDE/Events/ExpressionTypeFinder.h"
 #include "GDCore/IDE/Events/ExpressionVariableOwnerFinder.h"
-#include "GDCore/Events/CodeGeneration/DiagnosticReport.h"
 
 namespace gd {
 
@@ -40,8 +39,7 @@ gd::String ExpressionCodeGenerator::GenerateExpressionCode(
     EventsCodeGenerationContext& context,
     const gd::String& rootType,
     const gd::Expression& expression,
-    const gd::String& rootObjectName,
-    const gd::String& extraInfo) {
+    const gd::String& rootObjectName) {
   ExpressionCodeGenerator generator(rootType, rootObjectName, codeGenerator, context);
 
   auto node = expression.GetRootNode();
@@ -54,34 +52,13 @@ gd::String ExpressionCodeGenerator::GenerateExpressionCode(
 
   gd::ExpressionValidator validator(codeGenerator.GetPlatform(),
                                     codeGenerator.GetProjectScopedContainers(),
-                                    rootType,
-                                    extraInfo);
+                                    rootType);
   node->Visit(validator);
   if (!validator.GetFatalErrors().empty()) {
     std::cout << "Error: \"" << validator.GetFatalErrors()[0]->GetMessage()
               << "\" in: \"" << expression.GetPlainString() << "\" ("
               << rootType << ")" << std::endl;
 
-    auto *diagnosticReport = codeGenerator.GetDiagnosticReport();
-    if (diagnosticReport) {
-      for (auto *error : validator.GetFatalErrors()) {
-        if (error->GetType() ==
-                gd::ExpressionParserError::ErrorType::UndeclaredVariable ||
-            error->GetType() ==
-                gd::ExpressionParserError::ErrorType::UnknownIdentifier) {
-                  
-          const auto& variableName = error->GetActualValue();
-          if (!variableName.empty()) {
-            gd::ProjectDiagnostic projectDiagnostic(
-                gd::ProjectDiagnostic::ErrorType::UndeclaredVariable,
-                error->GetMessage(), error->GetActualValue(),
-                "", error->GetObjectName());
-            diagnosticReport->Add(projectDiagnostic);
-          }
-        }
-      }
-    }
-
     return generator.GenerateDefaultValue(rootType);
   }
 
@@ -133,13 +110,11 @@ void ExpressionCodeGenerator::OnVisitVariableNode(VariableNode& node) {
   if (gd::ParameterMetadata::IsExpression("variable", type)) {
     // The node is a variable inside an expression waiting for a *variable* to be returned, not its value.
     EventsCodeGenerator::VariableScope scope =
-        type == "variable"
-            ? gd::EventsCodeGenerator::ANY_VARIABLE
-        : type == "globalvar"
+        type == "globalvar"
             ? gd::EventsCodeGenerator::PROJECT_VARIABLE
-            : type == "scenevar"
+            : ((type == "scenevar")
                   ? gd::EventsCodeGenerator::LAYOUT_VARIABLE
-                  : gd::EventsCodeGenerator::OBJECT_VARIABLE;
+                  : gd::EventsCodeGenerator::OBJECT_VARIABLE);
 
     auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(codeGenerator.GetPlatform(),
                                           codeGenerator.GetObjectsContainersList(),
@@ -162,8 +137,19 @@ void ExpressionCodeGenerator::OnVisitVariableNode(VariableNode& node) {
 
       output += codeGenerator.GenerateVariableValueAs(type);
     }, [&]() {
-      output += codeGenerator.GenerateGetVariable(
-          node.name, gd::EventsCodeGenerator::ANY_VARIABLE, context, "");
+      if (!codeGenerator.HasProjectAndLayout()) {
+        gd::LogWarning("Tried to generate access to a variable without a project/scene - the code generator only works for global and scene variables for now.");
+        output += GenerateDefaultValue(type);
+        return;
+      }
+
+      // This could be adapted in the future if more scopes are supported.
+      EventsCodeGenerator::VariableScope scope = gd::EventsCodeGenerator::PROJECT_VARIABLE;
+      if (codeGenerator.GetProjectScopedContainers().GetVariablesContainersList().GetBottomMostVariablesContainer()->Has(node.name)) {
+        scope = gd::EventsCodeGenerator::LAYOUT_VARIABLE;
+      }
+
+      output += codeGenerator.GenerateGetVariable(node.name, scope, context, "");
       if (node.child) node.child->Visit(*this);
       output += codeGenerator.GenerateVariableValueAs(type);
     }, [&]() {
@@ -223,13 +209,11 @@ void ExpressionCodeGenerator::OnVisitIdentifierNode(IdentifierNode& node) {
         codeGenerator.GenerateObject(node.identifierName, type, context);
   } else if (gd::ParameterMetadata::IsExpression("variable", type)) {
       EventsCodeGenerator::VariableScope scope =
-        type == "variable"
-            ? gd::EventsCodeGenerator::ANY_VARIABLE
-        : type == "globalvar"
+          type == "globalvar"
               ? gd::EventsCodeGenerator::PROJECT_VARIABLE
-              : type == "scenevar"
+              : ((type == "scenevar")
                     ? gd::EventsCodeGenerator::LAYOUT_VARIABLE
-                    : gd::EventsCodeGenerator::OBJECT_VARIABLE;
+                    : gd::EventsCodeGenerator::OBJECT_VARIABLE);
 
       auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(codeGenerator.GetPlatform(),
                                             codeGenerator.GetObjectsContainersList(),
@@ -252,9 +236,19 @@ void ExpressionCodeGenerator::OnVisitIdentifierNode(IdentifierNode& node) {
         node.childIdentifierName, gd::EventsCodeGenerator::OBJECT_VARIABLE, context, node.identifierName);
       output += codeGenerator.GenerateVariableValueAs(type);
     }, [&]() {
-      output += codeGenerator.GenerateGetVariable(
-          node.identifierName, gd::EventsCodeGenerator::ANY_VARIABLE, context,
-          "");
+      if (!codeGenerator.HasProjectAndLayout()) {
+        gd::LogWarning("Tried to generate access to a variable without a project/scene - the code generator only works for global and scene variables for now.");
+        output += GenerateDefaultValue(type);
+        return;
+      }
+
+      // This could be adapted in the future if more scopes are supported at runtime.
+      EventsCodeGenerator::VariableScope scope = gd::EventsCodeGenerator::PROJECT_VARIABLE;
+      if (variablesContainersList.GetBottomMostVariablesContainer()->Has(node.identifierName)) {
+        scope = gd::EventsCodeGenerator::LAYOUT_VARIABLE;
+      }
+
+      output += codeGenerator.GenerateGetVariable(node.identifierName, scope, context, "");
       if (!node.childIdentifierName.empty()) {
         output += codeGenerator.GenerateVariableAccessor(node.childIdentifierName);
       }
@@ -430,11 +424,11 @@ gd::String ExpressionCodeGenerator::GenerateParametersCodes(
   size_t nonCodeOnlyParameterIndex = 0;
   gd::String parametersCode;
   for (std::size_t i = initialParameterIndex;
-       i < expressionMetadata.GetParameters().GetParametersCount();
+       i < expressionMetadata.parameters.size();
        ++i) {
     if (i != initialParameterIndex) parametersCode += ", ";
 
-    auto& parameterMetadata = expressionMetadata.GetParameters().GetParameter(i);
+    auto& parameterMetadata = expressionMetadata.parameters[i];
     if (!parameterMetadata.IsCodeOnly()) {
       if (nonCodeOnlyParameterIndex < parameters.size()) {
         auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(codeGenerator.GetPlatform(),

Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.h

@@ -59,8 +59,7 @@ class GD_CORE_API ExpressionCodeGenerator : public ExpressionParser2NodeWorker {
                                            EventsCodeGenerationContext& context,
                                            const gd::String& type,
                                            const gd::Expression& expression,
-                                           const gd::String& objectName = "",
-                                           const gd::String& extraInfo = "");
+                                           const gd::String& objectName = "");
 
   const gd::String& GetOutput() { return output; };
 

Core/GDCore/Events/Event.cpp

@@ -17,7 +17,6 @@
 namespace gd {
 
 EventsList BaseEvent::badSubEvents;
-VariablesContainer BaseEvent::badLocalVariables;
 std::vector<gd::String> BaseEvent::emptyDependencies;
 gd::String BaseEvent::emptySourceFile;
 
@@ -29,8 +28,6 @@ BaseEvent::BaseEvent()
 
 bool BaseEvent::HasSubEvents() const { return !GetSubEvents().IsEmpty(); }
 
-bool BaseEvent::HasVariables() const { return GetVariables().Count() > 0; }
-
 gd::String BaseEvent::GenerateEventCode(
     gd::EventsCodeGenerator& codeGenerator,
     gd::EventsCodeGenerationContext& context) {

Core/GDCore/Events/Event.h

@@ -3,7 +3,9 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
+#if defined(GD_IDE_ONLY)
+#ifndef GDCORE_EVENT_H
+#define GDCORE_EVENT_H
 
 #include <iostream>
 #include <memory>
@@ -24,7 +26,6 @@ class SerializerElement;
 class Instruction;
 class EventVisitor;
 class ReadOnlyEventVisitor;
-class VariablesContainer;
 }  // namespace gd
 
 namespace gd {
@@ -91,32 +92,6 @@ class GD_CORE_API BaseEvent {
    */
   bool HasSubEvents() const;
 
-  /**
-   * Derived class have to redefine this function, so as to return true, if they
-   * can have local variables.
-   */
-  virtual bool CanHaveVariables() const { return false; }
-
-  /**
-   * Return the local variables, if applicable.
-   */
-  virtual const gd::VariablesContainer& GetVariables() const {
-    return badLocalVariables;
-  };
-
-  /**
-   * Return the local variables, if applicable.
-   */
-  virtual gd::VariablesContainer& GetVariables() {
-    return badLocalVariables;
-  };
-
-  /**
-   * \brief Return true if the events has local variables.
-   * \warning This is only applicable when CanHaveVariables() return true.
-   */
-  bool HasVariables() const;
-
   /**
    * \brief Return a list of all conditions of the event.
    * \note Used to preprocess or search in the conditions.
@@ -326,7 +301,6 @@ class GD_CORE_API BaseEvent {
                     ///< Used for saving the event for instance.
 
   static gd::EventsList badSubEvents;
-  static gd::VariablesContainer badLocalVariables;
   static std::vector<gd::String> emptyDependencies;
   static gd::String emptySourceFile;
 };
@@ -351,3 +325,6 @@ class EmptyEvent : public BaseEvent {
 };
 
 }  // namespace gd
+
+#endif  // GDCORE_EVENT_H
+#endif

Core/GDCore/Events/EventsList.h

@@ -18,6 +18,7 @@ class BaseEvent;
 namespace gd {
 class SerializerElement;
 }
+class TiXmlElement;
 
 #undef CreateEvent
 

Core/GDCore/Events/Parsers/ExpressionParser2.h

@@ -38,7 +38,7 @@ using namespace gd::GrammarTerminals;
  * parser by refactoring out the dependency on gd::MetadataProvider (injecting
  * instead functions to be called to query supported functions).
  *
- * \see gd::ExpressionParserError
+ * \see gd::ExpressionParserDiagnostic
  * \see gd::ExpressionNode
  */
 class GD_CORE_API ExpressionParser2 {
@@ -277,11 +277,8 @@ class GD_CORE_API ExpressionParser2 {
 
   std::unique_ptr<VariableNode> Variable(const gd::String &name, gd::ExpressionParserLocation nameLocation) {
     auto variable = gd::make_unique<VariableNode>(name);
-
-    if (CheckIfChar(IsOpeningSquareBracket) || CheckIfChar(IsDot)) {
-      variable->child = VariableAccessorOrVariableBracketAccessor();
-      variable->child->parent = variable.get();
-    }
+    variable->child = VariableAccessorOrVariableBracketAccessor();
+    variable->child->parent = variable.get();
 
     variable->location = ExpressionParserLocation(
         nameLocation.GetStartPosition(), GetCurrentPosition());
@@ -305,12 +302,8 @@ class GD_CORE_API ExpressionParser2 {
                                "bracket for each opening bracket."));
       }
       SkipIfChar(IsClosingSquareBracket);
-
-      SkipAllWhitespaces();
-      if (CheckIfChar(IsOpeningSquareBracket) || CheckIfChar(IsDot)) {
-        child->child = VariableAccessorOrVariableBracketAccessor();
-        child->child->parent = child.get();
-      }
+      child->child = VariableAccessorOrVariableBracketAccessor();
+      child->child->parent = child.get();
       child->location =
           ExpressionParserLocation(childStartPosition, GetCurrentPosition());
 
@@ -322,15 +315,8 @@ class GD_CORE_API ExpressionParser2 {
       auto identifierAndLocation = ReadIdentifierName(/*allowDeprecatedSpacesInName=*/ false);
       auto child =
           gd::make_unique<VariableAccessorNode>(identifierAndLocation.name);
-      if (identifierAndLocation.name.empty()) {
-        child->diagnostic = RaiseSyntaxError(_("A name should be entered after the dot."));
-      }
-
-      SkipAllWhitespaces();
-      if (CheckIfChar(IsOpeningSquareBracket) || CheckIfChar(IsDot)) {
-        child->child = VariableAccessorOrVariableBracketAccessor();
-        child->child->parent = child.get();
-      }
+      child->child = VariableAccessorOrVariableBracketAccessor();
+      child->child->parent = child.get();
       child->nameLocation = identifierAndLocation.location;
       child->dotLocation = dotLocation;
       child->location =
@@ -339,11 +325,7 @@ class GD_CORE_API ExpressionParser2 {
       return std::move(child);
     }
 
-    // Should never happen, unless a node called this function without checking if the current character
-    // was a dot or an opening bracket - this means there is an error in the grammar.
-    auto unrecognisedNode = gd::make_unique<VariableAccessorOrVariableBracketAccessorNode>();
-    unrecognisedNode->diagnostic = RaiseSyntaxError(_("A dot or bracket was expected here."));
-    return std::move(unrecognisedNode);
+    return std::move(gd::make_unique<VariableAccessorOrVariableBracketAccessorNode>());
   }
 
   std::unique_ptr<FunctionCallNode> FreeFunction(
@@ -379,24 +361,18 @@ class GD_CORE_API ExpressionParser2 {
     const auto &childIdentifierNameLocation =
         childIdentifierAndLocation.location;
 
-    std::unique_ptr<gd::ExpressionParserError> emptyNameError = childIdentifierName.empty() ?
-      RaiseSyntaxError(_("A name should be entered after the dot.")) : nullptr;
-
     SkipAllWhitespaces();
 
     if (IsNamespaceSeparator()) {
       ExpressionParserLocation namespaceSeparatorLocation =
           SkipNamespaceSeparator();
       SkipAllWhitespaces();
-      auto behaviorFunction = BehaviorFunction(parentIdentifier,
+      return BehaviorFunction(parentIdentifier,
                               childIdentifierName,
                               parentIdentifierLocation,
                               parentIdentifierDotLocation,
                               childIdentifierNameLocation,
                               namespaceSeparatorLocation);
-
-      if (emptyNameError) behaviorFunction->diagnostic = std::move(emptyNameError);
-      return std::move(behaviorFunction);
     } else if (CheckIfChar(IsOpeningParenthesis)) {
       ExpressionParserLocation openingParenthesisLocation = SkipChar();
 
@@ -405,7 +381,7 @@ class GD_CORE_API ExpressionParser2 {
           childIdentifierName);
       auto parametersNode = Parameters(function.get(), parentIdentifier);
       function->parameters = std::move(parametersNode.parameters),
-      function->diagnostic = emptyNameError ? std::move(emptyNameError) : std::move(parametersNode.diagnostic);
+      function->diagnostic = std::move(parametersNode.diagnostic);
 
       function->location = ExpressionParserLocation(
           parentIdentifierLocation.GetStartPosition(), GetCurrentPosition());
@@ -418,8 +394,6 @@ class GD_CORE_API ExpressionParser2 {
       return std::move(function);
     } else if (CheckIfChar(IsDot) || CheckIfChar(IsOpeningSquareBracket)) {
       auto variable = gd::make_unique<VariableNode>(parentIdentifier);
-      variable->diagnostic = std::move(emptyNameError);
-
       auto child =
           gd::make_unique<VariableAccessorNode>(childIdentifierName);
       child->child = VariableAccessorOrVariableBracketAccessor();
@@ -445,7 +419,6 @@ class GD_CORE_API ExpressionParser2 {
     node->identifierNameLocation = parentIdentifierLocation;
     node->identifierNameDotLocation = parentIdentifierDotLocation;
     node->childIdentifierNameLocation = childIdentifierNameLocation;
-    node->diagnostic = std::move(emptyNameError);
     return std::move(node);
   }
 
@@ -518,6 +491,11 @@ class GD_CORE_API ExpressionParser2 {
     std::vector<std::unique_ptr<ExpressionNode>> parameters;
     gd::String lastObjectName = "";
 
+    // By convention, object is always the first parameter, and behavior the
+    // second one.
+    size_t parameterIndex =
+        WrittenParametersFirstIndex(objectName, behaviorName);
+
     bool previousCharacterIsParameterSeparator = false;
     while (!IsEndReached()) {
       SkipAllWhitespaces();
@@ -536,6 +514,7 @@ class GD_CORE_API ExpressionParser2 {
       SkipAllWhitespaces();
       previousCharacterIsParameterSeparator = CheckIfChar(IsParameterSeparator);
       SkipIfChar(IsParameterSeparator);
+      parameterIndex++;
     }
 
     ExpressionParserLocation invalidClosingParenthesisLocation;
@@ -547,28 +526,28 @@ class GD_CORE_API ExpressionParser2 {
   }
   ///@}
 
-  std::unique_ptr<ExpressionParserError> ValidateOperator(
+  std::unique_ptr<ExpressionParserDiagnostic> ValidateOperator(
       gd::String::value_type operatorChar) {
     if (operatorChar == '+' || operatorChar == '-' || operatorChar == '/' ||
         operatorChar == '*') {
-      return std::unique_ptr<ExpressionParserError>(nullptr);
+      return gd::make_unique<ExpressionParserDiagnostic>();
     }
     return gd::make_unique<ExpressionParserError>(
-        gd::ExpressionParserError::ErrorType::InvalidOperator,
+        "invalid_operator",
         _("You've used an operator that is not supported. Operator should be "
           "either +, -, / or *."),
         GetCurrentPosition());
   }
 
-  std::unique_ptr<ExpressionParserError> ValidateUnaryOperator(
+  std::unique_ptr<ExpressionParserDiagnostic> ValidateUnaryOperator(
       gd::String::value_type operatorChar,
       size_t position) {
     if (operatorChar == '+' || operatorChar == '-') {
-      return std::unique_ptr<ExpressionParserError>(nullptr);
+      return gd::make_unique<ExpressionParserDiagnostic>();
     }
 
     return gd::make_unique<ExpressionParserError>(
-        gd::ExpressionParserError::ErrorType::InvalidOperator,
+        "invalid_operator",
         _("You've used an \"unary\" operator that is not supported. Operator "
           "should be "
           "either + or -."),
@@ -719,15 +698,13 @@ class GD_CORE_API ExpressionParser2 {
   std::unique_ptr<ExpressionParserError> RaiseSyntaxError(
       const gd::String &message) {
     return std::move(gd::make_unique<ExpressionParserError>(
-        gd::ExpressionParserError::ErrorType::SyntaxError, message,
-        GetCurrentPosition()));
+        "syntax_error", message, GetCurrentPosition()));
   }
 
   std::unique_ptr<ExpressionParserError> RaiseTypeError(
       const gd::String &message, size_t beginningPosition) {
     return std::move(gd::make_unique<ExpressionParserError>(
-        gd::ExpressionParserError::ErrorType::MismatchedType, message,
-        beginningPosition, GetCurrentPosition()));
+        "type_error", message, beginningPosition, GetCurrentPosition()));
   }
   ///@}
 

Core/GDCore/Events/Parsers/ExpressionParser2Node.cpp

@@ -6,5 +6,5 @@
 #include "ExpressionParser2Node.h"
 
 namespace gd {
-
+gd::String ExpressionParserDiagnostic::noMessage = "";
 }

Core/GDCore/Events/Parsers/ExpressionParser2Node.h

@@ -3,14 +3,14 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
+#ifndef GDCORE_EXPRESSIONPARSER2NODES_H
+#define GDCORE_EXPRESSIONPARSER2NODES_H
 
 #include <memory>
 #include <vector>
 
 #include "ExpressionParser2NodeWorker.h"
 #include "GDCore/String.h"
-
 namespace gd {
 class Expression;
 class ObjectsContainer;
@@ -40,57 +40,50 @@ struct GD_CORE_API ExpressionParserLocation {
   size_t endPosition;
 };
 
+/**
+ * \brief A diagnostic that can be attached to a gd::ExpressionNode.
+ */
+struct GD_CORE_API ExpressionParserDiagnostic {
+  virtual ~ExpressionParserDiagnostic() = default;
+  virtual bool IsError() { return false; }
+  virtual const gd::String &GetMessage() { return noMessage; }
+  virtual size_t GetStartPosition() { return 0; }
+  virtual size_t GetEndPosition() { return 0; }
+
+ private:
+  static gd::String noMessage;
+};
+
 /**
  * \brief An error that can be attached to a gd::ExpressionNode.
  */
-struct GD_CORE_API ExpressionParserError {
-  enum ErrorType {
-    SyntaxError,
-    InvalidOperator,
-    MismatchedType,
-    UndeclaredVariable,
-    UnknownIdentifier,
-    BracketsNotAllowedForObjects,
-    TooFewParameters,
-    TooManyParameters,
-    InvalidFunctionName,
-    MalformedVariableParameter,
-    MalformedObjectParameter,
-    UnknownParameterType,
-    MissingBehavior,
-    VariableNameCollision,
-  };
-
-  ExpressionParserError(gd::ExpressionParserError::ErrorType type_,
+struct GD_CORE_API ExpressionParserError : public ExpressionParserDiagnostic {
+  ExpressionParserError(const gd::String &type_,
                         const gd::String &message_,
-                        const ExpressionParserLocation &location_,
-                        const gd::String &actualValue_ = "",
-                        const gd::String &objectName_ = "")
-      : type(type_), message(message_), location(location_),
-        actualValue(actualValue_), objectName(objectName_){};
-  ExpressionParserError(gd::ExpressionParserError::ErrorType type_,
-                        const gd::String &message_, size_t position_)
+                        const ExpressionParserLocation &location_)
+      : type(type_), message(message_), location(location_){};
+  ExpressionParserError(const gd::String &type_,
+                        const gd::String &message_,
+                        size_t position_)
       : type(type_), message(message_), location(position_){};
-  ExpressionParserError(gd::ExpressionParserError::ErrorType type_,
-                        const gd::String &message_, size_t startPosition_,
+  ExpressionParserError(const gd::String &type_,
+                        const gd::String &message_,
+                        size_t startPosition_,
                         size_t endPosition_)
-      : type(type_), message(message_),
+      : type(type_),
+        message(message_),
         location(startPosition_, endPosition_){};
   virtual ~ExpressionParserError(){};
 
-  gd::ExpressionParserError::ErrorType GetType() { return type; }
-  const gd::String &GetMessage() { return message; }
-  const gd::String &GetObjectName() { return objectName; }
-  const gd::String &GetActualValue() { return actualValue; }
-  size_t GetStartPosition() { return location.GetStartPosition(); }
-  size_t GetEndPosition() { return location.GetEndPosition(); }
+  bool IsError() override { return true; }
+  const gd::String &GetMessage() override { return message; }
+  size_t GetStartPosition() override { return location.GetStartPosition(); }
+  size_t GetEndPosition() override { return location.GetEndPosition(); }
 
-private:
-  gd::ExpressionParserError::ErrorType type;
+ private:
+  gd::String type;
   gd::String message;
   ExpressionParserLocation location;
-  gd::String objectName;
-  gd::String actualValue;
 };
 
 /**
@@ -102,7 +95,7 @@ struct GD_CORE_API ExpressionNode {
   virtual ~ExpressionNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker){};
 
-  std::unique_ptr<ExpressionParserError> diagnostic;
+  std::unique_ptr<ExpressionParserDiagnostic> diagnostic;
   ExpressionParserLocation location;  ///< The location of the entire node. Some
                                       /// nodes might have other locations
                                       /// stored inside them. For example, a
@@ -432,3 +425,5 @@ struct GD_CORE_API EmptyNode : public FunctionCallOrObjectFunctionNameOrEmptyNod
 };
 
 }  // namespace gd
+
+#endif

Core/GDCore/Events/Parsers/ExpressionParser2NodePrinter.h

@@ -8,7 +8,6 @@
 
 #include <memory>
 #include <vector>
-
 #include "GDCore/Events/Parsers/ExpressionParser2Node.h"
 #include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
 namespace gd {
@@ -44,11 +43,6 @@ class GD_CORE_API ExpressionParser2NodePrinter
    */
   const gd::String& GetOutput() { return output; };
 
-  static gd::String PrintStringLiteral(const gd::String& str) {
-    return "\"" +
-           str.FindAndReplace("\\", "\\\\").FindAndReplace("\"", "\\\"") + "\"";
-  }
-
  protected:
   void OnVisitSubExpressionNode(SubExpressionNode& node) override {
     output += "(";
@@ -75,7 +69,10 @@ class GD_CORE_API ExpressionParser2NodePrinter
   }
   void OnVisitNumberNode(NumberNode& node) override { output += node.number; }
   void OnVisitTextNode(TextNode& node) override {
-    output += PrintStringLiteral(node.text);
+    output +=
+        "\"" +
+        node.text.FindAndReplace("\\", "\\\\").FindAndReplace("\"", "\\\"") +
+        "\"";
   }
   void OnVisitVariableNode(VariableNode& node) override {
     output += node.name;
@@ -100,8 +97,8 @@ class GD_CORE_API ExpressionParser2NodePrinter
   }
   void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {
     if (!node.behaviorFunctionName.empty()) {
-      output += node.objectName + "." + node.objectFunctionOrBehaviorName +
-                "::" + node.behaviorFunctionName;
+      output +=
+          node.objectName + "." + node.objectFunctionOrBehaviorName + "::" + node.behaviorFunctionName;
     } else {
       output += node.objectName + "." + node.objectFunctionOrBehaviorName;
     }

Core/GDCore/Events/Serialization.cpp

@@ -182,10 +182,10 @@ void EventsListSerialization::UpdateInstructionsFromGD2x(
     // Common updates for some parameters
     const std::vector<gd::Expression>& parameters = instr.GetParameters();
     for (std::size_t j = 0;
-         j < parameters.size() && j < metadata.parameters.GetParametersCount();
+         j < parameters.size() && j < metadata.parameters.size();
          ++j) {
-      if (metadata.parameters.GetParameter(j).GetType() == "relationalOperator" ||
-          metadata.parameters.GetParameter(j).GetType() == "operator") {
+      if (metadata.parameters[j].GetType() == "relationalOperator" ||
+          metadata.parameters[j].GetType() == "operator") {
         if (j == parameters.size() - 1) {
           std::cout << "ERROR: No more parameters after a [relational]operator "
                        "when trying to update an instruction from GD2.x";

Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp

@@ -66,7 +66,19 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
       .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
-  // Deprecated
+  extension
+      .AddAction("SetReturnObject",
+                 _("Set returned objects"),
+                 _("Set currently picked instances as the ones returned for the object. These instances will be picked for actions, conditions and sub-events that follow this function call."),
+                 _("Set currently picked instances of _PARAM0_ to be returned"),
+                 _("Functions"),
+                 "res/function24.png",
+                 "res/function16.png")
+      .SetHelpPath("/events/functions/return")
+      .AddParameter("object", "Picked instances object")
+      .SetRelevantForFunctionEventsOnly()
+      .MarkAsAdvanced();
+
   extension
       .AddAction("CopyArgumentToVariable",
                  _("Copy function parameter to variable"),
@@ -79,25 +91,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
       .SetHelpPath("/events/functions/return")
       .AddParameter("functionParameterName", _("Parameter name"), "variable")
       .AddParameter("scenevar", _("Scene variable"))
-      .SetHidden()
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("CopyArgumentToVariable2",
-                 _("Copy function parameter to variable"),
-                 _("Copy a function parameter (also called \"argument\") to a variable. "
-                 "The parameter type must be a variable."),
-                 _("Copy the parameter _PARAM0_ into the variable _PARAM1_"),
-                 "",
-                 "res/function32.png",
-                 "res/function32.png")
-      .SetHelpPath("/events/functions/return")
-      .AddParameter("functionParameterName", _("Parameter name"), "variable")
-      .AddParameter("variable", _("Variable"))
       .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
-  // Deprecated
   extension
       .AddAction("CopyVariableToArgument",
                  _("Copy variable to function parameter"),
@@ -110,21 +106,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
       .SetHelpPath("/events/functions/return")
       .AddParameter("functionParameterName", _("Parameter name"), "variable")
       .AddParameter("scenevar", _("Scene variable"))
-      .SetHidden()
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("CopyVariableToArgument2",
-                 _("Copy variable to function parameter"),
-                 _("Copy a variable to function parameter (also called \"argument\"). "
-                 "The parameter type must be a variable."),
-                 _("Copy the variable _PARAM1_ into the parameter _PARAM0_"),
-                 "",
-                 "res/function32.png",
-                 "res/function32.png")
-      .SetHelpPath("/events/functions/return")
-      .AddParameter("functionParameterName", _("Parameter name"), "variable")
-      .AddParameter("variable", _("Variable"))
       .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -417,93 +417,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .SetDefaultValue("\"\"")
       .MarkAsAdvanced();
 
-  obj.AddAction("SetNumberObjectVariable",
-                _("Change variable value"),
-                _("Modify the number value of an object variable."),
-                _("the variable _PARAM1_"),
-                _("Variables"),
-                "res/actions/var24.png",
-                "res/actions/var.png")
-
-      .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
-      .SetRelevantForLayoutEventsOnly();
-
-  obj.AddAction("SetStringObjectVariable",
-                _("Change text variable"),
-                _("Modify the text of an object variable."),
-                _("the variable _PARAM1_"),
-                _("Variables"),
-                "res/actions/var24.png",
-                "res/actions/var.png")
-
-      .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
-      .UseStandardOperatorParameters("string",
-                                     ParameterOptions::MakeNewOptions())
-      .SetRelevantForLayoutEventsOnly();
-
-  obj.AddAction("SetBooleanObjectVariable",
-                _("Change boolean variable"),
-                _("Modify the boolean value of an object variable."),
-                _("Change the variable _PARAM1_ of _PARAM0_: _PARAM2_"),
-                _("Variables"),
-                "res/actions/var24.png",
-                "res/actions/var.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
-      .AddParameter("operator", _("Value"), "boolean")
-      // This parameter allows to keep the operand expression
-      // when the editor switch between variable instructions.
-      .AddCodeOnlyParameter("yesorno", _("Value"))
-      .SetRelevantForLayoutEventsOnly();
-
-  obj.AddCondition("NumberObjectVariable",
-                   _("Variable value"),
-                   _("Compare the number value of an object variable."),
-                   _("the variable _PARAM1_"),
-                   _("Variables"),
-                   "res/conditions/var24.png",
-                   "res/conditions/var.png")
-
-      .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
-      .SetRelevantForLayoutEventsOnly();
-
-  obj.AddCondition("StringObjectVariable",
-                   _("Text variable"),
-                   _("Compare the text of an object variable."),
-                   _("the variable _PARAM1_"),
-                   _("Variables"),
-                   "res/conditions/var24.png",
-                   "res/conditions/var.png")
-
-      .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
-      .UseStandardRelationalOperatorParameters(
-          "string", ParameterOptions::MakeNewOptions())
-      .SetRelevantForLayoutEventsOnly();
-
-  obj.AddCondition("BooleanObjectVariable",
-                   _("Boolean variable"),
-                   _("Compare the boolean value of an object variable."),
-                   _("The variable _PARAM1_ of _PARAM0_ is _PARAM2_"),
-                   _("Variables"),
-                   "res/conditions/var24.png",
-                   "res/conditions/var.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
-      .AddParameter("trueorfalse", _("Check if the value is"))
-      .SetDefaultValue("true")
-      // This parameter allows to keep the operand expression
-      // when the editor switch between variable instructions.
-      .AddCodeOnlyParameter("yesorno", _("Value"))
-      .SetRelevantForLayoutEventsOnly();
-
   obj.AddAction("ModVarObjet",
                 _("Change number variable"),
                 _("Modify the number value of an object variable."),
@@ -515,8 +428,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
       .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly();
+                                     ParameterOptions::MakeNewOptions());
 
   obj.AddAction("ModVarObjetTxt",
                 _("Change text variable"),
@@ -529,8 +441,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
       .UseStandardOperatorParameters("string",
-                                     ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly();
+                                     ParameterOptions::MakeNewOptions());
 
   obj.AddAction("SetObjectVariableAsBoolean",
                 _("Change boolean variable"),
@@ -543,8 +454,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
-      .AddParameter("trueorfalse", _("New Value:"))
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("trueorfalse", _("New Value:"));
 
   obj.AddAction(
          "ToggleObjectVariableAsBoolean",
@@ -559,8 +469,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          "res/actions/var.png")
 
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("objectvar", _("Variable"));
 
   obj.AddCondition("ObjectVariableChildExists",
                    _("Child existence"),
@@ -748,8 +657,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly();
+          "number", ParameterOptions::MakeNewOptions());
 
   obj.AddCondition("VarObjetTxt",
                    _("Text variable"),
@@ -762,8 +670,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
-          "string", ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly();
+          "string", ParameterOptions::MakeNewOptions());
 
   obj.AddCondition("ObjectVariableAsBoolean",
                    _("Boolean variable"),
@@ -776,8 +683,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
       .AddParameter("trueorfalse", _("Check if the value is"))
-      .SetDefaultValue("true")
-      .SetRelevantForFunctionEventsOnly();
+      .SetDefaultValue("true");
 
   obj.AddCondition("VarObjetDef",
                    "Variable defined",
@@ -791,48 +697,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("string", _("Variable"))
       .SetHidden();  // Deprecated.
 
-  obj.AddAction(
-         "PushStringToObjectVariable",
-         _("Add text variable"),
-         _("Adds a text (string) to the end of an object array variable."),
-         _("Add value _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Arrays and structures"),
-         "res/actions/var24.png",
-         "res/actions/var.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Array variable"))
-      .AddParameter("string", _("Text to add"))
-      .MarkAsAdvanced()
-      .SetRelevantForLayoutEventsOnly();
-
-  obj.AddAction("PushNumberToObjectVariable",
-                _("Add variable array value"),
-                _("Adds a number to the end of an object array variable."),
-                _("Add value _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-                _("Variables/Arrays and structures"),
-                "res/actions/var24.png",
-                "res/actions/var.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Array variable"))
-      .AddParameter("expression", _("Number to add"))
-      .MarkAsAdvanced()
-      .SetRelevantForLayoutEventsOnly();
-
-  obj.AddAction(
-         "PushBooleanToObjectVariable",
-         _("Add boolean variable"),
-         _("Adds a boolean to the end of an object array variable."),
-         _("Add value _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Arrays and structures"),
-         "res/actions/var24.png",
-         "res/actions/var.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Array variable"))
-      .AddParameter("trueorfalse", _("Boolean to add"))
-      .MarkAsAdvanced()
-      .SetRelevantForLayoutEventsOnly();
-
-  // Deprecated
   obj.AddAction(
          "ObjectVariablePush",
          _("Add existing variable"),
@@ -844,23 +708,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("scenevar", _("Scene variable with the content to add"))
-      .SetParameterLongDescription(_("The content of the object variable will "
-                                     "*be copied* and added at the "
-                                     "end of the array."))
-      .MarkAsAdvanced()
-      .SetHidden();
-
-  obj.AddAction(
-         "ObjectVariablePush2",
-         _("Add existing variable"),
-         _("Adds an existing variable to the end of an object array variable."),
-         _("Add variable _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Arrays and structures"),
-         "res/actions/var24.png",
-         "res/actions/var.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Array variable"))
-      .AddParameter("variable", _("Scene variable with the content to add"))
       .SetParameterLongDescription(_("The content of the object variable will "
                                      "*be copied* and added at the "
                                      "end of the array."))
@@ -877,8 +724,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("string", _("Text to add"))
-      .MarkAsAdvanced()
-      .SetRelevantForFunctionEventsOnly();
+      .MarkAsAdvanced();
 
   obj.AddAction("ObjectVariablePushNumber",
                 _("Add number variable"),
@@ -890,8 +736,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("expression", _("Number to add"))
-      .MarkAsAdvanced()
-      .SetRelevantForFunctionEventsOnly();
+      .MarkAsAdvanced();
 
   obj.AddAction(
          "ObjectVariablePushBool",
@@ -904,8 +749,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("trueorfalse", _("Boolean to add"))
-      .MarkAsAdvanced()
-      .SetRelevantForFunctionEventsOnly();
+      .MarkAsAdvanced();
 
   obj.AddAction(
          "ObjectVariableRemoveAt",
@@ -1359,8 +1203,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                     _("Variables"),
                     "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("objectvar", _("Variable"));
 
   obj.AddExpression(
          "VariableChildCount",
@@ -1377,8 +1220,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                        _("Variables"),
                        "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("objectvar", _("Variable"));
 
   obj.AddExpression("ObjectTimerElapsedTime",
                     _("Object timer value"),
@@ -1439,8 +1281,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Enable an effect on the object"),
                 _("Enable effect _PARAM1_ on _PARAM0_: _PARAM2_"),
                 _("Effects"),
-                "res/actions/effect_black.svg",
-                "res/actions/effect_black.svg")
+                "res/actions/effect24.png",
+                "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
       .AddParameter("yesorno", _("Enable?"))
@@ -1455,8 +1297,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "names) in the effects window."),
                 _("Set _PARAM2_ to _PARAM3_ for effect _PARAM1_ of _PARAM0_"),
                 _("Effects"),
-                "res/actions/effect_black.svg",
-                "res/actions/effect_black.svg")
+                "res/actions/effect24.png",
+                "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
       .AddParameter("objectEffectParameterName", _("Property name"))
@@ -1473,8 +1315,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "names) in the effects window."),
                 _("Set _PARAM2_ to _PARAM3_ for effect _PARAM1_ of _PARAM0_"),
                 _("Effects"),
-                "res/actions/effect_black.svg",
-                "res/actions/effect_black.svg")
+                "res/actions/effect24.png",
+                "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
       .AddParameter("objectEffectParameterName", _("Property name"))
@@ -1490,8 +1332,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "names) in the effects window."),
                 _("Enable _PARAM2_ for effect _PARAM1_ of _PARAM0_: _PARAM3_"),
                 _("Effects"),
-                "res/actions/effect_black.svg",
-                "res/actions/effect_black.svg")
+                "res/actions/effect24.png",
+                "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
       .AddParameter("objectEffectParameterName", _("Property name"))
@@ -1505,8 +1347,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Check if the effect on an object is enabled."),
                    _("Effect _PARAM1_ of _PARAM0_ is enabled"),
                    _("Effects"),
-                   "res/actions/effect_black.svg",
-                   "res/actions/effect_black.svg")
+                   "res/actions/effect24.png",
+                   "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
       .MarkAsSimple()
@@ -1782,7 +1624,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           _("Cast a ray from _PARAM1_;_PARAM2_, angle: _PARAM3_ and max "
             "distance: _PARAM4_px, against _PARAM0_, and save the "
             "result in _PARAM5_, _PARAM6_"),
-          _("Collision"),
+          "",
           "res/conditions/raycast24.png",
           "res/conditions/raycast.png")
       .AddParameter("objectList", _("Objects to test against the ray"))
@@ -1813,7 +1655,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           _("Cast a ray from _PARAM1_;_PARAM2_ to _PARAM3_;_PARAM4_ "
             "against _PARAM0_, and save the "
             "result in _PARAM5_, _PARAM6_"),
-          _("Collision"),
+          "",
           "res/conditions/raycast24.png",
           "res/conditions/raycast.png")
       .AddParameter("objectList", _("Objects to test against the ray"))

Core/GDCore/Extensions/Builtin/CameraExtension.cpp

@@ -27,7 +27,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
   extension.AddInstructionOrExpressionGroupMetadata(_("Layers and cameras"))
       .SetIcon("res/conditions/camera24.png");
   extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
-      .SetIcon("res/actions/effect_black.svg");
+      .SetIcon("res/actions/effect24.png");
 
   extension
       .AddExpressionAndConditionAndAction(
@@ -327,25 +327,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
 
-  extension
-      .AddCondition(
-          "CameraZoom",
-          _("Camera zoom"),
-          _("Compare the zoom of a camera of a layer."),
-          _("Zoom of camera _PARAM2_ of layer _PARAM1_"),
-          "",
-          "res/conditions/camera24.png",
-          "res/conditions/camera.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0")
-      .UseStandardRelationalOperatorParameters(
-          "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
-              _("Zoom")))
-      .MarkAsAdvanced();
-
+  // TODO Deprecated: hide this action in a future release.
   extension
       .AddAction(
           "FixCamera",
@@ -357,7 +339,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/actions/camera24.png",
           "res/actions/camera.png")
-      .SetHidden()
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("objectPtr", _("Object"))
       .AddParameter("expression",
@@ -405,7 +386,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("Center the camera on an object"),
                  _("Center the camera on the specified object."),
                  _("Center camera on _PARAM1_ (layer: _PARAM3_)"),
-                 _("Layers and cameras"),
+                 "",
                  "res/actions/camera24.png",
                  "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -469,8 +450,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
           _("Effects"),
-          "res/actions/effect_black.svg",
-          "res/actions/effect_black.svg")
+          "res/actions/effect24.png",
+          "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
@@ -488,8 +469,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
           _("Effects"),
-          "res/actions/effect_black.svg",
-          "res/actions/effect_black.svg")
+          "res/actions/effect24.png",
+          "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
@@ -507,8 +488,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Enable _PARAM3_ for effect _PARAM2_ of layer _PARAM1_: _PARAM4_"),
           _("Effects"),
-          "res/actions/effect_black.svg",
-          "res/actions/effect_black.svg")
+          "res/actions/effect24.png",
+          "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
@@ -523,8 +504,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     _("The effect on a layer is enabled"),
                     _("Effect _PARAM2_ on layer _PARAM1_ is enabled"),
                     _(""),
-                    "res/actions/effect_black.svg",
-                    "res/actions/effect_black.svg")
+                    "res/actions/effect24.png",
+                    "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
@@ -537,8 +518,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("Enable an effect on a layer"),
                  _("Enable effect _PARAM2_ on layer _PARAM1_: _PARAM3_"),
                  _("Effects"),
-                 "res/actions/effect_black.svg",
-                 "res/actions/effect_black.svg")
+                 "res/actions/effect24.png",
+                 "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
@@ -567,7 +548,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
   extension
       .AddAction(
           "ChangeLayerTimeScale",
-          _("Layer time scale"),
+          _("Change layer time scale"),
           _("Change the time scale applied to the objects of the layer."),
           _("Set the time scale of layer _PARAM1_ to _PARAM2_"),
           "",
@@ -613,7 +594,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
   extension
       .AddAction(
           "SetLayerAmbientLightColor",
-          _("Ambient light color"),
+          _("Set the ambient light color"),
           _("Set the ambient light color of the lighting layer in format "
             "\"R;G;B\" string."),
           _("Set the ambient color of the lighting layer _PARAM1_ to _PARAM2_"),

Core/GDCore/Extensions/Builtin/Capabilities/AnimatableExtension.cpp

@@ -44,7 +44,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
          "number",
          "Index",
          _("Animation (by number)"),
-         _("the animation played by the object using the animation number (from "
+         _("the number of the animation played by the object (the number from "
            "the animations list)"),
          _("the number of the animation"),
          _("Animations and images"),

Core/GDCore/Extensions/Builtin/Capabilities/EffectExtension.cpp

@@ -24,7 +24,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
   extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
-      .SetIcon("res/actions/effect_black.svg");
+      .SetIcon("res/actions/effect24.png");
 
   gd::BehaviorMetadata& aut = extension.AddBehavior(
       "EffectBehavior",
@@ -32,7 +32,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
       "Effect",
       _("Apply visual effects to objects."),
       "",
-      "res/actions/effect_black.svg",
+      "res/actions/effect24.png",
       "EffectBehavior",
       std::make_shared<gd::Behavior>(),
       std::make_shared<gd::BehaviorsSharedData>())
@@ -43,8 +43,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                 _("Enable an effect on the object"),
                 _("Enable effect _PARAM2_ on _PARAM0_: _PARAM3_"),
                 _("Effects"),
-                "res/actions/effect_black.svg",
-                "res/actions/effect_black.svg")
+                "res/actions/effect24.png",
+                "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "EffectBehavior")
       .AddParameter("objectEffectName", _("Effect name"))
@@ -58,8 +58,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                       "names) in the effects window."),
                 _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of _PARAM0_"),
                 _("Effects"),
-                "res/actions/effect_black.svg",
-                "res/actions/effect_black.svg")
+                "res/actions/effect24.png",
+                "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "EffectBehavior")
       .AddParameter("objectEffectName", _("Effect name"))
@@ -75,8 +75,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                       "names) in the effects window."),
                 _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of _PARAM0_"),
                 _("Effects"),
-                "res/actions/effect_black.svg",
-                "res/actions/effect_black.svg")
+                "res/actions/effect24.png",
+                "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "EffectBehavior")
       .AddParameter("objectEffectName", _("Effect name"))
@@ -91,8 +91,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                       "names) in the effects window."),
                 _("Enable _PARAM3_ for effect _PARAM2_ of _PARAM0_: _PARAM4_"),
                 _("Effects"),
-                "res/actions/effect_black.svg",
-                "res/actions/effect_black.svg")
+                "res/actions/effect24.png",
+                "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "EffectBehavior")
       .AddParameter("objectEffectName", _("Effect name"))
@@ -105,8 +105,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                    _("Check if the effect on an object is enabled."),
                    _("Effect _PARAM2_ of _PARAM0_ is enabled"),
                    _("Effects"),
-                   "res/actions/effect_black.svg",
-                   "res/actions/effect_black.svg")
+                   "res/actions/effect24.png",
+                   "res/actions/effect.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "EffectBehavior")
       .AddParameter("objectEffectName", _("Effect name"))

Core/GDCore/Extensions/Builtin/Capabilities/FlippableExtension.cpp

@@ -24,7 +24,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFlippableExtension(
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
   extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
-      .SetIcon("res/actions/effect_black.svg");
+      .SetIcon("res/actions/effect24.png");
 
   gd::BehaviorMetadata& aut = extension.AddBehavior(
       "FlippableBehavior",

Core/GDCore/Extensions/Builtin/CommonConversionsExtension.cpp

@@ -68,22 +68,19 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
 
   extension
       .AddStrExpression("ToJSON",
-                        _("Convert variable to JSON"),
-                        _("Convert a variable to JSON"),
+                        _("Convert scene variable to JSON"),
+                        _("Convert a scene variable to JSON"),
                         _("JSON"),
                         "res/conditions/toujours24_black.png")
-      .AddParameter("variable", _("The variable to be stringified"),
-                    "AllowUndeclaredVariable");
+      .AddParameter("scenevar", _("Scene variable to be stringified"));
 
-  // Deprecated
   extension
       .AddStrExpression("GlobalVarToJSON",
                         _("Convert global variable to JSON"),
                         _("Convert a global variable to JSON"),
                         _("JSON"),
                         "res/conditions/toujours24_black.png")
-      .AddParameter("globalvar", _("The global variable to be stringified"))
-      .SetHidden();
+      .AddParameter("globalvar", _("The global variable to be stringified"));
 
   extension
       .AddStrExpression("ObjectVarToJSON",
@@ -94,7 +91,6 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
       .AddParameter("objectPtr", _("The object with the variable"))
       .AddParameter("objectvar", _("The object variable to be stringified"));
 
-  // Deprecated
   extension
       .AddAction(
           "JSONToVariableStructure",
@@ -106,10 +102,8 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
           "res/actions/net.png")
       .AddParameter("string", _("JSON string"))
       .AddParameter("scenevar", _("Variable where store the JSON object"))
-      .MarkAsAdvanced()
-      .SetHidden();
+      .MarkAsAdvanced();
 
-  // Deprecated
   extension
       .AddAction("JSONToGlobalVariableStructure",
                  _("Convert JSON to global variable"),
@@ -122,20 +116,6 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
       .AddParameter("string", _("JSON string"))
       .AddParameter("globalvar",
                     _("Global variable where store the JSON object"))
-      .MarkAsAdvanced()
-      .SetHidden();
-
-  extension
-      .AddAction(
-          "JSONToVariableStructure2",
-          _("Convert JSON to a variable"),
-          _("Parse a JSON object and store it into a variable"),
-          _("Convert JSON string _PARAM0_ and store it into variable _PARAM1_"),
-          "",
-          "res/actions/net24.png",
-          "res/actions/net.png")
-      .AddParameter("string", _("JSON string"))
-      .AddParameter("variable", _("Variable where to store the JSON object"))
       .MarkAsAdvanced();
 
   extension

Core/GDCore/Extensions/Builtin/FileExtension.cpp

@@ -98,7 +98,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
       .AddParameter("string", _("Group"))
       .AddParameter("string", _("Text"));
 
-  // Deprecated
   extension
       .AddAction(
           "LireFichierExp",
@@ -115,27 +114,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
       .AddParameter("string", _("Storage name"))
       .AddParameter("string", _("Group"))
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("scenevar", _("Scene variable"))
-      .SetHidden();
+      .AddParameter("scenevar", _("Scene variables"));
 
-  extension
-      .AddAction(
-          "ReadNumberFromStorage",
-          _("Load a value"),
-          _("Load the value saved in the specified element and store it in a "
-            "variable.\nSpecify the structure leading to the element using / "
-            "(example : Root/Level/Current)\nSpaces are forbidden in element "
-            "names."),
-          _("Load _PARAM1_ from storage _PARAM0_ and store value in _PARAM3_"),
-          "",
-          "res/actions/fichier24.png",
-          "res/actions/fichier.png")
-      .AddParameter("string", _("Storage name"))
-      .AddParameter("string", _("Group"))
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("variable", _("Variable"));
-
-  // Deprecated
   extension
       .AddAction(
           "LireFichierTxt",
@@ -153,26 +133,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
       .AddParameter("string", _("Storage name"))
       .AddParameter("string", _("Group"))
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("scenevar", _("Scene variable"))
-      .SetHidden();
-
-  extension
-      .AddAction(
-          "ReadStringFromStorage",
-          _("Load a text"),
-          _("Load the text saved in the specified element and store it in a "
-            "variable.\nSpecify the structure leading to the element using / "
-            "(example : Root/Level/Current)\nSpaces are forbidden in element "
-            "names."),
-          _("Load _PARAM1_ from storage _PARAM0_ and store as text in "
-            "_PARAM3_"),
-          "",
-          "res/actions/fichier24.png",
-          "res/actions/fichier.png")
-      .AddParameter("string", _("Storage name"))
-      .AddParameter("string", _("Group"))
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("variable", _("Variable"));
+      .AddParameter("scenevar", _("Scene variables"));
 
   extension
       .AddAction("DeleteGroupFichier",

Core/GDCore/Extensions/Builtin/SceneExtension.cpp

@@ -5,7 +5,6 @@
  */
 #include "AllBuiltinExtensions.h"
 #include "GDCore/Tools/Localization.h"
-#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
 
 using namespace std;
 namespace gd {
@@ -58,7 +57,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
   extension
       .AddCondition("DoesSceneExist",
                     _("Does scene exist"),
-                    _("Check if a scene exists."),
+                    _("Check if scene exists."),
                     _("Scene _PARAM1_ exists"),
                     "",
                     "res/actions/texte.png",
@@ -164,45 +163,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
           "res/actions/window.png")
       .SetHelpPath("/interface/scene-editor/events")
       .AddCodeOnlyParameter("currentScene", "");
-
-  extension
-      .AddAction("PrioritizeLoadingOfScene",
-                 _("Preload scene"),
-                 _("Preload a scene resources as soon as possible in background."),
-                 _("Preload scene _PARAM1_ in background"),
-                 "",
-                 "res/actions/hourglass_black.svg",
-                 "res/actions/hourglass_black.svg")
-      .SetHelpPath("/all-features/resources-loading")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("sceneName", _("Name of the new scene"))
-      .MarkAsAdvanced();
-
-  extension.AddExpressionAndCondition("number",
-                                "SceneLoadingProgress",
-                                _("Scene loading progress"),
-                                _("The progress of resources loading in background for a scene (between 0 and 1)."),
-                                _("_PARAM0_ loading progress"),
-                                _(""),
-                                "res/actions/hourglass_black.svg")
-      .SetHelpPath("/all-features/resources-loading")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("sceneName", _("Scene name"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .MarkAsAdvanced();
-
-  extension
-      .AddCondition("AreSceneAssetsLoaded",
-                    _("Scene preloaded"),
-                    _("Check if scene resources have finished to load in background."),
-                    _("Scene _PARAM1_ was preloaded in background"),
-                    "",
-                    "res/actions/hourglass_black.svg",
-                    "res/actions/hourglass_black.svg")
-      .SetHelpPath("/all-features/resources-loading")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("sceneName", _("Scene name"))
-      .MarkAsAdvanced();
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/SpriteExtension/Animation.cpp

@@ -6,6 +6,8 @@
 
 #include "GDCore/Extensions/Builtin/SpriteExtension/Animation.h"
 #include <vector>
+#include "GDCore/Extensions/Builtin/SpriteExtension/Direction.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Sprite.h"
 #include "GDCore/String.h"
 
 namespace gd {

Core/GDCore/Extensions/Builtin/SpriteExtension/Animation.h

@@ -4,11 +4,13 @@
  * reserved. This project is released under the MIT License.
  */
 
-#pragma once
-
+#ifndef GDCORE_ANIMATION_H
+#define GDCORE_ANIMATION_H
 #include <vector>
 #include "GDCore/String.h"
-#include "GDCore/Extensions/Builtin/SpriteExtension/Direction.h"
+namespace gd {
+class Direction;
+}
 
 namespace gd {
 
@@ -91,3 +93,4 @@ class GD_CORE_API Animation {
 };
 
 }  // namespace gd
+#endif  // GDCORE_ANIMATION_H

Core/GDCore/Extensions/Builtin/SpriteExtension/Direction.h

@@ -3,12 +3,12 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
-
+#ifndef GDCORE_DIRECTION_H
+#define GDCORE_DIRECTION_H
 #include <vector>
 #include "GDCore/String.h"
-#include "GDCore/Extensions/Builtin/SpriteExtension/Sprite.h"
 namespace gd {
+class Sprite;
 class SerializerElement;
 }
 
@@ -142,3 +142,4 @@ class GD_CORE_API Direction {
 };
 
 }  // namespace gd
+#endif  // GDCORE_DIRECTION_H

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteAnimationList.cpp

@@ -1,164 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteAnimationList.h"
-
-#include <algorithm>
-
-#include "GDCore/CommonTools.h"
-#include "GDCore/Extensions/Builtin/SpriteExtension/Animation.h"
-#include "GDCore/Extensions/Builtin/SpriteExtension/Direction.h"
-#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
-#include "GDCore/Project/InitialInstance.h"
-#include "GDCore/Project/Layout.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/PropertyDescriptor.h"
-#include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/Tools/Localization.h"
-
-namespace gd {
-
-Animation SpriteAnimationList::badAnimation;
-
-SpriteAnimationList::SpriteAnimationList()
-    : adaptCollisionMaskAutomatically(true) {}
-
-SpriteAnimationList::~SpriteAnimationList(){};
-
-void SpriteAnimationList::UnserializeFrom(const gd::SerializerElement& element) {
-  adaptCollisionMaskAutomatically =
-      element.GetBoolAttribute("adaptCollisionMaskAutomatically", false);
-
-  RemoveAllAnimations();
-  const gd::SerializerElement& animationsElement =
-      element.GetChild("animations", 0, "Animations");
-  animationsElement.ConsiderAsArrayOf("animation", "Animation");
-  for (std::size_t i = 0; i < animationsElement.GetChildrenCount(); ++i) {
-    const gd::SerializerElement& animationElement =
-        animationsElement.GetChild(i);
-    Animation newAnimation;
-
-    newAnimation.useMultipleDirections = animationElement.GetBoolAttribute(
-        "useMultipleDirections", false, "typeNormal");
-    newAnimation.SetName(animationElement.GetStringAttribute("name", ""));
-
-    // Compatibility with GD <= 3.3
-    if (animationElement.HasChild("Direction")) {
-      for (std::size_t j = 0;
-           j < animationElement.GetChildrenCount("Direction");
-           ++j) {
-        Direction direction;
-        direction.UnserializeFrom(animationElement.GetChild("Direction", j));
-
-        newAnimation.SetDirectionsCount(newAnimation.GetDirectionsCount() + 1);
-        newAnimation.SetDirection(direction,
-                                  newAnimation.GetDirectionsCount() - 1);
-      }
-    }
-    // End of compatibility code
-    else {
-      const gd::SerializerElement& directionsElement =
-          animationElement.GetChild("directions");
-      directionsElement.ConsiderAsArrayOf("direction");
-      for (std::size_t j = 0; j < directionsElement.GetChildrenCount(); ++j) {
-        Direction direction;
-        direction.UnserializeFrom(directionsElement.GetChild(j));
-
-        newAnimation.SetDirectionsCount(newAnimation.GetDirectionsCount() + 1);
-        newAnimation.SetDirection(direction,
-                                  newAnimation.GetDirectionsCount() - 1);
-      }
-    }
-
-    AddAnimation(newAnimation);
-  }
-}
-
-void SpriteAnimationList::SerializeTo(gd::SerializerElement& element) const {
-  element.SetAttribute("adaptCollisionMaskAutomatically",
-                       adaptCollisionMaskAutomatically);
-
-  // Animations
-  gd::SerializerElement& animationsElement = element.AddChild("animations");
-  animationsElement.ConsiderAsArrayOf("animation");
-  for (std::size_t k = 0; k < GetAnimationsCount(); k++) {
-    gd::SerializerElement& animationElement =
-        animationsElement.AddChild("animation");
-
-    animationElement.SetAttribute("useMultipleDirections",
-                                  GetAnimation(k).useMultipleDirections);
-    animationElement.SetAttribute("name", GetAnimation(k).GetName());
-
-    gd::SerializerElement& directionsElement =
-        animationElement.AddChild("directions");
-    directionsElement.ConsiderAsArrayOf("direction");
-    for (std::size_t l = 0; l < GetAnimation(k).GetDirectionsCount(); l++) {
-      GetAnimation(k).GetDirection(l).SerializeTo(
-          directionsElement.AddChild("direction"));
-    }
-  }
-}
-
-void SpriteAnimationList::ExposeResources(gd::ArbitraryResourceWorker& worker) {
-  for (std::size_t j = 0; j < GetAnimationsCount(); j++) {
-    for (std::size_t k = 0; k < GetAnimation(j).GetDirectionsCount(); k++) {
-      for (std::size_t l = 0;
-           l < GetAnimation(j).GetDirection(k).GetSpritesCount();
-           l++) {
-        worker.ExposeImage(
-            GetAnimation(j).GetDirection(k).GetSprite(l).GetImageName());
-      }
-    }
-  }
-}
-
-bool SpriteAnimationList::HasAnimationNamed(const gd::String &name) const {
-  return !name.empty() && (find_if(animations.begin(), animations.end(),
-                                   [&name](const Animation &animation) {
-                                     return animation.GetName() == name;
-                                   }) != animations.end());
-}
-
-const Animation& SpriteAnimationList::GetAnimation(std::size_t nb) const {
-  if (nb >= animations.size()) return badAnimation;
-
-  return animations[nb];
-}
-
-Animation& SpriteAnimationList::GetAnimation(std::size_t nb) {
-  if (nb >= animations.size()) return badAnimation;
-
-  return animations[nb];
-}
-
-void SpriteAnimationList::AddAnimation(const Animation& animation) {
-  animations.push_back(animation);
-}
-
-bool SpriteAnimationList::RemoveAnimation(std::size_t nb) {
-  if (nb >= GetAnimationsCount()) return false;
-
-  animations.erase(animations.begin() + nb);
-  return true;
-}
-
-void SpriteAnimationList::SwapAnimations(std::size_t firstIndex,
-                                  std::size_t secondIndex) {
-  if (firstIndex < animations.size() && secondIndex < animations.size() &&
-      firstIndex != secondIndex)
-    std::swap(animations[firstIndex], animations[secondIndex]);
-}
-
-void SpriteAnimationList::MoveAnimation(std::size_t oldIndex, std::size_t newIndex) {
-  if (oldIndex >= animations.size() || newIndex >= animations.size()) return;
-
-  auto animation = animations[oldIndex];
-  animations.erase(animations.begin() + oldIndex);
-  animations.insert(animations.begin() + newIndex, animation);
-}
-
-}  // namespace gd

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteAnimationList.h

@@ -1,124 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#pragma once
-
-#include "GDCore/Extensions/Builtin/SpriteExtension/Animation.h"
-
-namespace gd {
-class InitialInstance;
-class SerializerElement;
-class PropertyDescriptor;
-class ArbitraryResourceWorker;
-}  // namespace gd
-
-namespace gd {
-
-/**
- * \brief A list of animations, containing directions with images and collision mask.
- * 
- * It's used in the configuration of object that implements image-based animations.
- *
- * \see Animation
- * \see Direction
- * \see Sprite
- * \ingroup SpriteObjectExtension
- */
-class GD_CORE_API SpriteAnimationList {
- public:
-  SpriteAnimationList();
-  virtual ~SpriteAnimationList();
-
-  void ExposeResources(gd::ArbitraryResourceWorker& worker);
-
-  /**
-   * \brief Return the animation at the specified index.
-   * If the index is out of bound, a "bad animation" object is returned.
-   */
-  const Animation& GetAnimation(std::size_t nb) const;
-
-  /**
-   * \brief Return the animation at the specified index.
-   * If the index is out of bound, a "bad animation" object is returned.
-   */
-  Animation& GetAnimation(std::size_t nb);
-
-  /**
-   * \brief Return the number of animations this object has.
-   */
-  std::size_t GetAnimationsCount() const { return animations.size(); };
-
-  /**
-   * \brief Return true if an animation exists for a given name.
-   */
-  bool HasAnimationNamed(const gd::String &name) const;
-
-  /**
-   * \brief Add an animation at the end of the existing ones.
-   */
-  void AddAnimation(const Animation& animation);
-
-  /**
-   * \brief Remove an animation.
-   */
-  bool RemoveAnimation(std::size_t nb);
-
-  /**
-   * \brief Remove all animations.
-   */
-  void RemoveAllAnimations() { animations.clear(); }
-
-  /**
-   * \brief Return true if the object hasn't any animation.
-   */
-  bool HasNoAnimations() const { return animations.empty(); }
-
-  /**
-   * \brief Swap the position of two animations
-   */
-  void SwapAnimations(std::size_t firstIndex, std::size_t secondIndex);
-
-  /**
-   * \brief Change the position of the specified animation
-   */
-  void MoveAnimation(std::size_t oldIndex, std::size_t newIndex);
-
-  /**
-   * \brief Return a read-only reference to the vector containing all the
-   * animation of the object.
-   */
-  const std::vector<Animation>& GetAllAnimations() const { return animations; }
-
-  /**
-   * @brief Check if the collision mask adapts automatically to the animation.
-   */
-  bool AdaptCollisionMaskAutomatically() const {
-    return adaptCollisionMaskAutomatically;
-  }
-
-  /**
-   * @brief Set if the collision mask adapts automatically to the animation.
-   */
-  void SetAdaptCollisionMaskAutomatically(bool enable) {
-    adaptCollisionMaskAutomatically = enable;
-  }
-
-  void UnserializeFrom(const gd::SerializerElement& element);
-  void SerializeTo(gd::SerializerElement& element) const;
-
- private:
-
-  mutable std::vector<Animation> animations;
-
-  static Animation badAnimation;         //< Bad animation when an out of bound
-                                         // animation is requested.
-  bool adaptCollisionMaskAutomatically;  ///< If set to true, the collision
-                                         ///< mask will be automatically
-                                         ///< adapted to the animation of the
-                                         ///< object.
-};
-
-}  // namespace gd

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.cpp

@@ -23,25 +23,88 @@
 
 namespace gd {
 
+Animation SpriteObject::badAnimation;
+
 SpriteObject::SpriteObject()
-    : updateIfNotVisible(false),
-      preScale(1) {}
+    : updateIfNotVisible(false), adaptCollisionMaskAutomatically(true) {}
 
 SpriteObject::~SpriteObject(){};
 
 void SpriteObject::DoUnserializeFrom(gd::Project& project,
                                      const gd::SerializerElement& element) {
   updateIfNotVisible = element.GetBoolAttribute("updateIfNotVisible", true);
-  preScale = element.GetDoubleAttribute("preScale", 1);
-  animations.UnserializeFrom(element);
+  adaptCollisionMaskAutomatically =
+      element.GetBoolAttribute("adaptCollisionMaskAutomatically", false);
+
+  RemoveAllAnimations();
+  const gd::SerializerElement& animationsElement =
+      element.GetChild("animations", 0, "Animations");
+  animationsElement.ConsiderAsArrayOf("animation", "Animation");
+  for (std::size_t i = 0; i < animationsElement.GetChildrenCount(); ++i) {
+    const gd::SerializerElement& animationElement =
+        animationsElement.GetChild(i);
+    Animation newAnimation;
+
+    newAnimation.useMultipleDirections = animationElement.GetBoolAttribute(
+        "useMultipleDirections", false, "typeNormal");
+    newAnimation.SetName(animationElement.GetStringAttribute("name", ""));
+
+    // Compatibility with GD <= 3.3
+    if (animationElement.HasChild("Direction")) {
+      for (std::size_t j = 0;
+           j < animationElement.GetChildrenCount("Direction");
+           ++j) {
+        Direction direction;
+        direction.UnserializeFrom(animationElement.GetChild("Direction", j));
+
+        newAnimation.SetDirectionsCount(newAnimation.GetDirectionsCount() + 1);
+        newAnimation.SetDirection(direction,
+                                  newAnimation.GetDirectionsCount() - 1);
+      }
+    }
+    // End of compatibility code
+    else {
+      const gd::SerializerElement& directionsElement =
+          animationElement.GetChild("directions");
+      directionsElement.ConsiderAsArrayOf("direction");
+      for (std::size_t j = 0; j < directionsElement.GetChildrenCount(); ++j) {
+        Direction direction;
+        direction.UnserializeFrom(directionsElement.GetChild(j));
+
+        newAnimation.SetDirectionsCount(newAnimation.GetDirectionsCount() + 1);
+        newAnimation.SetDirection(direction,
+                                  newAnimation.GetDirectionsCount() - 1);
+      }
+    }
+
+    AddAnimation(newAnimation);
+  }
 }
 
 void SpriteObject::DoSerializeTo(gd::SerializerElement& element) const {
   element.SetAttribute("updateIfNotVisible", updateIfNotVisible);
-  if (preScale != 1) {
-    element.SetAttribute("preScale", preScale);
+  element.SetAttribute("adaptCollisionMaskAutomatically",
+                       adaptCollisionMaskAutomatically);
+
+  // Animations
+  gd::SerializerElement& animationsElement = element.AddChild("animations");
+  animationsElement.ConsiderAsArrayOf("animation");
+  for (std::size_t k = 0; k < GetAnimationsCount(); k++) {
+    gd::SerializerElement& animationElement =
+        animationsElement.AddChild("animation");
+
+    animationElement.SetAttribute("useMultipleDirections",
+                                  GetAnimation(k).useMultipleDirections);
+    animationElement.SetAttribute("name", GetAnimation(k).GetName());
+
+    gd::SerializerElement& directionsElement =
+        animationElement.AddChild("directions");
+    directionsElement.ConsiderAsArrayOf("direction");
+    for (std::size_t l = 0; l < GetAnimation(k).GetDirectionsCount(); l++) {
+      GetAnimation(k).GetDirection(l).SerializeTo(
+          directionsElement.AddChild("direction"));
+    }
   }
-  animations.SerializeTo(element);
 }
 
 std::map<gd::String, gd::PropertyDescriptor> SpriteObject::GetProperties()
@@ -64,12 +127,23 @@ bool SpriteObject::UpdateProperty(const gd::String& name,
 }
 
 void SpriteObject::ExposeResources(gd::ArbitraryResourceWorker& worker) {
-  animations.ExposeResources(worker);
+  for (std::size_t j = 0; j < GetAnimationsCount(); j++) {
+    for (std::size_t k = 0; k < GetAnimation(j).GetDirectionsCount(); k++) {
+      for (std::size_t l = 0;
+           l < GetAnimation(j).GetDirection(k).GetSpritesCount();
+           l++) {
+        worker.ExposeImage(
+            GetAnimation(j).GetDirection(k).GetSprite(l).GetImageName());
+      }
+    }
+  }
 }
 
 std::map<gd::String, gd::PropertyDescriptor>
 SpriteObject::GetInitialInstanceProperties(
-    const gd::InitialInstance& initialInstance) {
+    const gd::InitialInstance& initialInstance,
+    gd::Project& project,
+    gd::Layout& scene) {
   std::map<gd::String, gd::PropertyDescriptor> properties;
   properties["animation"] =
       gd::PropertyDescriptor(
@@ -83,7 +157,9 @@ SpriteObject::GetInitialInstanceProperties(
 bool SpriteObject::UpdateInitialInstanceProperty(
     gd::InitialInstance& initialInstance,
     const gd::String& name,
-    const gd::String& value) {
+    const gd::String& value,
+    gd::Project& project,
+    gd::Layout& scene) {
   if (name == "animation") {
     initialInstance.SetRawDoubleProperty(
         "animation", std::max(0, value.empty() ? 0 : value.To<int>()));
@@ -92,25 +168,42 @@ bool SpriteObject::UpdateInitialInstanceProperty(
   return true;
 }
 
-size_t SpriteObject::GetAnimationsCount() const {
-  return animations.GetAnimationsCount();
+const Animation& SpriteObject::GetAnimation(std::size_t nb) const {
+  if (nb >= animations.size()) return badAnimation;
+
+  return animations[nb];
 }
 
-const gd::String &SpriteObject::GetAnimationName(size_t index) const {
-  return animations.GetAnimation(index).GetName();
+Animation& SpriteObject::GetAnimation(std::size_t nb) {
+  if (nb >= animations.size()) return badAnimation;
+
+  return animations[nb];
 }
 
-bool SpriteObject::HasAnimationNamed(
-    const gd::String &name) const {
-  return animations.HasAnimationNamed(name);
+void SpriteObject::AddAnimation(const Animation& animation) {
+  animations.push_back(animation);
 }
 
-const SpriteAnimationList& SpriteObject::GetAnimations() const {
-  return animations;
+bool SpriteObject::RemoveAnimation(std::size_t nb) {
+  if (nb >= GetAnimationsCount()) return false;
+
+  animations.erase(animations.begin() + nb);
+  return true;
 }
 
-SpriteAnimationList& SpriteObject::GetAnimations() {
-  return animations;
+void SpriteObject::SwapAnimations(std::size_t firstIndex,
+                                  std::size_t secondIndex) {
+  if (firstIndex < animations.size() && secondIndex < animations.size() &&
+      firstIndex != secondIndex)
+    std::swap(animations[firstIndex], animations[secondIndex]);
+}
+
+void SpriteObject::MoveAnimation(std::size_t oldIndex, std::size_t newIndex) {
+  if (oldIndex >= animations.size() || newIndex >= animations.size()) return;
+
+  auto animation = animations[oldIndex];
+  animations.erase(animations.begin() + oldIndex);
+  animations.insert(animations.begin() + newIndex, animation);
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h

@@ -4,15 +4,18 @@
  * reserved. This project is released under the MIT License.
  */
 
-#pragma once
-
-#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteAnimationList.h"
+#ifndef GDCORE_SPRITEOBJECT_H
+#define GDCORE_SPRITEOBJECT_H
+#include "GDCore/Extensions/Builtin/SpriteExtension/Animation.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Direction.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Sprite.h"
 #include "GDCore/Project/Object.h"
-
 namespace gd {
 class InitialInstance;
 class Object;
 class Layout;
+class Sprite;
+class Animation;
 class SerializerElement;
 class PropertyDescriptor;
 }  // namespace gd
@@ -47,26 +50,85 @@ class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
   bool UpdateProperty(const gd::String& name, const gd::String& value) override;
 
   std::map<gd::String, gd::PropertyDescriptor> GetInitialInstanceProperties(
-      const gd::InitialInstance& position) override;
+      const gd::InitialInstance& position,
+      gd::Project& project,
+      gd::Layout& scene) override;
   bool UpdateInitialInstanceProperty(gd::InitialInstance& position,
                                      const gd::String& name,
-                                     const gd::String& value) override;
+                                     const gd::String& value,
+                                     gd::Project& project,
+                                     gd::Layout& scene) override;
 
-  size_t GetAnimationsCount() const override;
-
-  const gd::String &GetAnimationName(size_t index) const override;
-
-  bool HasAnimationNamed(const gd::String &animationName) const override;
-  
-  /**
-   * \brief Return the animation configuration.
+  /** \name Animations
+   * Methods related to animations management
    */
-  const SpriteAnimationList& GetAnimations() const;
+  ///@{
+  /**
+   * \brief Return the animation at the specified index.
+   * If the index is out of bound, a "bad animation" object is returned.
+   */
+  const Animation& GetAnimation(std::size_t nb) const;
 
   /**
-   * @brief Return the animation configuration.
+   * \brief Return the animation at the specified index.
+   * If the index is out of bound, a "bad animation" object is returned.
    */
-  SpriteAnimationList& GetAnimations();
+  Animation& GetAnimation(std::size_t nb);
+
+  /**
+   * \brief Return the number of animations this object has.
+   */
+  std::size_t GetAnimationsCount() const { return animations.size(); };
+
+  /**
+   * \brief Add an animation at the end of the existing ones.
+   */
+  void AddAnimation(const Animation& animation);
+
+  /**
+   * \brief Remove an animation.
+   */
+  bool RemoveAnimation(std::size_t nb);
+
+  /**
+   * \brief Remove all animations.
+   */
+  void RemoveAllAnimations() { animations.clear(); }
+
+  /**
+   * \brief Return true if the object hasn't any animation.
+   */
+  bool HasNoAnimations() const { return animations.empty(); }
+
+  /**
+   * \brief Swap the position of two animations
+   */
+  void SwapAnimations(std::size_t firstIndex, std::size_t secondIndex);
+
+  /**
+   * \brief Change the position of the specified animation
+   */
+  void MoveAnimation(std::size_t oldIndex, std::size_t newIndex);
+
+  /**
+   * \brief Return a read-only reference to the vector containing all the
+   * animation of the object.
+   */
+  const std::vector<Animation>& GetAllAnimations() const { return animations; }
+
+  /**
+   * @brief Check if the collision mask adapts automatically to the animation.
+   */
+  bool AdaptCollisionMaskAutomatically() const {
+    return adaptCollisionMaskAutomatically;
+  }
+
+  /**
+   * @brief Set if the collision mask adapts automatically to the animation.
+   */
+  void SetAdaptCollisionMaskAutomatically(bool enable) {
+    adaptCollisionMaskAutomatically = enable;
+  }
 
   /**
    * \brief Set if the object animation should be played even if the object is
@@ -81,35 +143,25 @@ class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
    * is hidden or far from the camera (false by default).
    */
   bool GetUpdateIfNotVisible() const { return updateIfNotVisible; }
-
-  /**
-   * \brief Return the scale applied to object to evaluate the default dimensions.
-   */
-  double GetPreScale() { return preScale; }
-
-  /**
-   * \brief Set the scale applied to object to evaluate the default dimensions.
-   * 
-   * Its value must be strictly positive.
-   */
-  void SetPreScale(double preScale_) {
-    if (preScale_ <= 0) {
-      return;
-    }
-    preScale = preScale_;
-  }
+  ///@}
 
  private:
   void DoUnserializeFrom(gd::Project& project,
                          const gd::SerializerElement& element) override;
   void DoSerializeTo(gd::SerializerElement& element) const override;
 
-  SpriteAnimationList animations;
-
+  mutable std::vector<Animation> animations;
   bool updateIfNotVisible;  ///< If set to true, ask the game engine to play
                             ///< object animation even if hidden or far from
                             ///< the screen.
-  double preScale;
+
+  static Animation badAnimation;         //< Bad animation when an out of bound
+                                         // animation is requested.
+  bool adaptCollisionMaskAutomatically;  ///< If set to true, the collision
+                                         ///< mask will be automatically
+                                         ///< adapted to the animation of the
+                                         ///< object.
 };
 
 }  // namespace gd
+#endif  // GDCORE_SPRITEOBJECT_H

Core/GDCore/Extensions/Builtin/VariablesExtension.cpp

@@ -25,271 +25,29 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
   extension.AddInstructionOrExpressionGroupMetadata(_("Variables"))
       .SetIcon("res/conditions/var24.png");
 
-  extension
-      .AddCondition("NumberVariable",
-                    _("Variable value"),
-                    _("Compare the number value of a variable."),
-                    _("The variable _PARAM0_"),
-                    "",
-                    "res/conditions/var24.png",
-                    "res/conditions/var.png")
-      .AddParameter("variable", _("Variable"))
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions());
-
-  extension
-      .AddCondition("StringVariable",
-                    _("Variable value"),
-                    _("Compare the text (string) of a variable."),
-                    _("The variable _PARAM0_"),
-                    "",
-                    "res/conditions/var24.png",
-                    "res/conditions/var.png")
-      .AddParameter("variable", _("Variable"))
-      .UseStandardRelationalOperatorParameters(
-          "string", ParameterOptions::MakeNewOptions());
-
-  extension
-      .AddCondition(
-          "BooleanVariable",
-          _("Variable value"),
-          _("Compare the boolean value of a variable."),
-          _("The variable _PARAM0_ is _PARAM1_"),
-          "",
-          "res/conditions/var24.png",
-          "res/conditions/var.png")
-      .AddParameter("variable", _("Variable"))
-      .AddParameter("trueorfalse", _("Check if the value is"))
-      .SetDefaultValue("true")
-      // This parameter allows to keep the operand expression
-      // when the editor switch between variable instructions.
-      .AddCodeOnlyParameter("trueorfalse", "");
-
-  extension
-      .AddAction("SetNumberVariable",
-                 _("Change variable value"),
-                 _("Modify the number value of a variable."),
-                 _("the variable _PARAM0_"),
-                 "",
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("variable", _("Variable"))
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions());
-
-  extension
-      .AddAction("SetStringVariable",
-                 _("Change text variable"),
-                 _("Modify the text (string) of a variable."),
-                 _("the variable _PARAM0_"),
-                 "",
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("variable", _("Variable"))
-      .UseStandardOperatorParameters("string",
-                                     ParameterOptions::MakeNewOptions());
-
-  extension
-      .AddAction(
-          "SetBooleanVariable",
-          _("Change boolean variable"),
-          _("Modify the boolean value of a variable."),
-          _("Change the variable _PARAM0_: _PARAM1_"),
-          "",
-          "res/conditions/var24.png",
-          "res/conditions/var.png")
-      .AddParameter("variable", _("Variable"))
-      .AddParameter("operator", _("Value"), "boolean")
-      // This parameter allows to keep the operand expression
-      // when the editor switch between variable instructions.
-      .AddCodeOnlyParameter("trueorfalse", "");
-
-  extension
-      .AddCondition(
-          "VariableChildCount",
-          _("Number of children"),
-          _("Compare the number of children in an array variable."),
-          _("The number of children in the array variable _PARAM0_"),
-          _("Arrays and structures"),
-          "res/conditions/var24.png",
-          "res/conditions/var.png")
-      .AddParameter("variable", _("Array variable"))
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
-      .MarkAsAdvanced();
-
-  extension
-      .AddCondition("VariableChildExists2",
-                    _("Child existence"),
-                    _("Check if the specified child of the structure "
-                      "variable exists."),
-                    _("Child _PARAM1_ of variable _PARAM0_ exists"),
-                    _("Arrays and structures"),
-                    "res/conditions/var24.png",
-                    "res/conditions/var.png")
-      .AddParameter("variable", _("Variable"))
-      .AddParameter("string", _("Name of the child"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction(
-          "RemoveVariableChild",
-          _("Remove a child"),
-          _("Remove a child from a structure variable."),
-          _("Remove child _PARAM1_ from structure variable _PARAM0_"),
-          _("Arrays and structures"),
-          "res/actions/var24.png",
-          "res/actions/var.png")
-      .AddParameter("variable", _("Structure variable"))
-      .AddParameter("string", _("Child's name"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("ClearVariableChildren",
-                 _("Clear children"),
-                 _("Remove all the children from the structure or array "
-                   "variable."),
-                 _("Clear children from variable _PARAM0_"),
-                 _("Arrays and structures"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("variable", _("Structure or array variable"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("PushVariable",
-                 _("Add existing variable"),
-                 _("Adds an existing variable at the end of an array "
-                   "variable."),
-                 _("Add variable _PARAM1_ to array variable _PARAM0_"),
-                 _("Arrays and structures"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"))
-      .AddParameter("variable", _("Variable with the content to add"))
-      .SetParameterLongDescription(
-          _("The content of the variable will *be copied* and added at the "
-            "end of the array."))
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction(
-          "PushString",
-          _("Add text variable"),
-          _("Adds a text (string) at the end of a array variable."),
-          _("Add the value _PARAM1_ to array variable _PARAM0_"),
-          _("Arrays and structures"),
-          "res/actions/var24.png",
-          "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"))
-      .AddParameter("string", _("Text to add"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("PushNumber",
-                 _("Add variable array value"),
-                 _("Adds a number at the end of an array variable."),
-                 _("Add the value _PARAM1_ to array variable _PARAM0_"),
-                 _("Arrays and structures"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"))
-      .AddParameter("expression", _("Number to add"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("PushBoolean",
-                 _("Add boolean variable"),
-                 _("Adds a boolean at the end of an array variable."),
-                 _("Add the value _PARAM1_ to array variable _PARAM0_"),
-                 _("Arrays and structures"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"))
-      .AddParameter("trueorfalse", _("Boolean to add"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("RemoveVariableAt",
-                 _("Remove variable by index"),
-                 _("Removes a variable at the specified index of an array "
-                   "variable."),
-                 _("Remove variable at index _PARAM1_ from array "
-                   "variable _PARAM0_"),
-                 _("Arrays and structures"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"))
-      .AddParameter("expression", _("Index to remove"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddStrExpression(
-          "VariableFirstString",
-          _("First text child"),
-          _("Get the value of the first element of an array variable, if "
-            "it is a text (string)."),
-          _("Arrays and structures"),
-          "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"));
-
-  extension
-      .AddExpression(
-          "VariableFirstNumber",
-          _("First number child"),
-          _("Get the value of the first element of an array variable, if "
-            "it is a number."),
-          _("Arrays and structures"),
-          "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"));
-
-  extension
-      .AddStrExpression(
-          "VariableLastString",
-          _("Last text child"),
-          _("Get the value of the last element of an array variable, if "
-            "it is a text (string)."),
-          _("Arrays and structures"),
-          "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"));
-
-  extension
-      .AddExpression(
-          "VariableLastNumber",
-          _("Last number child"),
-          _("Get the value of the last element of an array variable, if "
-            "it is a number."),
-          _("Arrays and structures"),
-          "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"));
-
-  // Legacy instructions
-
   extension
       .AddCondition("VarScene",
                     _("Number variable"),
                     _("Compare the number value of a scene variable."),
                     _("The number of scene variable _PARAM0_"),
-                    _("External variables/Scene variables"),
+                    _("Scene variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly();
+          "number", ParameterOptions::MakeNewOptions());
 
   extension
       .AddCondition("VarSceneTxt",
                     _("Text variable"),
                     _("Compare the text (string) of a scene variable."),
                     _("The text of scene variable _PARAM0_"),
-                    _("External variables/Scene variables"),
+                    _("Scene variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
-          "string", ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly();
+          "string", ParameterOptions::MakeNewOptions());
 
   extension
       .AddCondition(
@@ -297,13 +55,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Boolean variable"),
           _("Compare the boolean value of a scene variable."),
           _("The boolean value of scene variable _PARAM0_ is _PARAM1_"),
-          _("External variables/Scene variables"),
+          _("Scene variables"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .AddParameter("trueorfalse", _("Check if the value is"))
-      .SetDefaultValue("true")
-      .SetRelevantForFunctionEventsOnly();
+      .SetDefaultValue("true");
 
   extension
       .AddCondition("VariableChildExists",
@@ -311,12 +68,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("Check if the specified child of the scene structure "
                       "variable exists."),
                     _("Child _PARAM1_ of scene variable _PARAM0_ exists"),
-                    _("External variables/Scene variables/Arrays and structures"),
+                    _("Scene variables/Arrays and structures"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .AddParameter("string", _("Name of the child"))
-      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -325,12 +81,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("Check if the specified child of the global structure "
                       "variable exists."),
                     _("Child _PARAM1_ of global variable _PARAM0_ exists"),
-                    _("External variables/Global variables/Arrays and structures"),
+                    _("Global variables/Arrays and structures"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .AddParameter("string", _("Name of the child"))
-      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -338,7 +93,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     "Variable defined",
                     "Test if the scene variable exists.",
                     "Scene variable _PARAM0_ is defined",
-                    _("External variables/Scene variables"),
+                    _("Scene variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -350,13 +105,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("Number variable"),
                     _("Compare the number value of a global variable."),
                     _("the global variable _PARAM0_"),
-                    _("External variables/Global variables"),
+                    _("Global variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -364,13 +118,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("Text variable"),
                     _("Compare the text (string) of a global variable."),
                     _("the text of the global variable _PARAM0_"),
-                    _("External variables/Global variables"),
+                    _("Global variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "string", ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -379,20 +132,19 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Boolean variable"),
           _("Compare the boolean value of a global variable."),
           _("The boolean value of global variable _PARAM0_ is _PARAM1_"),
-          _("External variables/Global variables"),
+          _("Global variables"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .AddParameter("trueorfalse", _("Check if the value is"))
-      .SetDefaultValue("true")
-      .SetRelevantForFunctionEventsOnly();
+      .SetDefaultValue("true");
 
   extension
       .AddCondition("VarGlobalDef",
                     "Variable defined",
                     "Test if a global variable exists.",
                     "Global variable _PARAM0_ is defined",
-                    _("External variables/Global variables"),
+                    _("Global variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -405,26 +157,24 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Change number variable"),
                  _("Modify the number value of a scene variable."),
                  _("the scene variable _PARAM0_"),
-                 _("External variables/Scene variables"),
+                 _("Scene variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly();
+                                     ParameterOptions::MakeNewOptions());
 
   extension
       .AddAction("ModVarSceneTxt",
                  _("Change text variable"),
                  _("Modify the text (string) of a scene variable."),
                  _("the text of scene variable _PARAM0_"),
-                 _("External variables/Scene variables"),
+                 _("Scene variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .UseStandardOperatorParameters("string",
-                                     ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly();
+                                     ParameterOptions::MakeNewOptions());
 
   extension
       .AddAction(
@@ -432,12 +182,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Change boolean variable"),
           _("Modify the boolean value of a scene variable."),
           _("Set the boolean value of scene variable _PARAM0_ to _PARAM1_"),
-          _("External variables/Scene variables"),
+          _("Scene variables"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .AddParameter("trueorfalse", _("New Value:"))
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("trueorfalse", _("New Value:"));
 
   extension
       .AddAction("ToggleSceneVariableAsBoolean",
@@ -446,24 +195,22 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                      _("If it was true, it will become false, and if it was "
                        "false it will become true."),
                  _("Toggle the boolean value of scene variable _PARAM0_"),
-                 _("External variables/Scene variables"),
+                 _("Scene variables"),
                  "res/conditions/var24.png",
                  "res/conditions/var.png")
-      .AddParameter("scenevar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("scenevar", _("Variable"));
 
   extension
       .AddAction("ModVarGlobal",
                  _("Change number variable"),
                  _("Modify the number value of a global variable."),
                  _("the global variable _PARAM0_"),
-                 _("External variables/Global variables"),
+                 _("Global variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .UseStandardOperatorParameters("number",
                                      ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -471,13 +218,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Change text variable"),
                  _("Modify the text (string) of a global variable."),
                  _("the text of global variable _PARAM0_"),
-                 _("External variables/Global variables"),
+                 _("Global variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .UseStandardOperatorParameters("string",
                                      ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -486,12 +232,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Change boolean variable"),
           _("Modify the boolean value of a global variable."),
           _("Set the boolean value of global variable _PARAM0_ to _PARAM1_"),
-          _("External variables/Global variables"),
+          _("Global variables"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .AddParameter("trueorfalse", _("New Value:"))
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("trueorfalse", _("New Value:"));
 
   extension
       .AddAction("ToggleGlobalVariableAsBoolean",
@@ -500,11 +245,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                      _("If it was true, it will become false, and if it was "
                        "false it will become true."),
                  _("Toggle the boolean value of global variable _PARAM0_"),
-                 _("External variables/Global variables"),
+                 _("Global variables"),
                  "res/conditions/var24.png",
                  "res/conditions/var.png")
-      .AddParameter("globalvar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("globalvar", _("Variable"));
 
   extension
       .AddAction(
@@ -512,13 +256,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Remove a child"),
           _("Remove a child from a scene structure variable."),
           _("Remove child _PARAM1_ from scene structure variable _PARAM0_"),
-          _("External variables/Scene variables/Arrays and structures"),
+          _("Scene variables/Arrays and structures"),
           "res/actions/var24.png",
           "res/actions/var.png")
       .AddParameter("scenevar", _("Structure variable"))
       .AddParameter("string", _("Child's name"))
-      .MarkAsAdvanced()
-      .SetRelevantForFunctionEventsOnly();
+      .MarkAsAdvanced();
 
   extension
       .AddAction(
@@ -526,13 +269,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Remove a child"),
           _("Remove a child from a global structure variable."),
           _("Remove child _PARAM1_ from global structure variable _PARAM0_"),
-          _("External variables/Global variables/Arrays and structures"),
+          _("Global variables/Arrays and structures"),
           "res/actions/var24.png",
           "res/actions/var.png")
       .AddParameter("globalvar", _("Structure variable"))
       .AddParameter("string", _("Child's name"))
-      .MarkAsAdvanced()
-      .SetRelevantForFunctionEventsOnly();
+      .MarkAsAdvanced();
 
   extension
       .AddAction("VariableClearChildren",
@@ -540,11 +282,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Remove all the children from the scene structure or array "
                    "variable."),
                  _("Clear children from scene variable _PARAM0_"),
-                 _("External variables/Scene variables/Arrays and structures"),
+                 _("Scene variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Structure or array variable"))
-      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -553,11 +294,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Remove all the children from the global structure or array "
                    "variable."),
                  _("Clear children from global variable _PARAM0_"),
-                 _("External variables/Global variables/Arrays and structures"),
+                 _("Global variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Structure or array variable"))
-      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -566,7 +306,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Adds an existing variable at the end of a scene array "
                    "variable."),
                  _("Add variable _PARAM1_ to array variable _PARAM0_"),
-                 _("External variables/Scene variables/Arrays and structures"),
+                 _("Scene variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
@@ -574,7 +314,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .SetParameterLongDescription(
           _("The content of the variable will *be copied* and added at the "
             "end of the array."))
-      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -583,12 +322,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Add text variable"),
           _("Adds a text (string) at the end of a scene array variable."),
           _("Add text _PARAM1_ to array variable _PARAM0_"),
-          _("External variables/Scene variables/Arrays and structures"),
+          _("Scene variables/Arrays and structures"),
           "res/actions/var24.png",
           "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .AddParameter("string", _("Text to add"))
-      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -596,12 +334,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Add number variable"),
                  _("Adds a number at the end of a scene array variable."),
                  _("Add number _PARAM1_ to array variable _PARAM0_"),
-                 _("External variables/Scene variables/Arrays and structures"),
+                 _("Scene variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .AddParameter("expression", _("Number to add"))
-      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -609,12 +346,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Add boolean variable"),
                  _("Adds a boolean at the end of a scene array variable."),
                  _("Add boolean _PARAM1_ to array variable _PARAM0_"),
-                 _("External variables/Scene variables/Arrays and structures"),
+                 _("Scene variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .AddParameter("trueorfalse", _("Boolean to add"))
-      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -624,12 +360,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                    "variable."),
                  _("Remove variable at index _PARAM1_ from scene array "
                    "variable _PARAM0_"),
-                 _("External variables/Scene variables/Arrays and structures"),
+                 _("Scene variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .AddParameter("expression", _("Index to remove"))
-      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -638,13 +373,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Number of children"),
           _("Compare the number of children in a scene array variable."),
           _("The number of children in the array variable _PARAM0_"),
-          _("External variables/Scene variables/Arrays and structures"),
+          _("Scene variables/Arrays and structures"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -653,10 +387,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("First text child"),
           _("Get the value of the first element of a scene array variable, if "
             "it is a text (string)."),
-          _("External variables/Scene variables/Arrays and structures"),
+          _("Scene variables/Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("scenevar", _("Array variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("scenevar", _("Array variable"));
 
   extension
       .AddExpression(
@@ -664,10 +397,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("First number child"),
           _("Get the value of the first element of a scene array variable, if "
             "it is a number."),
-          _("External variables/Scene variables/Arrays and structures"),
+          _("Scene variables/Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("scenevar", _("Array variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("scenevar", _("Array variable"));
 
   extension
       .AddStrExpression(
@@ -675,10 +407,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Last text child"),
           _("Get the value of the last element of a scene array variable, if "
             "it is a text (string)."),
-          _("External variables/Scene variables/Arrays and structures"),
+          _("Scene variables/Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("scenevar", _("Array variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("scenevar", _("Array variable"));
 
   extension
       .AddExpression(
@@ -686,10 +417,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Last number child"),
           _("Get the value of the last element of a scene array variable, if "
             "it is a number."),
-          _("External variables/Scene variables/Arrays and structures"),
+          _("Scene variables/Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("scenevar", _("Array variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("scenevar", _("Array variable"));
 
   extension
       .AddAction(
@@ -697,7 +427,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Add existing variable"),
           _("Adds an existing variable at the end of a global array variable."),
           _("Add variable _PARAM1_ to array variable _PARAM0_"),
-          _("External variables/Global variables/Arrays and structures"),
+          _("Global variables/Arrays and structures"),
           "res/actions/var24.png",
           "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
@@ -705,7 +435,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .SetParameterLongDescription(
           _("The content of the variable will *be copied* and added at the "
             "end of the array."))
-      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -715,12 +444,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                    "array variable."),
                  _("Remove variable at index _PARAM1_ from global array "
                    "variable _PARAM0_"),
-                 _("External variables/Global variables/Arrays and structures"),
+                 _("Global variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
       .AddParameter("expression", _("Index to remove"))
-      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -729,12 +457,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Add text variable"),
           _("Adds a text (string) at the end of a global array variable."),
           _("Add text _PARAM1_ to array variable _PARAM0_"),
-          _("External variables/Global variables/Arrays and structures"),
+          _("Global variables/Arrays and structures"),
           "res/actions/var24.png",
           "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
       .AddParameter("string", _("Text to add"))
-      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -742,12 +469,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Add number variable"),
                  _("Adds a number at the end of a global array variable."),
                  _("Add number _PARAM1_ to array variable _PARAM0_"),
-                 _("External variables/Global variables/Arrays and structures"),
+                 _("Global variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
       .AddParameter("expression", _("Number to add"))
-      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -755,12 +481,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Add boolean variable"),
                  _("Adds a boolean at the end of a global array variable."),
                  _("Add boolean _PARAM1_ to array variable _PARAM0_"),
-                 _("External variables/Global variables/Arrays and structures"),
+                 _("Global variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
       .AddParameter("trueorfalse", _("Boolean to add"))
-      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -769,13 +494,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Number of children"),
           _("Compare the number of children in a global array variable."),
           _("The number of children of the array variable _PARAM0_"),
-          _("External variables/Global variables/Arrays and structures"),
+          _("Global variables/Arrays and structures"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("globalvar", _("Array variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -783,20 +507,18 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                         _("First text child"),
                         _("Value of the first element of a global array "
                           "variable, if it is a text (string) variable."),
-                        _("External variables/Global variables/Arrays and structures"),
+                        _("Global variables/Arrays and structures"),
                         "res/actions/var.png")
-      .AddParameter("globalvar", _("Array variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("globalvar", _("Array variable"));
 
   extension
       .AddExpression("GlobalVariableFirstNumber",
                      _("First number child"),
                      _("Value of the first element of a global array "
                        "variable, if it is a number variable"),
-                     _("External variables/Global variables/Arrays and structures"),
+                     _("Global variables/Arrays and structures"),
                      "res/actions/var.png")
-      .AddParameter("globalvar", _("Array variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("globalvar", _("Array variable"));
 
   extension
       .AddStrExpression(
@@ -804,10 +526,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Last text child"),
           _("Value of the last element of a global array variable, if "
             "it is a text (string) variable."),
-          _("External variables/Global variables/Arrays and structures"),
+          _("Global variables/Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("globalvar", _("Array variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("globalvar", _("Array variable"));
 
   extension
       .AddExpression(
@@ -815,65 +536,59 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Last number child"),
           _("Value of the last element of a global array variable, if "
             "it is a number variable"),
-          _("External variables/Global variables/Arrays and structures"),
+          _("Global variables/Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("globalvar", _("Array variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("globalvar", _("Array variable"));
 
   extension
       .AddExpression("GlobalVariableChildCount",
                      _("Number of children"),
                      _("Number of children in a global array or "
                        "structure variable"),
-                     _("External variables/Global variables/Arrays and structures"),
+                     _("Global variables/Arrays and structures"),
                      "res/actions/var.png")
-      .AddParameter("globalvar", _("Array or structure variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("globalvar", _("Array or structure variable"));
 
   extension
       .AddExpression("VariableChildCount",
                      _("Number of children"),
                      _("Number of children in a scene array or "
                        "structure variable"),
-                     _("Arrays and structures"),
+                     _("Scene variables/Arrays and structures"),
                      "res/actions/var.png")
-      .AddParameter("variable", _("Array or structure variable"), "AllowUndeclaredVariable");
+      .AddParameter("scenevar", _("Array or structure variable"));
 
   extension
       .AddExpression("Variable",
                      _("Number variable"),
                      _("Number value of a scene variable"),
-                     _("External variables/Scene variables"),
+                     _("Scene variables"),
                      "res/actions/var.png")
-      .AddParameter("scenevar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("scenevar", _("Variable"));
 
   extension
       .AddStrExpression("VariableString",
                         _("Text variable"),
                         _("Text of a scene variable"),
-                        _("External variables/Scene variables"),
+                        _("Scene variables"),
                         "res/actions/var.png")
-      .AddParameter("scenevar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("scenevar", _("Variable"));
 
   extension
       .AddExpression("GlobalVariable",
                      _("Number variable"),
                      _("Number value of a global variable"),
-                     _("External variables/Global variables"),
+                     _("Global variables"),
                      "res/actions/var.png")
-      .AddParameter("globalvar", _("Name of the global variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("globalvar", _("Name of the global variable"));
 
   extension
       .AddStrExpression("GlobalVariableString",
                         _("Text variable"),
                         _("Text of a global variable"),
-                        _("External variables/Global variables"),
+                        _("Global variables"),
                         "res/actions/var.png")
-      .AddParameter("globalvar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("globalvar", _("Variable"));
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/WindowExtension.cpp

@@ -87,8 +87,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
   extension
       .AddAction(
           "SetWindowSize",
-          _("Game window size"),
-          _("Changes the size of the game window. Note that this "
+          _("Change the size of the game window"),
+          _("This action changes the size of the game window. Note that this "
             "will only work on platform supporting this operation: games "
             "running in browsers or on mobile phones can not update their "
             "window size. Game resolution can still be updated."),

Core/GDCore/Extensions/Metadata/AbstractFunctionMetadata.h

@@ -114,8 +114,6 @@ public:
 
   /**
    * \brief Erase any existing include file and add the specified include.
-   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
-   * error prone.
    */
   virtual AbstractFunctionMetadata &
   SetIncludeFile(const gd::String &includeFile) = 0;

Core/GDCore/Extensions/Metadata/BehaviorMetadata.cpp

@@ -13,15 +13,12 @@
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/BehaviorsSharedData.h"
-#include "GDCore/Project/PropertyDescriptor.h"
 #include "GDCore/Tools/Localization.h"
 #include "GDCore/Tools/MakeUnique.h"
 #include "GDCore/Tools/Log.h"
 
 namespace gd {
 
-const std::map<gd::String, gd::PropertyDescriptor> BehaviorMetadata::badProperties;
-
 BehaviorMetadata::BehaviorMetadata(
     const gd::String& extensionNamespace_,
     const gd::String& nameWithNamespace,
@@ -37,8 +34,7 @@ BehaviorMetadata::BehaviorMetadata(
       className(className_),
       iconFilename(icon24x24),
       instance(instance_),
-      sharedDatasInstance(sharedDatasInstance_),
-      quickCustomizationVisibility(QuickCustomization::Visibility::Default) {
+      sharedDatasInstance(sharedDatasInstance_) {
   SetFullName(gd::String(fullname_));
   SetDescription(gd::String(description_));
   SetDefaultName(gd::String(defaultName_));
@@ -51,14 +47,8 @@ BehaviorMetadata::BehaviorMetadata(
         "BehaviorMetadata is valid for: " + nameWithNamespace);
   }
 
-  if (instance) {
-    instance->SetTypeName(nameWithNamespace);
-    instance->InitializeContent();
-  }
-  if (sharedDatasInstance) {
-    sharedDatasInstance->SetTypeName(nameWithNamespace);
-    sharedDatasInstance->InitializeContent();
-  }
+  if (instance) instance->SetTypeName(nameWithNamespace);
+  if (sharedDatasInstance) sharedDatasInstance->SetTypeName(nameWithNamespace);
 }
 
 gd::InstructionMetadata& BehaviorMetadata::AddCondition(
@@ -415,30 +405,10 @@ gd::Behavior& BehaviorMetadata::Get() const {
   return *instance;
 }
 
-std::map<gd::String, gd::PropertyDescriptor> BehaviorMetadata::GetProperties() const {
-  if (!instance) {
-    return badProperties;
-  }
-  // TODO Properties should be declared on BehaviorMetadata directly.
-  // - Add 2 `properties` members (one for shared properties)
-  // - Add methods to declare new properties
-  return instance->GetProperties();
-}
-
-gd::BehaviorsSharedData* BehaviorMetadata::GetSharedDataInstance() const {
+gd::BehaviorsSharedData* BehaviorMetadata::GetSharedDataInstance() const { 
   return sharedDatasInstance.get();
 }
 
-std::map<gd::String, gd::PropertyDescriptor> BehaviorMetadata::GetSharedProperties() const {
-  if (!sharedDatasInstance) {
-    return badProperties;
-  }
-  // TODO Properties should be declared on BehaviorMetadata directly.
-  // - Add 2 `properties` members (one for shared properties)
-  // - Add methods to declare new properties
-  return sharedDatasInstance->GetProperties();
-}
-
 const std::vector<gd::String>& BehaviorMetadata::GetRequiredBehaviorTypes() const {
   requiredBehaviors.clear();
   for (auto& property : Get().GetProperties()) {

Core/GDCore/Extensions/Metadata/BehaviorMetadata.h

@@ -12,14 +12,12 @@
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/String.h"
-#include "GDCore/Project/QuickCustomization.h"
 namespace gd {
 class Behavior;
 class BehaviorsSharedData;
 class MultipleInstructionMetadata;
 class InstructionMetadata;
 class ExpressionMetadata;
-class PropertyDescriptor;
 }  // namespace gd
 
 namespace gd {
@@ -42,10 +40,10 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
       const gd::String& className_,
       std::shared_ptr<gd::Behavior> instance,
       std::shared_ptr<gd::BehaviorsSharedData> sharedDatasInstance);
-
+      
   /**
    * \brief Construct a behavior metadata, without "blueprint" behavior.
-   *
+   * 
    * \note This is used by events based behaviors.
    */
   BehaviorMetadata(
@@ -206,8 +204,6 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    * \brief Erase any existing include file and add the specified include.
    * \note The requirement may vary depending on the platform: Most of the time,
    * the include file contains the declaration of the behavior.
-   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
-   * error prone.
    */
   BehaviorMetadata& SetIncludeFile(const gd::String& includeFile) override;
 
@@ -298,50 +294,23 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
     return *this;
   }
 
-  QuickCustomization::Visibility GetQuickCustomizationVisibility() const {
-    return quickCustomizationVisibility;
-  }
-
-  BehaviorMetadata &SetQuickCustomizationVisibility(QuickCustomization::Visibility visibility) {
-    quickCustomizationVisibility = visibility;
-    return *this;
-  }
-
   /**
    * \brief Return the associated gd::Behavior, handling behavior contents.
-   *
+   * 
    * \note Returns a dumb Behavior for events based behaviors as CustomBehavior
    * are using EventBasedBehavior.
    */
   gd::Behavior& Get() const;
 
-  /**
-   * \brief Called when the IDE wants to know about the custom properties of the
-   * behavior.
-   *
-   * \return a std::map with properties names as key.
-   * \see gd::PropertyDescriptor
-   */
-  std::map<gd::String, gd::PropertyDescriptor> GetProperties() const;
-
   /**
    * \brief Return the associated gd::BehaviorsSharedData, handling behavior
    * shared data, if any (nullptr if none).
-   *
+   * 
    * \note Returns nullptr for events based behaviors as they don't declare
    * shared data yet.
    */
   gd::BehaviorsSharedData* GetSharedDataInstance() const;
 
-  /**
-   * \brief Called when the IDE wants to know about the custom shared properties
-   * of the behavior.
-   *
-   * \return a std::map with properties names as key.
-   * \see gd::PropertyDescriptor
-   */
-  std::map<gd::String, gd::PropertyDescriptor> GetSharedProperties() const;
-
   /**
    * \brief Return a reference to a map containing the names of the actions
    * (as keys) and the metadata associated with (as values).
@@ -384,13 +353,10 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
   mutable std::vector<gd::String> requiredBehaviors;
   bool isPrivate = false;
   bool isHidden = false;
-  QuickCustomization::Visibility quickCustomizationVisibility;
 
   // TODO: Nitpicking: convert these to std::unique_ptr to clarify ownership.
   std::shared_ptr<gd::Behavior> instance;
   std::shared_ptr<gd::BehaviorsSharedData> sharedDatasInstance;
-
-  static const std::map<gd::String, gd::PropertyDescriptor> badProperties;
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/EffectMetadata.h

@@ -65,8 +65,6 @@ class GD_CORE_API EffectMetadata {
 
   /**
    * \brief Clear any existing include file and add the specified include file.
-   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
-   * error prone.
    */
   EffectMetadata& SetIncludeFile(const gd::String& includeFile);
 

Core/GDCore/Extensions/Metadata/ExpressionMetadata.cpp

@@ -5,7 +5,6 @@
  */
 #include "ExpressionMetadata.h"
 #include "GDCore/CommonTools.h"
-#include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/String.h"
 
 namespace gd {
@@ -38,37 +37,45 @@ gd::ExpressionMetadata& ExpressionMetadata::AddParameter(
     const gd::String& description,
     const gd::String& supplementaryInformation,
     bool parameterIsOptional) {
-  parameters.AddNewParameter("")
-  .SetType(type)
-  .SetDescription(description)
-  .SetCodeOnly(false)
-  .SetOptional(parameterIsOptional)
-  .SetExtraInfo(
+  gd::ParameterMetadata info;
+  info.SetType(type);
+  info.description = description;
+  info.codeOnly = false;
+  info.SetOptional(parameterIsOptional);
+  info.SetExtraInfo(
       // For objects/behavior, the supplementary information
       // parameter is an object/behavior type...
       ((gd::ParameterMetadata::IsObject(type) ||
-        gd::ParameterMetadata::IsBehavior(type))
-               // Prefix with the namespace if it's not already there.
-               && (supplementaryInformation.find(
-                       PlatformExtension::GetNamespaceSeparator()) == gd::String::npos)
-           ? (supplementaryInformation.empty()
-                  ? ""
-                  : extensionNamespace + supplementaryInformation)
-           : supplementaryInformation));
+       gd::ParameterMetadata::IsBehavior(type))
+       // Prefix with the namespace if it's not already there.
+       && !(supplementaryInformation.rfind(extensionNamespace, 0) == 0))
+          ? (supplementaryInformation.empty()
+                 ? ""
+                 : extensionNamespace +
+                       supplementaryInformation  //... so prefix it with the extension
+                                           // namespace.
+             )
+          : supplementaryInformation);  // Otherwise don't change anything
 
   // TODO: Assert against supplementaryInformation === "emsc" (when running with
   // Emscripten), and warn about a missing argument when calling addParameter.
 
+  parameters.push_back(info);
   return *this;
 }
 
-gd::ExpressionMetadata &ExpressionMetadata::AddCodeOnlyParameter(
-    const gd::String &type, const gd::String &supplementaryInformation) {
-  parameters.AddNewParameter("").SetType(type).SetCodeOnly().SetExtraInfo(
-      supplementaryInformation);
+gd::ExpressionMetadata& ExpressionMetadata::AddCodeOnlyParameter(
+    const gd::String& type, const gd::String& supplementaryInformation) {
+  gd::ParameterMetadata info;
+  info.SetType(type);
+  info.codeOnly = true;
+  info.SetExtraInfo(supplementaryInformation);
+
+  parameters.push_back(info);
   return *this;
 }
 
+
 gd::ExpressionMetadata& ExpressionMetadata::SetRequiresBaseObjectCapability(
     const gd::String& capability) {
   requiredBaseObjectCapability = capability;

Core/GDCore/Extensions/Metadata/ExpressionMetadata.h

@@ -193,9 +193,8 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
    * \see AddParameter
    */
   ExpressionMetadata &SetDefaultValue(const gd::String &defaultValue) override {
-    if (parameters.GetParametersCount() > 0) {
-      parameters.GetInternalVector().back()->SetDefaultValue(defaultValue);
-    }
+    if (!parameters.empty())
+      parameters.back().SetDefaultValue(defaultValue);
     return *this;
   };
 
@@ -207,9 +206,8 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
    */
   ExpressionMetadata &
   SetParameterLongDescription(const gd::String &longDescription) override {
-    if (parameters.GetParametersCount() > 0) {
-      parameters.GetInternalVector().back()->SetLongDescription(longDescription);
-    }
+    if (!parameters.empty())
+      parameters.back().SetLongDescription(longDescription);
     return *this;
   };
 
@@ -222,9 +220,7 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
    */
   ExpressionMetadata &SetParameterExtraInfo(
       const gd::String &extraInfo) override {
-    if (parameters.GetParametersCount() > 0) {
-      parameters.GetInternalVector().back()->SetExtraInfo(extraInfo);
-    }
+    if (!parameters.empty()) parameters.back().SetExtraInfo(extraInfo);
     return *this;
   }
 
@@ -252,16 +248,19 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
   const gd::String& GetGroup() const { return group; }
   const gd::String& GetSmallIconFilename() const { return smallIconFilename; }
   const gd::ParameterMetadata& GetParameter(std::size_t id) const {
-    return parameters.GetParameter(id);
+    return parameters[id];
   };
   gd::ParameterMetadata& GetParameter(std::size_t id) {
-    return parameters.GetParameter(id);
+    return parameters[id];
   };
-  std::size_t GetParametersCount() const { return parameters.GetParametersCount(); };
-  const gd::ParameterMetadataContainer& GetParameters() const {
+  std::size_t GetParametersCount() const { return parameters.size(); };
+  const std::vector<gd::ParameterMetadata>& GetParameters() const {
     return parameters;
   };
 
+  std::vector<gd::ParameterMetadata> parameters;
+
+  
   /**
    * \brief Set the function name which will be used when generating the code.
    * \param functionName the name of the function to call
@@ -289,8 +288,6 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
 
   /**
    * \brief Erase any existing include file and add the specified include.
-   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
-   * error prone.
    */
   ExpressionMetadata& SetIncludeFile(
       const gd::String& includeFile) override {
@@ -369,8 +366,6 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
   bool isPrivate;
   gd::String requiredBaseObjectCapability;
   gd::String relevantContext;
-
-  gd::ParameterMetadataContainer parameters;
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/InstructionMetadata.cpp

@@ -8,8 +8,6 @@
 #include <algorithm>
 
 #include "GDCore/CommonTools.h"
-#include "GDCore/Extensions/PlatformExtension.h"
-#include "GDCore/Project/ParameterMetadataContainer.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/Tools/Localization.h"
 #include "GDCore/Tools/Log.h"
@@ -66,19 +64,22 @@ InstructionMetadata& InstructionMetadata::AddParameter(
       // For objects/behavior, the supplementary information
       // parameter is an object/behavior type...
       ((gd::ParameterMetadata::IsObject(type) ||
-        gd::ParameterMetadata::IsBehavior(type))
-               // Prefix with the namespace if it's not already there.
-               && (supplementaryInformation.find(
-                       PlatformExtension::GetNamespaceSeparator()) == gd::String::npos)
-           ? (supplementaryInformation.empty()
-                  ? ""
-                  : extensionNamespace + supplementaryInformation)
-           : supplementaryInformation));
+       gd::ParameterMetadata::IsBehavior(type))
+       // Prefix with the namespace if it's not already there.
+       && !(supplementaryInformation.rfind(extensionNamespace, 0) == 0))
+          ? (supplementaryInformation.empty()
+                 ? ""
+                 : extensionNamespace +
+                       supplementaryInformation  //... so prefix it with the
+                                                 // extension
+                                                 // namespace.
+             )
+          : supplementaryInformation);  // Otherwise don't change anything
 
   // TODO: Assert against supplementaryInformation === "emsc" (when running with
   // Emscripten), and warn about a missing argument when calling addParameter.
 
-  parameters.AddParameter(info);
+  parameters.push_back(info);
   return *this;
 }
 
@@ -89,7 +90,7 @@ InstructionMetadata& InstructionMetadata::AddCodeOnlyParameter(
   info.codeOnly = true;
   info.SetExtraInfo(supplementaryInformation);
 
-  parameters.AddParameter(info);
+  parameters.push_back(info);
   return *this;
 }
 
@@ -103,7 +104,7 @@ InstructionMetadata& InstructionMetadata::UseStandardOperatorParameters(
     AddParameter(
         "yesorno",
         options.description.empty() ? _("New value") : options.description);
-    size_t valueParamIndex = parameters.GetParametersCount() - 1;
+    size_t valueParamIndex = parameters.size() - 1;
 
     if (isObjectInstruction || isBehaviorInstruction) {
       gd::String templateSentence = _("Set _PARAM0_ as <subject>: <value>");
@@ -128,8 +129,8 @@ InstructionMetadata& InstructionMetadata::UseStandardOperatorParameters(
                  options.description.empty() ? _("Value") : options.description,
                  options.typeExtraInfo);
 
-    size_t operatorParamIndex = parameters.GetParametersCount() - 2;
-    size_t valueParamIndex = parameters.GetParametersCount() - 1;
+    size_t operatorParamIndex = parameters.size() - 2;
+    size_t valueParamIndex = parameters.size() - 1;
 
     if (isObjectInstruction || isBehaviorInstruction) {
       gd::String templateSentence = _("Change <subject> of _PARAM0_: <operator> <value>");
@@ -182,14 +183,14 @@ InstructionMetadata::UseStandardRelationalOperatorParameters(
     AddParameter(type,
                  options.description.empty() ? _("Value to compare") : options.description,
                  options.typeExtraInfo);
-    size_t operatorParamIndex = parameters.GetParametersCount() - 2;
-    size_t valueParamIndex = parameters.GetParametersCount() - 1;
+    size_t operatorParamIndex = parameters.size() - 2;
+    size_t valueParamIndex = parameters.size() - 1;
 
     if (isObjectInstruction || isBehaviorInstruction) {
       gd::String templateSentence = _("<subject> of _PARAM0_ <operator> <value>");
 
       sentence =
-          templateSentence.FindAndReplace("<subject>", sentence.CapitalizeFirstLetter())
+          templateSentence.FindAndReplace("<subject>", sentence)
               .FindAndReplace(
                   "<operator>",
                   "_PARAM" + gd::String::From(operatorParamIndex) + "_")
@@ -199,7 +200,7 @@ InstructionMetadata::UseStandardRelationalOperatorParameters(
       gd::String templateSentence = _("<subject> <operator> <value>");
 
       sentence =
-          templateSentence.FindAndReplace("<subject>", sentence.CapitalizeFirstLetter())
+          templateSentence.FindAndReplace("<subject>", sentence)
               .FindAndReplace(
                   "<operator>",
                   "_PARAM" + gd::String::From(operatorParamIndex) + "_")

Core/GDCore/Extensions/Metadata/InstructionMetadata.h

@@ -14,7 +14,6 @@
 #include <memory>
 
 #include "GDCore/Events/Instruction.h"
-#include "GDCore/Project/ParameterMetadataContainer.h"
 #include "GDCore/String.h"
 #include "ParameterMetadata.h"
 #include "ParameterOptions.h"
@@ -62,12 +61,12 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
   const gd::String &GetDescription() const { return description; }
   const gd::String &GetSentence() const { return sentence; }
   const gd::String &GetGroup() const { return group; }
-  ParameterMetadata &GetParameter(size_t i) { return parameters.GetParameter(i); }
+  ParameterMetadata &GetParameter(size_t i) { return parameters[i]; }
   const ParameterMetadata &GetParameter(size_t i) const {
-    return parameters.GetParameter(i);
+    return parameters[i];
   }
-  size_t GetParametersCount() const { return parameters.GetParametersCount(); }
-  const ParameterMetadataContainer &GetParameters() const {
+  size_t GetParametersCount() const { return parameters.size(); }
+  const std::vector<ParameterMetadata> &GetParameters() const {
     return parameters;
   }
   const gd::String &GetIconFilename() const { return iconFilename; }
@@ -257,9 +256,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    * \see AddParameter
    */
   InstructionMetadata &SetDefaultValue(const gd::String &defaultValue_) override {
-    if (parameters.GetParametersCount() > 0) {
-      parameters.GetInternalVector().back()->SetDefaultValue(defaultValue_);
-    }
+    if (!parameters.empty()) parameters.back().SetDefaultValue(defaultValue_);
     return *this;
   };
 
@@ -271,9 +268,8 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    */
   InstructionMetadata &SetParameterLongDescription(
       const gd::String &longDescription) override {
-    if (parameters.GetParametersCount() > 0) {
-      parameters.GetInternalVector().back()->SetLongDescription(longDescription);
-    }
+    if (!parameters.empty())
+      parameters.back().SetLongDescription(longDescription);
     return *this;
   }
 
@@ -285,9 +281,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    * \see AddParameter
    */
   InstructionMetadata &SetParameterExtraInfo(const gd::String &extraInfo) override {
-    if (parameters.GetParametersCount() > 0) {
-      parameters.GetInternalVector().back()->SetExtraInfo(extraInfo);
-    }
+    if (!parameters.empty()) parameters.back().SetExtraInfo(extraInfo);
     return *this;
   }
 
@@ -462,15 +456,6 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
     return *this;
   }
 
-/**
- * \brief Return the type manipulated in a standard way by the instruction.
- * 
- * \param type "number" or "string"
- */
-  const gd::String &GetManipulatedType() const {
-    return codeExtraInformation.type;
-  }
-
   /**
    * If InstructionMetadata::ExtraInformation::SetManipulatedType was called
    * with "number" or "string", this function will tell the code generator the
@@ -509,8 +494,6 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
 
   /**
    * \brief Erase any existing include file and add the specified include.
-   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
-   * error prone.
    */
   InstructionMetadata &SetIncludeFile(const gd::String &includeFile) override {
     codeExtraInformation.includeFiles.clear();
@@ -566,7 +549,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    */
   InstructionMetadata &GetCodeExtraInformation() { return *this; }
 
-  ParameterMetadataContainer parameters;
+  std::vector<ParameterMetadata> parameters;
 
  private:
   gd::String fullname;

Core/GDCore/Extensions/Metadata/InstructionOrExpressionContainerMetadata.h

@@ -142,8 +142,6 @@ public:
    * \brief Erase any existing include file and add the specified include.
    * \note The requirement may vary depending on the platform: Most of the time,
    * the include file contains the declaration of the behavior.
-   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
-   * error prone.
    */
   virtual InstructionOrExpressionContainerMetadata &
   SetIncludeFile(const gd::String &includeFile) = 0;

Core/GDCore/Extensions/Metadata/MetadataProvider.cpp

@@ -454,12 +454,11 @@ const gd::ParameterMetadata* MetadataProvider::GetFunctionCallParameterMetadata(
       // TODO use a badMetadata instead of a nullptr?
       const gd::ParameterMetadata* parameterMetadata = nullptr;
       while (metadataParameterIndex <
-             metadata.GetParameters().GetParametersCount()) {
-        if (!metadata.GetParameters().GetParameter(metadataParameterIndex)
+             metadata.parameters.size()) {
+        if (!metadata.parameters[metadataParameterIndex]
                  .IsCodeOnly()) {
           if (visibleParameterIndex == parameterIndex) {
-            parameterMetadata =
-                &metadata.GetParameters().GetParameter(metadataParameterIndex);
+            parameterMetadata = &metadata.parameters[metadataParameterIndex];
           }
           visibleParameterIndex++;
         }

Core/GDCore/Extensions/Metadata/MultipleInstructionMetadata.h

@@ -150,10 +150,6 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
     return *this;
   }
 
-  /**
-   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
-   * error prone.
-   */
   MultipleInstructionMetadata &SetIncludeFile(const gd::String &includeFile) override {
     if (expression)
       expression->SetIncludeFile(includeFile);
@@ -195,16 +191,6 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
     return *this;
   }
 
-  /**
-   * \see gd::InstructionMetadata::SetHelpPath
-   */
-  MultipleInstructionMetadata &SetHelpPath(const gd::String &path) {
-    if (expression) expression->SetHelpPath(path);
-    if (condition) condition->SetHelpPath(path);
-    if (action) action->SetHelpPath(path);
-    return *this;
-  }
-
   /**
    * \see gd::InstructionMetadata::MarkAsSimple
    */

Core/GDCore/Extensions/Metadata/ObjectMetadata.h

@@ -264,8 +264,6 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
    * \brief Erase any existing include file and add the specified include.
    * \note The requirement may vary depending on the platform: Most of the time,
    * the include file contains the declaration of the object.
-   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
-   * error prone.
    */
   ObjectMetadata& SetIncludeFile(const gd::String& includeFile) override;
 

Core/GDCore/Extensions/Metadata/ParameterMetadata.h

@@ -4,8 +4,8 @@
  * reserved. This project is released under the MIT License.
  */
 
-#pragma once
-
+#ifndef PARAMETER_METADATA_H
+#define PARAMETER_METADATA_H
 #include <map>
 #include <memory>
 
@@ -29,12 +29,6 @@ class GD_CORE_API ParameterMetadata {
   ParameterMetadata();
   virtual ~ParameterMetadata(){};
 
-  /**
-   * \brief Return a pointer to a new ParameterMetadata constructed from
-   * this one.
-   */
-  ParameterMetadata* Clone() const { return new ParameterMetadata(*this); };
-
   /**
    * \brief Return the metadata of the parameter type.
    */
@@ -254,3 +248,5 @@ class GD_CORE_API ParameterMetadata {
 };
 
 }  // namespace gd
+
+#endif  // PARAMETER_METADATA_H

Core/GDCore/Extensions/Metadata/ParameterMetadataTools.cpp

@@ -9,7 +9,6 @@
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/ObjectsContainersList.h"
-#include "GDCore/Project/ParameterMetadataContainer.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/String.h"
 #include "InstructionMetadata.h"
@@ -21,13 +20,13 @@ const ParameterMetadata ParameterMetadataTools::badParameterMetadata;
 
 void ParameterMetadataTools::ParametersToObjectsContainer(
     const gd::Project& project,
-    const ParameterMetadataContainer& parameters,
+    const std::vector<gd::ParameterMetadata>& parameters,
     gd::ObjectsContainer& outputObjectsContainer) {
   outputObjectsContainer.GetObjects().clear();
 
   gd::String lastObjectName;
-  for (std::size_t i = 0; i < parameters.GetParametersCount(); ++i) {
-    const auto& parameter = parameters.GetParameter(i);
+  for (std::size_t i = 0; i < parameters.size(); ++i) {
+    const auto& parameter = parameters[i];
     if (parameter.GetName().empty()) continue;
 
     if (gd::ParameterMetadata::IsObject(parameter.GetType())) {
@@ -62,34 +61,31 @@ void ParameterMetadataTools::ParametersToObjectsContainer(
 }
 
 void ParameterMetadataTools::ForEachParameterMatchingSearch(
-    const std::vector<const ParameterMetadataContainer*>&
+    const std::vector<const std::vector<gd::ParameterMetadata>*>&
         parametersVectorsList,
     const gd::String& search,
     std::function<void(const gd::ParameterMetadata&)> cb) {
   for (auto it = parametersVectorsList.rbegin();
        it != parametersVectorsList.rend();
        ++it) {
-    const ParameterMetadataContainer* parametersVector = *it;
+    const std::vector<gd::ParameterMetadata>* parametersVector = *it;
 
-    for (const auto &parameterMetadata :
-         parametersVector->GetInternalVector()) {
-      if (parameterMetadata->GetName().FindCaseInsensitive(search) !=
-          gd::String::npos)
-        cb(*parameterMetadata);
+    for (const auto& parameterMetadata: *parametersVector) {
+      if (parameterMetadata.GetName().FindCaseInsensitive(search) != gd::String::npos) cb(parameterMetadata);
     }
   }
 }
 
 bool ParameterMetadataTools::Has(
-      const std::vector<const ParameterMetadataContainer*>& parametersVectorsList,
+      const std::vector<const std::vector<gd::ParameterMetadata>*>& parametersVectorsList,
       const gd::String& parameterName) {
   for (auto it = parametersVectorsList.rbegin();
        it != parametersVectorsList.rend();
        ++it) {
-    const ParameterMetadataContainer* parametersVector = *it;
+    const std::vector<gd::ParameterMetadata>* parametersVector = *it;
 
-    for (const auto& parameterMetadata: parametersVector->GetInternalVector()) {
-      if (parameterMetadata->GetName() == parameterName) return true;
+    for (const auto& parameterMetadata: *parametersVector) {
+      if (parameterMetadata.GetName() == parameterName) return true;
     }
   }
 
@@ -97,18 +93,16 @@ bool ParameterMetadataTools::Has(
 }
 
 const gd::ParameterMetadata& ParameterMetadataTools::Get(
-    const std::vector<const ParameterMetadataContainer*>&
+    const std::vector<const std::vector<gd::ParameterMetadata>*>&
         parametersVectorsList,
     const gd::String& parameterName) {
   for (auto it = parametersVectorsList.rbegin();
        it != parametersVectorsList.rend();
        ++it) {
-    const ParameterMetadataContainer* parametersVector = *it;
+    const std::vector<gd::ParameterMetadata>* parametersVector = *it;
 
-    for (const auto &parameterMetadata :
-         parametersVector->GetInternalVector()) {
-      if (parameterMetadata->GetName() == parameterName)
-        return *parameterMetadata;
+    for (const auto& parameterMetadata: *parametersVector) {
+      if (parameterMetadata.GetName() == parameterName) return parameterMetadata;
     }
   }
 
@@ -117,7 +111,7 @@ const gd::ParameterMetadata& ParameterMetadataTools::Get(
 
 void ParameterMetadataTools::IterateOverParameters(
     const std::vector<gd::Expression>& parameters,
-    const ParameterMetadataContainer& parametersMetadata,
+    const std::vector<gd::ParameterMetadata>& parametersMetadata,
     std::function<void(const gd::ParameterMetadata& parameterMetadata,
                        const gd::Expression& parameterValue,
                        const gd::String& lastObjectName)> fn) {
@@ -134,17 +128,15 @@ void ParameterMetadataTools::IterateOverParameters(
 
 void ParameterMetadataTools::IterateOverParametersWithIndex(
     const std::vector<gd::Expression>& parameters,
-    const ParameterMetadataContainer& parametersMetadata,
+    const std::vector<gd::ParameterMetadata>& parametersMetadata,
     std::function<void(const gd::ParameterMetadata& parameterMetadata,
                        const gd::Expression& parameterValue,
                        size_t parameterIndex,
                        const gd::String& lastObjectName)> fn) {
   gd::String lastObjectName = "";
-  for (std::size_t pNb = 0; pNb < parametersMetadata.GetParametersCount();
-       ++pNb) {
-    const gd::ParameterMetadata &parameterMetadata =
-        parametersMetadata.GetParameter(pNb);
-    const gd::Expression &parameterValue =
+  for (std::size_t pNb = 0; pNb < parametersMetadata.size(); ++pNb) {
+    const gd::ParameterMetadata& parameterMetadata = parametersMetadata[pNb];
+    const gd::Expression& parameterValue =
         pNb < parameters.size() ? parameters[pNb].GetPlainString() : "";
     const gd::Expression& parameterValueOrDefault =
         parameterValue.GetPlainString().empty() && parameterMetadata.IsOptional()
@@ -187,10 +179,10 @@ void ParameterMetadataTools::IterateOverParametersWithIndex(
 
   size_t parameterIndex = 0;
   for (size_t metadataIndex = (isObjectFunction ? 1 : 0);
-       metadataIndex < metadata.GetParameters().GetParametersCount() &&
+       metadataIndex < metadata.parameters.size() &&
        parameterIndex < node.parameters.size();
        ++metadataIndex) {
-    auto &parameterMetadata = metadata.GetParameters().GetParameter(metadataIndex);
+    auto &parameterMetadata = metadata.parameters[metadataIndex];
     if (parameterMetadata.IsCodeOnly()) {
       continue;
     }
@@ -212,17 +204,16 @@ void ParameterMetadataTools::IterateOverParametersWithIndex(
 }
 
 size_t ParameterMetadataTools::GetObjectParameterIndexFor(
-    const ParameterMetadataContainer& parametersMetadata,
+    const std::vector<gd::ParameterMetadata>& parametersMetadata,
     size_t parameterIndex) {
   // By convention, parameters that require
   // an object (mainly, "objectvar" and "behavior") should be placed after
   // the object in the list of parameters (if possible, just after).
   // Search "lastObjectName" in the codebase for other place where this
   // convention is enforced.
-  for (std::size_t pNb = parameterIndex;
-       pNb < parametersMetadata.GetParametersCount(); pNb--) {
-    if (gd::ParameterMetadata::IsObject(
-            parametersMetadata.GetParameter(pNb).GetType())) {
+  for (std::size_t pNb = parameterIndex; pNb < parametersMetadata.size();
+       pNb--) {
+    if (gd::ParameterMetadata::IsObject(parametersMetadata[pNb].GetType())) {
       return pNb;
     }
   }

Core/GDCore/Extensions/Metadata/ParameterMetadataTools.h

@@ -15,7 +15,6 @@ class ObjectsContainer;
 class ObjectsContainersList;
 class ParameterMetadata;
 class Expression;
-class ParameterMetadataContainer;
 struct FunctionCallNode;
 struct ExpressionNode;
 }  // namespace gd
@@ -25,20 +24,20 @@ class GD_CORE_API ParameterMetadataTools {
  public:
   static void ParametersToObjectsContainer(
       const gd::Project& project,
-      const ParameterMetadataContainer& parameters,
+      const std::vector<gd::ParameterMetadata>& parameters,
       gd::ObjectsContainer& outputObjectsContainer);
 
   static void ForEachParameterMatchingSearch(
-      const std::vector<const ParameterMetadataContainer*>& parametersVectorsList,
+      const std::vector<const std::vector<gd::ParameterMetadata>*>& parametersVectorsList,
       const gd::String& search,
       std::function<void(const gd::ParameterMetadata&)> cb);
 
   static bool Has(
-      const std::vector<const ParameterMetadataContainer*>& parametersVectorsList,
+      const std::vector<const std::vector<gd::ParameterMetadata>*>& parametersVectorsList,
       const gd::String& parameterName);
 
   static const gd::ParameterMetadata& Get(
-      const std::vector<const ParameterMetadataContainer*>& parametersVectorsList,
+      const std::vector<const std::vector<gd::ParameterMetadata>*>& parametersVectorsList,
       const gd::String& parameterName);
 
   /**
@@ -48,7 +47,7 @@ class GD_CORE_API ParameterMetadataTools {
    */
   static void IterateOverParameters(
       const std::vector<gd::Expression>& parameters,
-      const ParameterMetadataContainer& parametersMetadata,
+      const std::vector<gd::ParameterMetadata>& parametersMetadata,
       std::function<void(const gd::ParameterMetadata& parameterMetadata,
                          const gd::Expression& parameterValue,
                          const gd::String& lastObjectName)> fn);
@@ -60,7 +59,7 @@ class GD_CORE_API ParameterMetadataTools {
    */
   static void IterateOverParametersWithIndex(
       const std::vector<gd::Expression>& parameters,
-      const ParameterMetadataContainer& parametersMetadata,
+      const std::vector<gd::ParameterMetadata>& parametersMetadata,
       std::function<void(const gd::ParameterMetadata& parameterMetadata,
                          const gd::Expression& parameterValue,
                          size_t parameterIndex,
@@ -85,7 +84,7 @@ class GD_CORE_API ParameterMetadataTools {
    * it's linked to.
    */
   static size_t GetObjectParameterIndexFor(
-      const ParameterMetadataContainer& parametersMetadata,
+      const std::vector<gd::ParameterMetadata>& parametersMetadata,
       size_t parameterIndex);
 
 private:

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.h

@@ -210,19 +210,14 @@ class GD_CORE_API ValueTypeMetadata {
              parameterType == "scenevar";
     } else if (type == "resource") {
       return parameterType == "fontResource" ||
-             parameterType == "audioResource" ||
-             parameterType == "videoResource" ||
+             parameterType == "soundfile" ||
+             parameterType == "musicfile" ||
              parameterType == "bitmapFontResource" ||
              parameterType == "imageResource" ||
              parameterType == "jsonResource" ||
              parameterType == "tilemapResource" ||
              parameterType == "tilesetResource" ||
-             parameterType == "model3DResource" ||
-             parameterType == "atlasResource" ||
-             parameterType == "spineResource" ||
-             // Deprecated, old parameter types:
-             parameterType == "soundfile" ||
-             parameterType == "musicfile";
+             parameterType == "model3DResource";
     }
     return false;
   }

Core/GDCore/Extensions/Platform.cpp

@@ -96,11 +96,11 @@ std::shared_ptr<gd::PlatformExtension> Platform::GetExtension(
 std::unique_ptr<gd::ObjectConfiguration> Platform::CreateObjectConfiguration(
     gd::String type) const {
   if (creationFunctionTable.find(type) == creationFunctionTable.end()) {
-    gd::LogWarning("Tried to create an object configuration with an unknown type: " + type
+    gd::LogWarning("Tried to create an object with an unknown type: " + type
               + " for platform " + GetName() + "!");
     type = "";
     if (creationFunctionTable.find("") == creationFunctionTable.end()) {
-      gd::LogFatalError("Unable to create a base object configuration!");
+      gd::LogError("Unable to create a Base object!");
       return nullptr;
     }
   }

Core/GDCore/Extensions/PlatformExtension.h

@@ -264,11 +264,8 @@ class GD_CORE_API PlatformExtension {
    *
    * \param name The name of the behavior
    * \param fullname The user friendly name of the behavior
-   * \param defaultName The default name of behavior instances
    * \param description The user friendly description of the behavior
-   * \param group The behavior category label
    * \param icon The icon of the behavior.
-   * \param className The name of the class implementing the behavior
    * \param instance An instance of the behavior that
    * will be used to create the behavior
    * \param sharedDatasInstance Optional
@@ -285,6 +282,21 @@ class GD_CORE_API PlatformExtension {
       std::shared_ptr<gd::Behavior> instance,
       std::shared_ptr<gd::BehaviorsSharedData> sharedDatasInstance);
 
+  /**
+   * \brief Declare a new events based behavior as being part of the extension.
+   *
+   * \param name The name of the behavior
+   * \param fullname The user friendly name of the behavior
+   * \param description The user friendly description of the behavior
+   * \param icon The icon of the behavior.
+   */
+  gd::BehaviorMetadata& AddEventsBasedBehavior(
+      const gd::String& name_,
+      const gd::String& fullname_,
+      const gd::String& description_,
+      const gd::String& group_,
+      const gd::String& icon_);
+
   /**
    * \brief Declare a new effect as being part of the extension.
    * \param name The internal name of the effect (also called effect type).

Core/GDCore/IDE/DependenciesAnalyzer.cpp

@@ -4,6 +4,7 @@
  * reserved. This project is released under the MIT License.
  */
 
+#if defined(GD_IDE_ONLY)
 #include "DependenciesAnalyzer.h"
 #include <algorithm>
 #include "GDCore/Events/Builtin/LinkEvent.h"
@@ -28,9 +29,9 @@ DependenciesAnalyzer::DependenciesAnalyzer(const gd::Project& project_,
 
 bool DependenciesAnalyzer::Analyze() {
   if (layout)
-    return Analyze(layout->GetEvents());
+    return Analyze(layout->GetEvents(), true);
   else if (externalEvents)
-    return Analyze(externalEvents->GetEvents());
+    return Analyze(externalEvents->GetEvents(), true);
 
   std::cout << "ERROR: DependenciesAnalyzer called without any layout or "
                "external events.";
@@ -39,38 +40,63 @@ bool DependenciesAnalyzer::Analyze() {
 
 DependenciesAnalyzer::~DependenciesAnalyzer() {}
 
-bool DependenciesAnalyzer::Analyze(const gd::EventsList& events) {
+bool DependenciesAnalyzer::Analyze(const gd::EventsList& events, bool isOnTopLevel) {
   for (unsigned int i = 0; i < events.size(); ++i) {
     const gd::LinkEvent* linkEvent = dynamic_cast<const gd::LinkEvent*>(&events[i]);
     if (linkEvent) {
+      DependenciesAnalyzer analyzer(*this);
+
       gd::String linked = linkEvent->GetTarget();
       if (project.HasExternalEventsNamed(linked)) {
         if (std::find(parentExternalEvents.begin(),
                       parentExternalEvents.end(),
-                      linked) != parentExternalEvents.end()) {
-          // Circular dependency!
+                      linked) != parentExternalEvents.end())
+          return false;  // Circular dependency!
+
+        externalEventsDependencies.insert(
+            linked);  // There is a direct dependency
+        if (!isOnTopLevel) notTopLevelExternalEventsDependencies.insert(linked);
+        analyzer.AddParentExternalEvents(linked);
+        if (!analyzer.Analyze(project.GetExternalEvents(linked).GetEvents(),
+                              isOnTopLevel))
           return false;
-        }
-        bool wasDependencyJustAdded = externalEventsDependencies.insert(linked).second;
-        if (wasDependencyJustAdded) {
-          parentExternalEvents.push_back(linked);
-          if (!Analyze(project.GetExternalEvents(linked).GetEvents()))
-            return false;
-          parentExternalEvents.pop_back();
-        }
+
       } else if (project.HasLayoutNamed(linked)) {
         if (std::find(parentScenes.begin(), parentScenes.end(), linked) !=
-            parentScenes.end()) {
-          // Circular dependency!
+            parentScenes.end())
+          return false;  // Circular dependency!
+
+        scenesDependencies.insert(linked);  // There is a direct dependency
+        if (!isOnTopLevel) notTopLevelScenesDependencies.insert(linked);
+        analyzer.AddParentScene(linked);
+        if (!analyzer.Analyze(project.GetLayout(linked).GetEvents(),
+                              isOnTopLevel))
           return false;
-        }
-        bool wasDependencyJustAdded = scenesDependencies.insert(linked).second;
-        if (wasDependencyJustAdded) {
-          parentScenes.push_back(linked);
-          if (!Analyze(project.GetLayout(linked).GetEvents()))
-            return false;
-          parentScenes.pop_back();
-        }
+      }
+
+      // Update with indirect dependencies.
+      scenesDependencies.insert(analyzer.GetScenesDependencies().begin(),
+                                analyzer.GetScenesDependencies().end());
+      externalEventsDependencies.insert(
+          analyzer.GetExternalEventsDependencies().begin(),
+          analyzer.GetExternalEventsDependencies().end());
+      sourceFilesDependencies.insert(
+          analyzer.GetSourceFilesDependencies().begin(),
+          analyzer.GetSourceFilesDependencies().end());
+      notTopLevelScenesDependencies.insert(
+          analyzer.GetNotTopLevelScenesDependencies().begin(),
+          analyzer.GetNotTopLevelScenesDependencies().end());
+      notTopLevelExternalEventsDependencies.insert(
+          analyzer.GetNotTopLevelExternalEventsDependencies().begin(),
+          analyzer.GetNotTopLevelExternalEventsDependencies().end());
+
+      if (!isOnTopLevel) {
+        notTopLevelScenesDependencies.insert(
+            analyzer.GetScenesDependencies().begin(),
+            analyzer.GetScenesDependencies().end());
+        notTopLevelExternalEventsDependencies.insert(
+            analyzer.GetExternalEventsDependencies().begin(),
+            analyzer.GetExternalEventsDependencies().end());
       }
     }
 
@@ -86,9 +112,45 @@ bool DependenciesAnalyzer::Analyze(const gd::EventsList& events) {
 
     // Analyze sub events dependencies
     if (events[i].CanHaveSubEvents()) {
-      if (!Analyze(events[i].GetSubEvents())) return false;
+      if (!Analyze(events[i].GetSubEvents(), false)) return false;
     }
   }
 
   return true;
 }
+
+gd::String DependenciesAnalyzer::ExternalEventsCanBeCompiledForAScene() {
+  if (!externalEvents) {
+    std::cout << "ERROR: ExternalEventsCanBeCompiledForAScene called without "
+                 "external events set!"
+              << std::endl;
+    return "";
+  }
+
+  gd::String sceneName;
+  for (unsigned int i = 0; i < project.GetLayoutsCount(); ++i) {
+    // For each layout, compute the dependencies and the dependencies which are
+    // not coming from a top level event.
+    DependenciesAnalyzer analyzer(project, project.GetLayout(i));
+    if (!analyzer.Analyze()) continue;  // Analyze failed -> Cyclic dependencies
+    const std::set<gd::String>& dependencies =
+        analyzer.GetExternalEventsDependencies();
+    const std::set<gd::String>& notTopLevelDependencies =
+        analyzer.GetNotTopLevelExternalEventsDependencies();
+
+    // Check if the external events is a dependency, and that is is only present
+    // as a link on the top level.
+    if (dependencies.find(externalEvents->GetName()) != dependencies.end() &&
+        notTopLevelDependencies.find(externalEvents->GetName()) ==
+            notTopLevelDependencies.end()) {
+      if (!sceneName.empty())
+        return "";  // External events can be compiled only if one scene is
+                    // including them.
+      else
+        sceneName = project.GetLayout(i).GetName();
+    }
+  }
+
+  return sceneName;  // External events can be compiled and used for the scene.
+}
+#endif

Core/GDCore/IDE/DependenciesAnalyzer.h

@@ -39,6 +39,11 @@ class GD_CORE_API DependenciesAnalyzer {
 
   /**
    * \brief Constructor for analyzing the dependencies of external events.
+   *
+   * You can also call then
+   * DependenciesAnalyzer::ExternalEventsCanBeCompiledForAScene to check if the
+   * external events can be compiled separately and called by a scene. \see
+   * DependenciesAnalyzer::ExternalEventsCanBeCompiledForAScene
    */
   DependenciesAnalyzer(const gd::Project& project_,
                        const gd::ExternalEvents& externalEvents);
@@ -55,6 +60,18 @@ class GD_CORE_API DependenciesAnalyzer {
    */
   bool Analyze();
 
+  /**
+   * Check if the external events (passed in the constructor) can be compiled
+   * and called by a single scene:<br> This is possible when the link calling
+   * the external events does not have any parent event and when this situation
+   * occurs only in a single scene and not in another.
+   *
+   * \return The name of the scene which is able to call the compiled external
+   * events. If empty, no scene is able to call them. (So external events have
+   * to be included directly by links).
+   */
+  gd::String ExternalEventsCanBeCompiledForAScene();
+
   /**
    * \brief Return the scenes being dependencies of the scene or external events
    * passed in the constructor.
@@ -79,6 +96,25 @@ class GD_CORE_API DependenciesAnalyzer {
     return sourceFilesDependencies;
   };
 
+  /**
+   * \brief Return the scenes being dependencies of the scene or external events
+   * passed in the constructor, but being not top level dependencies: The links
+   * including them are not a top level events (i.e: They have a parent event).
+   */
+  const std::set<gd::String>& GetNotTopLevelScenesDependencies() const {
+    return notTopLevelScenesDependencies;
+  };
+
+  /**
+   * \brief Return the external events being dependencies of the scene or
+   * external events passed in the constructor, but being not top level
+   * dependencies: The links including them are not a top level events (i.e:
+   * They have a parent event).
+   */
+  const std::set<gd::String>& GetNotTopLevelExternalEventsDependencies() const {
+    return notTopLevelExternalEventsDependencies;
+  };
+
  private:
   /**
    * \brief Analyze the dependencies of the events.
@@ -88,11 +124,32 @@ class GD_CORE_API DependenciesAnalyzer {
    * (they have no parents). \return false if a circular dependency exists, true
    * otherwise.
    */
-  bool Analyze(const gd::EventsList& events);
+  bool Analyze(const gd::EventsList& events, bool isOnTopLevel);
+
+  void AddParentScene(gd::String parentScene) {
+    parentScenes.push_back(parentScene);
+  };
+  void AddParentExternalEvents(gd::String parentExternalEvents_) {
+    parentExternalEvents.push_back(parentExternalEvents_);
+  };
+
+  /**
+   * Return true if all links pointing to external events called \a
+   * externalEventsName are only at the top level of \a events. The function
+   * return false as soon as it discover a link to external events which is not
+   * at the top level ( i.e: It has a parent event ).
+   *
+   * \warning The function assumes that there are not cyclic dependencies.
+   */
+  bool CheckIfExternalEventsIsLinkedOnlyAtTopLevel(
+      const gd::String& externalEventsName,
+      std::vector<std::shared_ptr<gd::BaseEvent> >& events);
 
   std::set<gd::String> scenesDependencies;
   std::set<gd::String> externalEventsDependencies;
   std::set<gd::String> sourceFilesDependencies;
+  std::set<gd::String> notTopLevelScenesDependencies;
+  std::set<gd::String> notTopLevelExternalEventsDependencies;
   std::vector<gd::String>
       parentScenes;  ///< Used to check for circular dependencies.
   std::vector<gd::String>

Core/GDCore/IDE/EventBasedBehaviorBrowser.cpp

@@ -26,7 +26,7 @@ void EventBasedBehaviorBrowser::ExposeEvents(
 void EventBasedBehaviorBrowser::ExposeEvents(
     gd::Project &project, gd::ArbitraryEventsWorkerWithContext &worker) const {
   gd::ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
-      project, eventsFunctionsExtension, eventsBasedBehavior, worker);
+      project, eventsBasedBehavior, worker);
 }
 
 void EventBasedBehaviorBrowser::ExposeObjects(

Core/GDCore/IDE/EventBasedBehaviorBrowser.h

@@ -29,11 +29,8 @@ namespace gd {
  */
 class GD_CORE_API EventBasedBehaviorBrowser : public ProjectBrowser {
 public:
-  EventBasedBehaviorBrowser(
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension_,
-      gd::EventsBasedBehavior &eventsBasedBehavior_)
-      : eventsFunctionsExtension(eventsFunctionsExtension_),
-        eventsBasedBehavior(eventsBasedBehavior_) {}
+  EventBasedBehaviorBrowser(gd::EventsBasedBehavior &eventsBasedBehavior_)
+      : eventsBasedBehavior(eventsBasedBehavior_) {}
 
   /**
    * \brief Call the specified worker on all events of the event-based
@@ -51,7 +48,7 @@ public:
    * This should be the preferred way to traverse all the events of an event-based behavior.
    */
   void
-  ExposeEvents(gd::Project &project, 
+  ExposeEvents(gd::Project &project,
                gd::ArbitraryEventsWorkerWithContext &worker) const override;
 
   /**
@@ -83,7 +80,6 @@ public:
                          gd::ArbitraryBehaviorSharedDataWorker &worker) const override;
 
 private:
-  const gd::EventsFunctionsExtension &eventsFunctionsExtension;
   gd::EventsBasedBehavior &eventsBasedBehavior;
 };
 

Core/GDCore/IDE/Events/ArbitraryEventsWorker.cpp

@@ -14,27 +14,29 @@
 #include "GDCore/Events/Expression.h"
 #include "GDCore/Extensions/Metadata/ParameterMetadata.h"
 #include "GDCore/String.h"
-#include "GDCore/Tools/Log.h"
 
 using namespace std;
 
 namespace gd {
 
-AbstractArbitraryEventsWorker::~AbstractArbitraryEventsWorker() {}
+ArbitraryEventsWorker::~ArbitraryEventsWorker() {}
 
-void AbstractArbitraryEventsWorker::VisitEventList(gd::EventsList& events) {
+void ArbitraryEventsWorker::VisitEventList(gd::EventsList& events) {
   DoVisitEventList(events);
 
   for (std::size_t i = 0; i < events.size();) {
     if (events[i].AcceptVisitor(*this))
       events.RemoveEvent(i);
     else {
+      if (events[i].CanHaveSubEvents())
+        VisitEventList(events[i].GetSubEvents());
+
       ++i;
     }
   }
 }
 
-bool AbstractArbitraryEventsWorker::VisitEvent(gd::BaseEvent& event) {
+bool ArbitraryEventsWorker::VisitEvent(gd::BaseEvent& event) {
   bool shouldDelete = DoVisitEvent(event);
   if (shouldDelete) return true;
 
@@ -53,17 +55,15 @@ bool AbstractArbitraryEventsWorker::VisitEvent(gd::BaseEvent& event) {
       *expressionAndMetadata.first, expressionAndMetadata.second);
   }
 
-  if (!shouldDelete && event.CanHaveSubEvents()) {
-    VisitEventList(event.GetSubEvents());
-  }
+
   return shouldDelete;
 }
 
-bool AbstractArbitraryEventsWorker::VisitLinkEvent(gd::LinkEvent& linkEvent) {
+bool ArbitraryEventsWorker::VisitLinkEvent(gd::LinkEvent& linkEvent) {
   return DoVisitLinkEvent(linkEvent);
 }
 
-void AbstractArbitraryEventsWorker::VisitInstructionList(
+void ArbitraryEventsWorker::VisitInstructionList(
     gd::InstructionsList& instructions, bool areConditions) {
   DoVisitInstructionList(instructions, areConditions);
 
@@ -79,19 +79,22 @@ void AbstractArbitraryEventsWorker::VisitInstructionList(
   }
 }
 
-bool AbstractArbitraryEventsWorker::VisitInstruction(gd::Instruction& instruction,
+bool ArbitraryEventsWorker::VisitInstruction(gd::Instruction& instruction,
                                              bool isCondition) {
   return DoVisitInstruction(instruction, isCondition);
 }
 
-bool AbstractArbitraryEventsWorker::VisitEventExpression(gd::Expression& expression,
+bool ArbitraryEventsWorker::VisitEventExpression(gd::Expression& expression,
                                                  const gd::ParameterMetadata& metadata) {
   return DoVisitEventExpression(expression, metadata);
 }
 
-AbstractReadOnlyArbitraryEventsWorker::~AbstractReadOnlyArbitraryEventsWorker() {}
+ArbitraryEventsWorkerWithContext::~ArbitraryEventsWorkerWithContext() {}
 
-void AbstractReadOnlyArbitraryEventsWorker::VisitEventList(const gd::EventsList& events) {
+
+ReadOnlyArbitraryEventsWorker::~ReadOnlyArbitraryEventsWorker() {}
+
+void ReadOnlyArbitraryEventsWorker::VisitEventList(const gd::EventsList& events) {
   DoVisitEventList(events);
 
   for (std::size_t i = 0; i < events.size(); ++i) {
@@ -106,7 +109,7 @@ void AbstractReadOnlyArbitraryEventsWorker::VisitEventList(const gd::EventsList&
   }
 }
 
-void AbstractReadOnlyArbitraryEventsWorker::VisitEvent(const gd::BaseEvent& event) {
+void ReadOnlyArbitraryEventsWorker::VisitEvent(const gd::BaseEvent& event) {
   DoVisitEvent(event);
 
   const vector<const gd::InstructionsList*> conditionsVectors =
@@ -127,11 +130,11 @@ void AbstractReadOnlyArbitraryEventsWorker::VisitEvent(const gd::BaseEvent& even
   }
 }
 
-void AbstractReadOnlyArbitraryEventsWorker::VisitLinkEvent(const gd::LinkEvent& linkEvent) {
+void ReadOnlyArbitraryEventsWorker::VisitLinkEvent(const gd::LinkEvent& linkEvent) {
   DoVisitLinkEvent(linkEvent);
 }
 
-void AbstractReadOnlyArbitraryEventsWorker::VisitInstructionList(
+void ReadOnlyArbitraryEventsWorker::VisitInstructionList(
     const gd::InstructionsList& instructions, bool areConditions) {
   DoVisitInstructionList(instructions, areConditions);
 
@@ -147,73 +150,21 @@ void AbstractReadOnlyArbitraryEventsWorker::VisitInstructionList(
   }
 }
 
-void AbstractReadOnlyArbitraryEventsWorker::VisitInstruction(const gd::Instruction& instruction,
+void ReadOnlyArbitraryEventsWorker::VisitInstruction(const gd::Instruction& instruction,
                                              bool isCondition) {
   DoVisitInstruction(instruction, isCondition);
 }
 
 
-void AbstractReadOnlyArbitraryEventsWorker::VisitEventExpression(const gd::Expression& expression,
+void ReadOnlyArbitraryEventsWorker::VisitEventExpression(const gd::Expression& expression,
                                                  const gd::ParameterMetadata& metadata) {
   DoVisitEventExpression(expression, metadata);
 }
 
-void AbstractReadOnlyArbitraryEventsWorker::StopAnyEventIteration() {
+void ReadOnlyArbitraryEventsWorker::StopAnyEventIteration() {
   shouldStopIteration = true;
 }
 
-ArbitraryEventsWorker::~ArbitraryEventsWorker() {}
-
-bool ArbitraryEventsWorker::VisitEvent(gd::BaseEvent &event) {
-  return AbstractArbitraryEventsWorker::VisitEvent(event);
-}
-
-ArbitraryEventsWorkerWithContext::~ArbitraryEventsWorkerWithContext() {}
-
-bool ArbitraryEventsWorkerWithContext::VisitEvent(gd::BaseEvent &event) {
-  if (!event.HasVariables()) {
-    return AbstractArbitraryEventsWorker::VisitEvent(event);
-  }
-  // Push local variables
-  auto newProjectScopedContainers =
-      ProjectScopedContainers::MakeNewProjectScopedContainersWithLocalVariables(
-          *currentProjectScopedContainers, event);
-  auto *parentProjectScopedContainers = currentProjectScopedContainers;
-  currentProjectScopedContainers = &newProjectScopedContainers;
-
-  bool shouldDelete = AbstractArbitraryEventsWorker::VisitEvent(event);
-
-  // Pop local variables
-  currentProjectScopedContainers = parentProjectScopedContainers;
-  return shouldDelete;
-}
-
-ReadOnlyArbitraryEventsWorker::~ReadOnlyArbitraryEventsWorker() {}
-
-void ReadOnlyArbitraryEventsWorker::VisitEvent(
-    const gd::BaseEvent &event) {
-  AbstractReadOnlyArbitraryEventsWorker::VisitEvent(event);
-}
-
 ReadOnlyArbitraryEventsWorkerWithContext::~ReadOnlyArbitraryEventsWorkerWithContext() {}
 
-void ReadOnlyArbitraryEventsWorkerWithContext::VisitEvent(
-    const gd::BaseEvent &event) {
-  if (!event.HasVariables()) {
-    AbstractReadOnlyArbitraryEventsWorker::VisitEvent(event);
-    return;
-  }
-  // Push local variables
-  auto newProjectScopedContainers =
-      ProjectScopedContainers::MakeNewProjectScopedContainersWithLocalVariables(
-          *currentProjectScopedContainers, event);
-  auto *parentProjectScopedContainers = currentProjectScopedContainers;
-  currentProjectScopedContainers = &newProjectScopedContainers;
-
-  AbstractReadOnlyArbitraryEventsWorker::VisitEvent(event);
-
-  // Pop local variables
-  currentProjectScopedContainers = parentProjectScopedContainers;
-}
-
 }  // namespace gd

Core/GDCore/IDE/Events/ArbitraryEventsWorker.h

@@ -3,8 +3,8 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
-
+#ifndef GDCORE_ARBITRARYEVENTSWORKER_H
+#define GDCORE_ARBITRARYEVENTSWORKER_H
 #include <map>
 #include <memory>
 #include <vector>
@@ -12,7 +12,6 @@
 #include "GDCore/Events/EventVisitor.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/String.h"
-
 namespace gd {
 class Instruction;
 class BaseEvent;
@@ -26,24 +25,27 @@ class ParameterMetadata;
 namespace gd {
 
 /**
- * \brief AbstractArbitraryEventsWorker is a base abstract class used to browse events (and
- * instructions) and do some work on them. It must not be inherited directly.
+ * \brief ArbitraryEventsWorker is an abstract class used to browse events (and
+ * instructions) and do some work on them. Can be used to implement refactoring
+ * for example.
  *
- * \see gd::ArbitraryEventsWorker
  * \see gd::ArbitraryEventsWorkerWithContext
  *
  * \ingroup IDE
  */
-class GD_CORE_API AbstractArbitraryEventsWorker : private EventVisitor {
+class GD_CORE_API ArbitraryEventsWorker : private EventVisitor {
  public:
-  AbstractArbitraryEventsWorker(){};
-  virtual ~AbstractArbitraryEventsWorker();
+  ArbitraryEventsWorker(){};
+  virtual ~ArbitraryEventsWorker();
 
-protected:
-  virtual bool VisitEvent(gd::BaseEvent& event) override;
-  void VisitEventList(gd::EventsList& events);
+  /**
+   * \brief Launch the worker on the specified events list.
+   */
+  void Launch(gd::EventsList& events) { VisitEventList(events); };
 
  private:
+  void VisitEventList(gd::EventsList& events);
+  bool VisitEvent(gd::BaseEvent& event) override;
   bool VisitLinkEvent(gd::LinkEvent& linkEvent) override;
   void VisitInstructionList(gd::InstructionsList& instructions,
                             bool areConditions);
@@ -99,31 +101,6 @@ protected:
   }
 };
 
-/**
- * \brief ArbitraryEventsWorker is an abstract class used to browse events (and
- * instructions) and do some work on them. Can be used to implement refactoring
- * for example.
- *
- * \see gd::ArbitraryEventsWorkerWithContext
- *
- * \ingroup IDE
- */
-class GD_CORE_API ArbitraryEventsWorker : public AbstractArbitraryEventsWorker {
-public:
-  ArbitraryEventsWorker(){};
-  virtual ~ArbitraryEventsWorker();
-
-  /**
-   * \brief Launch the worker on the specified events list.
-   */
-  void Launch(gd::EventsList &events) {
-    AbstractArbitraryEventsWorker::VisitEventList(events);
-  };
-
-private:
-  bool VisitEvent(gd::BaseEvent &event) override;
-};
-
 /**
  * \brief An events worker that will know about the context (the objects
  * container). Useful for workers working on expressions notably.
@@ -133,10 +110,10 @@ private:
  * \ingroup IDE
  */
 class GD_CORE_API ArbitraryEventsWorkerWithContext
-    : public AbstractArbitraryEventsWorker {
+    : public ArbitraryEventsWorker {
  public:
   ArbitraryEventsWorkerWithContext()
-      : currentProjectScopedContainers(nullptr){};
+      : projectScopedContainers(nullptr){};
   virtual ~ArbitraryEventsWorkerWithContext();
 
   /**
@@ -144,50 +121,53 @@ class GD_CORE_API ArbitraryEventsWorkerWithContext
    * giving the objects container on which the events are applying to.
    */
   void Launch(gd::EventsList& events,
-              const gd::ProjectScopedContainers& projectScopedContainers) {
-    currentProjectScopedContainers = &projectScopedContainers;
-    AbstractArbitraryEventsWorker::VisitEventList(events);
+              const gd::ProjectScopedContainers& projectScopedContainers_) {
+    projectScopedContainers = &projectScopedContainers_;
+    ArbitraryEventsWorker::Launch(events);
   };
 
-protected:
+  void Launch(gd::EventsList& events) = delete;
+
+ protected:
   const gd::ProjectScopedContainers& GetProjectScopedContainers() {
     // Pointers are guaranteed to be not nullptr after
     // Launch was called.
-    return *currentProjectScopedContainers;
+    return *projectScopedContainers;
   };
   const gd::ObjectsContainersList& GetObjectsContainersList() {
     // Pointers are guaranteed to be not nullptr after
     // Launch was called.
-    return currentProjectScopedContainers->GetObjectsContainersList();
+    return projectScopedContainers->GetObjectsContainersList();
   };
 
  private:
-  bool VisitEvent(gd::BaseEvent& event) override;
-
-  const gd::ProjectScopedContainers* currentProjectScopedContainers;
+  const gd::ProjectScopedContainers* projectScopedContainers;
 };
 
 /**
  * \brief ReadOnlyArbitraryEventsWorker is an abstract class used to browse events (and
- * instructions). It must not be inherited directly.
+ * instructions). It can be used to implement autocompletion for example.
  *
- * \see gd::ReadOnlyArbitraryEventsWorker
  * \see gd::ReadOnlyArbitraryEventsWorkerWithContext
  *
  * \ingroup IDE
  */
-class GD_CORE_API AbstractReadOnlyArbitraryEventsWorker : private ReadOnlyEventVisitor {
+class GD_CORE_API ReadOnlyArbitraryEventsWorker : private ReadOnlyEventVisitor {
  public:
-  AbstractReadOnlyArbitraryEventsWorker() : shouldStopIteration(false) {};
-  virtual ~AbstractReadOnlyArbitraryEventsWorker();
+  ReadOnlyArbitraryEventsWorker() : shouldStopIteration(false) {};
+  virtual ~ReadOnlyArbitraryEventsWorker();
+
+  /**
+   * \brief Launch the worker on the specified events list.
+   */
+  void Launch(const gd::EventsList& events) { VisitEventList(events); };
 
 protected:
   void StopAnyEventIteration() override;
-  virtual void VisitEvent(const gd::BaseEvent& event) override;
-
-  void VisitEventList(const gd::EventsList& events);
 
  private:
+  void VisitEventList(const gd::EventsList& events);
+  void VisitEvent(const gd::BaseEvent& event) override;
   void VisitLinkEvent(const gd::LinkEvent& linkEvent) override;
   void VisitInstructionList(const gd::InstructionsList& instructions,
                             bool areConditions);
@@ -233,31 +213,6 @@ protected:
   bool shouldStopIteration;
 };
 
-/**
- * \brief ReadOnlyArbitraryEventsWorker is an abstract class used to browse events (and
- * instructions). It can be used to implement autocompletion for example.
- *
- * \see gd::ReadOnlyArbitraryEventsWorkerWithContext
- *
- * \ingroup IDE
- */
-class GD_CORE_API ReadOnlyArbitraryEventsWorker
-    : public AbstractReadOnlyArbitraryEventsWorker {
-public:
-  ReadOnlyArbitraryEventsWorker(){};
-  virtual ~ReadOnlyArbitraryEventsWorker();
-
-  /**
-   * \brief Launch the worker on the specified events list.
-   */
-  void Launch(const gd::EventsList &events) {
-    AbstractReadOnlyArbitraryEventsWorker::VisitEventList(events);
-  };
-
-private:
-  void VisitEvent(const gd::BaseEvent &event) override;
-};
-
 /**
  * \brief An events worker that will know about the context (the objects
  * container). Useful for workers working on expressions notably.
@@ -267,10 +222,10 @@ private:
  * \ingroup IDE
  */
 class GD_CORE_API ReadOnlyArbitraryEventsWorkerWithContext
-    : public AbstractReadOnlyArbitraryEventsWorker {
+    : public ReadOnlyArbitraryEventsWorker {
  public:
   ReadOnlyArbitraryEventsWorkerWithContext()
-      : currentProjectScopedContainers(nullptr){};
+      : projectScopedContainers(nullptr){};
   virtual ~ReadOnlyArbitraryEventsWorkerWithContext();
 
   /**
@@ -278,22 +233,24 @@ class GD_CORE_API ReadOnlyArbitraryEventsWorkerWithContext
    * giving the objects container on which the events are applying to.
    */
   void Launch(const gd::EventsList& events,
-              const gd::ProjectScopedContainers& projectScopedContainers) {
-    currentProjectScopedContainers = &projectScopedContainers;
-    AbstractReadOnlyArbitraryEventsWorker::VisitEventList(events);
+              const gd::ProjectScopedContainers& projectScopedContainers_) {
+    projectScopedContainers = &projectScopedContainers_;
+    ReadOnlyArbitraryEventsWorker::Launch(events);
   };
 
-protected:
+  void Launch(gd::EventsList& events) = delete;
+
+ protected:
   const gd::ProjectScopedContainers& GetProjectScopedContainers() {
     // Pointers are guaranteed to be not nullptr after
     // Launch was called.
-    return *currentProjectScopedContainers;
+    return *projectScopedContainers;
   };
 
  private:
-  void VisitEvent(const gd::BaseEvent& event) override;
-
-  const gd::ProjectScopedContainers* currentProjectScopedContainers;
+  const gd::ProjectScopedContainers* projectScopedContainers;
 };
 
 }  // namespace gd
+
+#endif  // GDCORE_ARBITRARYEVENTSWORKER_H

Core/GDCore/IDE/Events/BehaviorParametersFiller.cpp

@@ -1,65 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2024 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "BehaviorParametersFiller.h"
-
-#include <map>
-#include <memory>
-#include <vector>
-
-#include "GDCore/Events/Instruction.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
-#include "GDCore/String.h"
-#include "GDCore/Tools/Log.h"
-
-namespace gd {
-
-bool BehaviorParametersFiller::DoVisitInstruction(gd::Instruction &instruction,
-                                                  bool isCondition) {
-  const auto &metadata = isCondition
-                             ? gd::MetadataProvider::GetConditionMetadata(
-                                   platform, instruction.GetType())
-                             : gd::MetadataProvider::GetActionMetadata(
-                                   platform, instruction.GetType());
-
-  gd::ParameterMetadataTools::IterateOverParametersWithIndex(
-      instruction.GetParameters(), metadata.GetParameters(),
-      [&](const gd::ParameterMetadata &parameterMetadata,
-          const gd::Expression &parameterValue, size_t parameterIndex,
-          const gd::String &lastObjectName) {
-        if (parameterMetadata.GetValueTypeMetadata().IsBehavior() &&
-            parameterValue.GetPlainString().length() == 0) {
-
-          auto &expectedBehaviorTypeName =
-              parameterMetadata.GetValueTypeMetadata().GetExtraInfo();
-
-          auto &objectsContainersList =
-              projectScopedContainers.GetObjectsContainersList();
-          auto behaviorNames =
-              objectsContainersList.GetBehaviorsOfObject(lastObjectName, true);
-
-          gd::String foundBehaviorName = "";
-          for (auto &behaviorName : behaviorNames) {
-            auto behaviorTypeName =
-                objectsContainersList.GetTypeOfBehavior(behaviorName, false);
-            if (behaviorTypeName == expectedBehaviorTypeName) {
-              foundBehaviorName = behaviorName;
-              break;
-            }
-          }
-          if (!foundBehaviorName.empty()) {
-            instruction.SetParameter(parameterIndex,
-                                     gd::Expression(foundBehaviorName));
-          }
-        }
-      });
-
-  return false;
-}
-
-BehaviorParametersFiller::~BehaviorParametersFiller() {}
-
-} // namespace gd

Core/GDCore/IDE/Events/BehaviorParametersFiller.h

@@ -1,45 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2024 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/String.h"
-#include <map>
-#include <memory>
-#include <vector>
-
-namespace gd {
-class Instruction;
-class Platform;
-class ProjectScopedContainers;
-} // namespace gd
-
-namespace gd {
-
-/**
- * \brief Fill empty behavior parameters with any behavior that matches the
- * required behavior type.
- *
- * \ingroup IDE
- */
-class GD_CORE_API BehaviorParametersFiller : public ArbitraryEventsWorker {
-public:
-  BehaviorParametersFiller(
-      const gd::Platform &platform_,
-      const gd::ProjectScopedContainers &projectScopedContainers_)
-      : platform(platform_),
-        projectScopedContainers(projectScopedContainers_){};
-  virtual ~BehaviorParametersFiller();
-
-private:
-  bool DoVisitInstruction(gd::Instruction &instruction,
-                          bool isCondition) override;
-
-  const gd::Platform &platform;
-  const gd::ProjectScopedContainers &projectScopedContainers;
-};
-
-} // namespace gd

Core/GDCore/IDE/Events/EventsFunctionSelfCallChecker.cpp

@@ -72,12 +72,12 @@ public:
       gd::String lastObjectParameter = "";
       const gd::InstructionMetadata &instrInfos =
           MetadataProvider::GetActionMetadata(platform, instruction.GetType());
-      for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
+      for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
 
         if (ParameterMetadata::IsExpression(
-                "number", instrInfos.parameters.GetParameter(pNb).GetType()) ||
+                "number", instrInfos.parameters[pNb].GetType()) ||
             ParameterMetadata::IsExpression(
-                "string", instrInfos.parameters.GetParameter(pNb).GetType())) {
+                "string", instrInfos.parameters[pNb].GetType())) {
           auto node = instruction.GetParameter(pNb).GetRootNode();
           node->Visit(*this);
         }

Core/GDCore/IDE/Events/EventsIdentifiersFinder.cpp

@@ -86,11 +86,9 @@ class GD_CORE_API IdentifierFinderExpressionNodeWorker
     }
 
     size_t parameterIndex = 0;
-    for (size_t metadataIndex = (isObjectFunction ? 1 : 0);
-         metadataIndex < metadata.GetParameters().GetParametersCount() &&
-         parameterIndex < node.parameters.size();
-         ++metadataIndex) {
-      auto& parameterMetadata = metadata.GetParameters().GetParameter(metadataIndex);
+    for (size_t metadataIndex = (isObjectFunction ? 1 : 0); metadataIndex < metadata.parameters.size()
+      && parameterIndex < node.parameters.size(); ++metadataIndex) {
+      auto& parameterMetadata = metadata.parameters[metadataIndex];
       if (parameterMetadata.IsCodeOnly()) {
         continue;
       }
@@ -146,10 +144,10 @@ class GD_CORE_API IdentifierFinderEventWorker
                               platform, instruction.GetType())
                         : MetadataProvider::GetActionMetadata(
                               platform, instruction.GetType());
-      for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
+      for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
         // The parameter has the searched type...
-      if (instrInfos.parameters.GetParameter(pNb).GetType() == "identifier"
-       && instrInfos.parameters.GetParameter(pNb).GetExtraInfo() == identifierType) {
+      if (instrInfos.parameters[pNb].GetType() == "identifier"
+       && instrInfos.parameters[pNb].GetExtraInfo() == identifierType) {
           //...remember the value of the parameter.
           if (objectName.empty() || lastObjectParameter == objectName) {
             results.insert(instruction.GetParameter(pNb).GetPlainString());
@@ -157,9 +155,9 @@ class GD_CORE_API IdentifierFinderEventWorker
         }
         // Search in expressions
         else if (ParameterMetadata::IsExpression(
-                    "number", instrInfos.parameters.GetParameter(pNb).GetType()) ||
+                    "number", instrInfos.parameters[pNb].GetType()) ||
                 ParameterMetadata::IsExpression(
-                    "string", instrInfos.parameters.GetParameter(pNb).GetType())) {
+                    "string", instrInfos.parameters[pNb].GetType())) {
           auto node = instruction.GetParameter(pNb).GetRootNode();
 
           IdentifierFinderExpressionNodeWorker searcher(
@@ -172,7 +170,7 @@ class GD_CORE_API IdentifierFinderEventWorker
         }
         // Remember the value of the last "object" parameter.
         else if (gd::ParameterMetadata::IsObject(
-                    instrInfos.parameters.GetParameter(pNb).GetType())) {
+                    instrInfos.parameters[pNb].GetType())) {
           lastObjectParameter =
               instruction.GetParameter(pNb).GetPlainString();
         }
@@ -228,7 +226,7 @@ void EventsIdentifiersFinder::FindArgumentsInEventsAndDependencies(
   eventWorker.Launch(layout.GetEvents(),
       gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout));
 
-  DependenciesAnalyzer dependenciesAnalyzer(project, layout);
+  DependenciesAnalyzer dependenciesAnalyzer = DependenciesAnalyzer(project, layout);
   dependenciesAnalyzer.Analyze();
   for (const gd::String& externalEventName : dependenciesAnalyzer.GetExternalEventsDependencies()) {
     const gd::ExternalEvents& externalEvents = project.GetExternalEvents(externalEventName);

Core/GDCore/IDE/Events/EventsRefactorer.cpp

@@ -296,7 +296,7 @@ class GD_CORE_API ExpressionObjectFinder : public ExpressionParser2NodeWorker {
 };
 
 bool EventsRefactorer::RenameObjectInActions(const gd::Platform& platform,
-                                             const gd::ProjectScopedContainers& projectScopedContainers,
+                                             gd::ProjectScopedContainers& projectScopedContainers,
                                              gd::InstructionsList& actions,
                                              gd::String oldName,
                                              gd::String newName) {
@@ -305,14 +305,14 @@ bool EventsRefactorer::RenameObjectInActions(const gd::Platform& platform,
   for (std::size_t aId = 0; aId < actions.size(); ++aId) {
     const gd::InstructionMetadata& instrInfos =
         MetadataProvider::GetActionMetadata(platform, actions[aId].GetType());
-    for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
+    for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
       // Replace object's name in parameters
-      if (gd::ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType()) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
           actions[aId].GetParameter(pNb).GetPlainString() == oldName)
         actions[aId].SetParameter(pNb, gd::Expression(newName));
       // Replace object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters.GetParameter(pNb).GetType())) {
+                   "number", instrInfos.parameters[pNb].GetType())) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "number", *node, oldName, newName)) {
@@ -322,7 +322,7 @@ bool EventsRefactorer::RenameObjectInActions(const gd::Platform& platform,
       }
       // Replace object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters.GetParameter(pNb).GetType())) {
+                   "string", instrInfos.parameters[pNb].GetType())) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "string", *node, oldName, newName)) {
@@ -347,7 +347,7 @@ bool EventsRefactorer::RenameObjectInActions(const gd::Platform& platform,
 
 bool EventsRefactorer::RenameObjectInConditions(
     const gd::Platform& platform,
-    const gd::ProjectScopedContainers& projectScopedContainers,
+    gd::ProjectScopedContainers& projectScopedContainers,
     gd::InstructionsList& conditions,
     gd::String oldName,
     gd::String newName) {
@@ -357,14 +357,14 @@ bool EventsRefactorer::RenameObjectInConditions(
     const gd::InstructionMetadata& instrInfos =
         MetadataProvider::GetConditionMetadata(platform,
                                                conditions[cId].GetType());
-    for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
+    for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
       // Replace object's name in parameters
-      if (gd::ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType()) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
           conditions[cId].GetParameter(pNb).GetPlainString() == oldName)
         conditions[cId].SetParameter(pNb, gd::Expression(newName));
       // Replace object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters.GetParameter(pNb).GetType())) {
+                   "number", instrInfos.parameters[pNb].GetType())) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "number", *node, oldName, newName)) {
@@ -374,7 +374,7 @@ bool EventsRefactorer::RenameObjectInConditions(
       }
       // Replace object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters.GetParameter(pNb).GetType())) {
+                   "string", instrInfos.parameters[pNb].GetType())) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "string", *node, oldName, newName)) {
@@ -399,7 +399,7 @@ bool EventsRefactorer::RenameObjectInConditions(
 
 bool EventsRefactorer::RenameObjectInEventParameters(
     const gd::Platform& platform,
-    const gd::ProjectScopedContainers& projectScopedContainers,
+    gd::ProjectScopedContainers& projectScopedContainers,
     gd::Expression& expression,
     gd::ParameterMetadata parameterMetadata,
     gd::String oldName,
@@ -432,7 +432,7 @@ bool EventsRefactorer::RenameObjectInEventParameters(
 }
 
 void EventsRefactorer::RenameObjectInEvents(const gd::Platform& platform,
-                                            const gd::ProjectScopedContainers& projectScopedContainers,
+                                            gd::ProjectScopedContainers& projectScopedContainers,
                                             gd::EventsList& events,
                                             gd::String oldName,
                                             gd::String newName) {
@@ -475,7 +475,7 @@ void EventsRefactorer::RenameObjectInEvents(const gd::Platform& platform,
 }
 
 bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
-                                             const gd::ProjectScopedContainers& projectScopedContainers,
+                                             gd::ProjectScopedContainers& projectScopedContainers,
                                              gd::InstructionsList& actions,
                                              gd::String name) {
   bool somethingModified = false;
@@ -485,16 +485,16 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
 
     const gd::InstructionMetadata& instrInfos =
         MetadataProvider::GetActionMetadata(platform, actions[aId].GetType());
-    for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
+    for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
       // Find object's name in parameters
-      if (gd::ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType()) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
           actions[aId].GetParameter(pNb).GetPlainString() == name) {
         deleteMe = true;
         break;
       }
       // Find object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters.GetParameter(pNb).GetType())) {
+                   "number", instrInfos.parameters[pNb].GetType())) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectFinder::CheckIfHasObject(platform, projectScopedContainers, "number", *node, name)) {
@@ -504,7 +504,7 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
       }
       // Find object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters.GetParameter(pNb).GetType())) {
+                   "string", instrInfos.parameters[pNb].GetType())) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectFinder::CheckIfHasObject(platform, projectScopedContainers, "string", *node, name)) {
@@ -532,7 +532,7 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
 
 bool EventsRefactorer::RemoveObjectInConditions(
     const gd::Platform& platform,
-    const gd::ProjectScopedContainers& projectScopedContainers,
+    gd::ProjectScopedContainers& projectScopedContainers,
     gd::InstructionsList& conditions,
     gd::String name) {
   bool somethingModified = false;
@@ -543,16 +543,16 @@ bool EventsRefactorer::RemoveObjectInConditions(
     const gd::InstructionMetadata& instrInfos =
         MetadataProvider::GetConditionMetadata(platform,
                                                conditions[cId].GetType());
-    for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
+    for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
       // Find object's name in parameters
-      if (gd::ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType()) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
           conditions[cId].GetParameter(pNb).GetPlainString() == name) {
         deleteMe = true;
         break;
       }
       // Find object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters.GetParameter(pNb).GetType())) {
+                   "number", instrInfos.parameters[pNb].GetType())) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectFinder::CheckIfHasObject(platform, projectScopedContainers, "number", *node, name)) {
@@ -562,7 +562,7 @@ bool EventsRefactorer::RemoveObjectInConditions(
       }
       // Find object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters.GetParameter(pNb).GetType())) {
+                   "string", instrInfos.parameters[pNb].GetType())) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectFinder::CheckIfHasObject(platform, projectScopedContainers, "string", *node, name)) {
@@ -588,6 +588,31 @@ bool EventsRefactorer::RemoveObjectInConditions(
   return somethingModified;
 }
 
+void EventsRefactorer::RemoveObjectInEvents(const gd::Platform& platform,
+                                            gd::ProjectScopedContainers& projectScopedContainers,
+                                            gd::EventsList& events,
+                                            gd::String name) {
+  for (std::size_t i = 0; i < events.size(); ++i) {
+    vector<gd::InstructionsList*> conditionsVectors =
+        events[i].GetAllConditionsVectors();
+    for (std::size_t j = 0; j < conditionsVectors.size(); ++j) {
+      bool conditionsModified = RemoveObjectInConditions(
+          platform, projectScopedContainers, *conditionsVectors[j], name);
+    }
+
+    vector<gd::InstructionsList*> actionsVectors =
+        events[i].GetAllActionsVectors();
+    for (std::size_t j = 0; j < actionsVectors.size(); ++j) {
+      bool actionsModified = RemoveObjectInActions(
+          platform, projectScopedContainers, *actionsVectors[j], name);
+    }
+
+    if (events[i].CanHaveSubEvents())
+      RemoveObjectInEvents(
+          platform, projectScopedContainers, events[i].GetSubEvents(), name);
+  }
+}
+
 gd::String ReplaceAllOccurrencesCaseInsensitive(gd::String context,
                                                 const gd::String& from,
                                                 const gd::String& to) {

Core/GDCore/IDE/Events/EventsRefactorer.h

@@ -3,8 +3,8 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
-
+#ifndef GDCORE_EVENTSREFACTORER_H
+#define GDCORE_EVENTSREFACTORER_H
 #include <memory>
 #include <vector>
 
@@ -81,11 +81,19 @@ class GD_CORE_API EventsRefactorer {
    * events ).
    */
   static void RenameObjectInEvents(const gd::Platform& platform,
-                                   const gd::ProjectScopedContainers& projectScopedContainers,
+                                   gd::ProjectScopedContainers& projectScopedContainers,
                                    gd::EventsList& events,
                                    gd::String oldName,
                                    gd::String newName);
 
+  /**
+   * Remove all actions or conditions using an object
+   */
+  static void RemoveObjectInEvents(const gd::Platform& platform,
+                                   gd::ProjectScopedContainers& projectScopedContainers,
+                                   gd::EventsList& events,
+                                   gd::String name);
+
   /**
    * Search for a gd::String in events
    *
@@ -128,7 +136,7 @@ class GD_CORE_API EventsRefactorer {
    * \return true if something was modified.
    */
   static bool RenameObjectInActions(const gd::Platform& platform,
-                                    const gd::ProjectScopedContainers& projectScopedContainers,
+                                    gd::ProjectScopedContainers& projectScopedContainers,
                                     gd::InstructionsList& instructions,
                                     gd::String oldName,
                                     gd::String newName);
@@ -140,7 +148,7 @@ class GD_CORE_API EventsRefactorer {
    * \return true if something was modified.
    */
   static bool RenameObjectInConditions(const gd::Platform& platform,
-                                       const gd::ProjectScopedContainers& projectScopedContainers,
+                                       gd::ProjectScopedContainers& projectScopedContainers,
                                        gd::InstructionsList& instructions,
                                        gd::String oldName,
                                        gd::String newName);
@@ -153,7 +161,7 @@ class GD_CORE_API EventsRefactorer {
    */
   static bool RenameObjectInEventParameters(
       const gd::Platform& platform,
-      const gd::ProjectScopedContainers& projectScopedContainers,
+      gd::ProjectScopedContainers& projectScopedContainers,
       gd::Expression& expression,
       gd::ParameterMetadata parameterMetadata,
       gd::String oldName,
@@ -165,7 +173,7 @@ class GD_CORE_API EventsRefactorer {
    * \return true if something was modified.
    */
   static bool RemoveObjectInConditions(const gd::Platform& platform,
-                                       const gd::ProjectScopedContainers& projectScopedContainers,
+                                       gd::ProjectScopedContainers& projectScopedContainers,
                                        gd::InstructionsList& conditions,
                                        gd::String name);
 
@@ -175,7 +183,7 @@ class GD_CORE_API EventsRefactorer {
    * \return true if something was modified.
    */
   static bool RemoveObjectInActions(const gd::Platform& platform,
-                                    const gd::ProjectScopedContainers& projectScopedContainers,
+                                    gd::ProjectScopedContainers& projectScopedContainers,
                                     gd::InstructionsList& conditions,
                                     gd::String name);
 
@@ -242,3 +250,5 @@ class GD_CORE_API EventsRefactorer {
 };
 
 }  // namespace gd
+
+#endif  // GDCORE_EVENTSREFACTORER_H

Core/GDCore/IDE/Events/EventsVariableInstructionTypeSwitcher.cpp

@@ -1,103 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "GDCore/IDE/Events/EventsVariableInstructionTypeSwitcher.h"
-
-#include <map>
-#include <memory>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
-#include "GDCore/Events/Event.h"
-#include "GDCore/Events/EventsList.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/Metadata/ParameterMetadata.h"
-#include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
-#include "GDCore/IDE/Events/ExpressionValidator.h"
-#include "GDCore/IDE/Events/ExpressionVariableOwnerFinder.h"
-#include "GDCore/IDE/Events/ExpressionVariableNameFinder.h"
-#include "GDCore/IDE/VariableInstructionSwitcher.h"
-#include "GDCore/Project/Layout.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/ProjectScopedContainers.h"
-#include "GDCore/Project/VariablesContainer.h"
-#include "GDCore/String.h"
-#include "GDCore/Tools/Log.h"
-
-namespace gd {
-
-VariablesContainer EventsVariableInstructionTypeSwitcher::nullVariablesContainer;
-
-bool EventsVariableInstructionTypeSwitcher::DoVisitInstruction(gd::Instruction& instruction,
-                                                bool isCondition) {
-  const auto& metadata = isCondition
-                             ? gd::MetadataProvider::GetConditionMetadata(
-                                   platform, instruction.GetType())
-                             : gd::MetadataProvider::GetActionMetadata(
-                                   platform, instruction.GetType());
-
-  gd::ParameterMetadataTools::IterateOverParametersWithIndex(
-      instruction.GetParameters(),
-      metadata.GetParameters(),
-      [&](const gd::ParameterMetadata& parameterMetadata,
-          const gd::Expression& parameterValue,
-          size_t parameterIndex,
-          const gd::String& lastObjectName) {
-        const gd::String& type = parameterMetadata.GetType();
-
-        if (!gd::ParameterMetadata::IsExpression("variable", type) ||
-            !gd::VariableInstructionSwitcher::IsSwitchableVariableInstruction(
-                instruction.GetType())) {
-                  return;
-        }
-        const auto variableName =
-            gd::ExpressionVariableNameFinder::GetVariableName(
-                *parameterValue.GetRootNode());
-
-        const gd::VariablesContainer *variablesContainer = nullptr;
-        if (type == "objectvar") {
-          const auto &objectsContainersList =
-              GetProjectScopedContainers().GetObjectsContainersList();
-          if (objectsContainersList.HasObjectOrGroupWithVariableNamed(
-                  lastObjectName, variableName) !=
-              gd::ObjectsContainersList::VariableExistence::DoesNotExist) {
-            variablesContainer =
-                GetProjectScopedContainers()
-                    .GetObjectsContainersList()
-                    .GetObjectOrGroupVariablesContainer(lastObjectName);
-          }
-        } else {
-          if (GetProjectScopedContainers().GetVariablesContainersList().Has(
-                  variableName)) {
-            variablesContainer =
-                &GetProjectScopedContainers()
-                      .GetVariablesContainersList()
-                      .GetVariablesContainerFromVariableName(variableName);
-          }
-        }
-
-        // Every occurrence of the variable or its children are checked.
-        // Ensuring that a child is actually the one with a type change would
-        // take more time.
-        if (variablesContainer == &targetVariablesContainer ||
-            lastObjectName == groupName) {
-          if (typeChangedVariableNames.find(variableName) !=
-              typeChangedVariableNames.end()) {
-            gd::VariableInstructionSwitcher::
-                SwitchBetweenUnifiedInstructionIfNeeded(
-                    platform, GetProjectScopedContainers(), instruction);
-          }
-        }
-      });
-
-  return false;
-}
-
-EventsVariableInstructionTypeSwitcher::~EventsVariableInstructionTypeSwitcher() {}
-
-}  // namespace gd

Core/GDCore/IDE/Events/EventsVariableInstructionTypeSwitcher.h

@@ -1,68 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2024 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-#include <map>
-#include <memory>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/String.h"
-
-namespace gd {
-class VariablesContainer;
-class Platform;
-} // namespace gd
-
-namespace gd {
-/**
- * \brief Switch the types of variable instructions for a given set of
- * variables.
- *
- * \see gd::VariableInstructionSwitcher
- *
- * \ingroup IDE
- */
-class GD_CORE_API EventsVariableInstructionTypeSwitcher
-    : public ArbitraryEventsWorkerWithContext {
-public:
-  EventsVariableInstructionTypeSwitcher(
-      const gd::Platform &platform_,
-      const std::unordered_set<gd::String> &typeChangedVariableNames_,
-      const gd::VariablesContainer &targetVariablesContainer_)
-      : platform(platform_),
-        typeChangedVariableNames(typeChangedVariableNames_),
-        targetVariablesContainer(targetVariablesContainer_), groupName(""){};
-  EventsVariableInstructionTypeSwitcher(
-      const gd::Platform &platform_,
-      const std::unordered_set<gd::String> &typeChangedVariableNames_,
-      const gd::String &groupName_)
-      : platform(platform_),
-        typeChangedVariableNames(typeChangedVariableNames_),
-        targetVariablesContainer(nullVariablesContainer),
-        groupName(groupName_){};
-  virtual ~EventsVariableInstructionTypeSwitcher();
-
-private:
-  bool DoVisitInstruction(gd::Instruction &instruction,
-                          bool isCondition) override;
-
-  const gd::Platform &platform;
-  const gd::VariablesContainer &targetVariablesContainer;
-  /**
-   * Groups don't have VariablesContainer, so `targetVariablesContainer` will be
-   * pointing to `nullVariablesContainer` and the group name is use instead to
-   * check which instruction to modify.
-   */
-  const gd::String groupName;
-  const std::unordered_set<gd::String> &typeChangedVariableNames;
-
-  static VariablesContainer nullVariablesContainer;
-};
-
-} // namespace gd

Core/GDCore/IDE/Events/EventsVariableReplacer.cpp

@@ -20,9 +20,6 @@
 #include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
 #include "GDCore/IDE/Events/ExpressionValidator.h"
 #include "GDCore/IDE/Events/ExpressionVariableOwnerFinder.h"
-#include "GDCore/IDE/Events/ExpressionVariableNameFinder.h"
-#include "GDCore/IDE/VariableInstructionSwitcher.h"
-#include "GDCore/IDE/WholeProjectRefactorer.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
@@ -32,8 +29,6 @@
 
 namespace gd {
 
-VariablesContainer EventsVariableReplacer::nullVariablesContainer;
-
 /**
  * \brief Go through the nodes and rename variables,
  * or signal if the instruction must be renamed if a removed variable is used.
@@ -46,26 +41,22 @@ class GD_CORE_API ExpressionVariableReplacer
   ExpressionVariableReplacer(
       const gd::Platform& platform_,
       const gd::ProjectScopedContainers& projectScopedContainers_,
-      const VariablesRenamingChangesetNode& variablesRenamingChangesetRoot_,
-      const std::unordered_set<gd::String>& removedVariableNames_,
       const gd::VariablesContainer& targetVariablesContainer_,
-      const gd::String &groupName_,
-      const gd::String &forcedInitialObjectName)
+      const std::unordered_map<gd::String, gd::String>& oldToNewVariableNames_,
+      const std::unordered_set<gd::String>& removedVariableNames_)
       : hasDoneRenaming(false),
         removedVariableUsed(false),
         platform(platform_),
         projectScopedContainers(projectScopedContainers_),
-        forcedVariablesContainer(nullptr),
-        forcedObjectName(forcedInitialObjectName),
-        variablesRenamingChangesetRoot(variablesRenamingChangesetRoot_),
-        removedVariableNames(removedVariableNames_),
+        forcedInitialVariablesContainer(nullptr),
         targetVariablesContainer(targetVariablesContainer_),
-        targetGroupName(groupName_){};
+        oldToNewVariableNames(oldToNewVariableNames_),
+        removedVariableNames(removedVariableNames_){};
   virtual ~ExpressionVariableReplacer(){};
 
   void SetForcedInitialVariablesContainer(
       const gd::VariablesContainer* forcedInitialVariablesContainer_) {
-    forcedVariablesContainer = forcedInitialVariablesContainer_;
+    forcedInitialVariablesContainer = forcedInitialVariablesContainer_;
   }
 
   bool HasDoneRenaming() const { return hasDoneRenaming; }
@@ -88,30 +79,21 @@ class GD_CORE_API ExpressionVariableReplacer
     // The node represents a variable or an object name on which a variable
     // will be accessed.
 
-    if (forcedVariablesContainer) {
-      const gd::String oldVariableName = node.name;
-      PushVariablesRenamingChangesetRoot();
+    if (forcedInitialVariablesContainer) {
       // A scope was forced. Honor it: it means this node represents a variable
       // of the forced variables container.
-      if (forcedVariablesContainer == &targetVariablesContainer ||
-          IsTargetingObjectGroup(forcedObjectName)) {
+      if (forcedInitialVariablesContainer == &targetVariablesContainer) {
         RenameOrRemoveVariableOfTargetVariableContainer(node.name);
       }
 
-      if (node.child) {
-        bool hasBeenPushed =
-            PushVariablesRenamingChangesetNodeForVariable(oldVariableName);
-        node.child->Visit(*this);
-        PopVariablesRenamingChangesetNode(hasBeenPushed);
-      }
-      PopVariablesRenamingChangesetNode(true);
+      if (node.child) node.child->Visit(*this);
       return;
     }
 
     // Match the potential *new* name of the variable, because refactorings are
     // done after changes in the variables container.
     projectScopedContainers.MatchIdentifierWithName<void>(
-        node.name,
+        GetPotentialNewName(node.name),
         [&]() {
           // This represents an object.
           // Remember the object name.
@@ -121,21 +103,14 @@ class GD_CORE_API ExpressionVariableReplacer
         },
         [&]() {
           // This is a variable.
-          if (&projectScopedContainers.GetVariablesContainersList()
-                   .GetVariablesContainerFromVariableName(node.name) ==
-              &targetVariablesContainer) {
+          if (projectScopedContainers.GetVariablesContainersList()
+                  .HasVariablesContainer(targetVariablesContainer)) {
             // The node represents a variable, that can come from the target
             // (because the target is in the scope), replace or remove it:
-            PushVariablesRenamingChangesetRoot();
-            RenameVariableAndVisitChild(node.name, node.child.get());
-            PopVariablesRenamingChangesetNode(true);
-          } else {
-            if (node.child) {
-              PushVariablesRenamingChangesetNodeForIgnoredVariables();
-              node.child->Visit(*this);
-              PopVariablesRenamingChangesetNode(true);
-            }
+            RenameOrRemoveVariableOfTargetVariableContainer(node.name);
           }
+
+          if (node.child) node.child->Visit(*this);
         },
         [&]() {
           // This is a property.
@@ -146,7 +121,14 @@ class GD_CORE_API ExpressionVariableReplacer
           if (node.child) node.child->Visit(*this);
         },
         [&]() {
-          // This is something else.
+          // This is something else - potentially a deleted variable.
+          if (projectScopedContainers.GetVariablesContainersList()
+                  .HasVariablesContainer(targetVariablesContainer)) {
+            // The node represents a variable, that can come from the target
+            // (because the target is in the scope), replace or remove it:
+            RenameOrRemoveVariableOfTargetVariableContainer(node.name);
+          }
+
           if (node.child) node.child->Visit(*this);
         });
   }
@@ -154,50 +136,25 @@ class GD_CORE_API ExpressionVariableReplacer
     auto& objectsContainersList =
         projectScopedContainers.GetObjectsContainersList();
     if (!objectNameToUseForVariableAccessor.empty()) {
-      // This is always true because MatchIdentifierWithName is used to get
-      // objectNameToUseForVariableAccessor.
-      if (objectsContainersList.HasObjectOrGroupVariablesContainer(
-              objectNameToUseForVariableAccessor, targetVariablesContainer) ||
-          IsTargetingObjectGroup(objectNameToUseForVariableAccessor)) {
-        objectNameToUseForVariableAccessor = "";
+      if (objectsContainersList.HasVariablesContainer(
+              objectNameToUseForVariableAccessor, targetVariablesContainer)) {
         // The node represents an object variable, and this object variables are
         // the target. Do the replacement or removals:
-        PushVariablesRenamingChangesetRoot();
-        RenameVariableAndVisitChild(node.name, node.child.get());
-        PopVariablesRenamingChangesetNode(true);
+        RenameOrRemoveVariableOfTargetVariableContainer(node.name);
       }
-    } else {
-      RenameVariableAndVisitChild(node.name, node.child.get());
     }
+    objectNameToUseForVariableAccessor = "";
+
+    if (node.child) node.child->Visit(*this);
   }
   void OnVisitVariableBracketAccessorNode(
       VariableBracketAccessorNode& node) override {
     objectNameToUseForVariableAccessor = "";
 
-    // TODO Literal expressions could be checked to handle renaming in
-    // `expression` and in `child`.
     node.expression->Visit(*this);
-    if (node.child) {
-      PushVariablesRenamingChangesetNodeForIgnoredVariables();
-      node.child->Visit(*this);
-      PopVariablesRenamingChangesetNode(true);
-    }
+    if (node.child) node.child->Visit(*this);
   }
-  void OnVisitIdentifierNode(IdentifierNode &node) override {
-    auto renameVariableAndChild = [this, &node]() {
-      PushVariablesRenamingChangesetRoot();
-      const gd::String oldVariableName = node.identifierName;
-      RenameOrRemoveVariableOfTargetVariableContainer(node.identifierName);
-      if (!node.childIdentifierName.empty()) {
-        bool hasBeenPushed =
-            PushVariablesRenamingChangesetNodeForVariable(oldVariableName);
-        RenameOrRemoveVariableOfTargetVariableContainer(
-            node.childIdentifierName);
-        PopVariablesRenamingChangesetNode(hasBeenPushed);
-      }
-      PopVariablesRenamingChangesetNode(true);
-    };
-
+  void OnVisitIdentifierNode(IdentifierNode& node) override {
     auto& objectsContainersList =
         projectScopedContainers.GetObjectsContainersList();
 
@@ -205,12 +162,11 @@ class GD_CORE_API ExpressionVariableReplacer
     // (and if it's a variable reference or a value does not have any importance
     // here).
 
-    if (forcedVariablesContainer) {
+    if (forcedInitialVariablesContainer) {
       // A scope was forced. Honor it: it means this node represents a variable
       // of the forced variables container.
-      if (forcedVariablesContainer == &targetVariablesContainer ||
-          IsTargetingObjectGroup(forcedObjectName)) {
-        renameVariableAndChild();
+      if (forcedInitialVariablesContainer == &targetVariablesContainer) {
+        RenameOrRemoveVariableOfTargetVariableContainer(node.identifierName);
       }
       return;
     }
@@ -218,28 +174,25 @@ class GD_CORE_API ExpressionVariableReplacer
     // Match the potential *new* name of the variable, because refactorings are
     // done after changes in the variables container.
     projectScopedContainers.MatchIdentifierWithName<void>(
-        node.identifierName,
+        GetPotentialNewName(node.identifierName),
         [&]() {
           // This represents an object.
-          if (objectsContainersList.HasObjectOrGroupVariablesContainer(
-                  node.identifierName, targetVariablesContainer) ||
-              IsTargetingObjectGroup(node.identifierName)) {
+          if (objectsContainersList.HasVariablesContainer(
+                  node.identifierName, targetVariablesContainer)) {
             // The node represents an object variable, and this object variables
             // are the target. Do the replacement or removals:
-            PushVariablesRenamingChangesetRoot();
             RenameOrRemoveVariableOfTargetVariableContainer(
                 node.childIdentifierName);
-            PopVariablesRenamingChangesetNode(true);
           }
         },
         [&]() {
           // This is a variable.
-          if (&projectScopedContainers.GetVariablesContainersList()
-                   .GetVariablesContainerFromVariableName(
-                       node.identifierName) == &targetVariablesContainer) {
+          if (projectScopedContainers.GetVariablesContainersList()
+                  .HasVariablesContainer(targetVariablesContainer)) {
             // The node represents a variable, that can come from the target
             // (because the target is in the scope), replace or remove it:
-            renameVariableAndChild();
+            RenameOrRemoveVariableOfTargetVariableContainer(
+                node.identifierName);
           }
         },
         [&]() {
@@ -249,7 +202,14 @@ class GD_CORE_API ExpressionVariableReplacer
           // This is a parameter.
         },
         [&]() {
-          // This is something else.
+          // This is something else - potentially a deleted variable.
+          if (projectScopedContainers.GetVariablesContainersList()
+                  .HasVariablesContainer(targetVariablesContainer)) {
+            // The node represents a variable, that can come from the target
+            // (because the target is in the scope), replace or remove it:
+            RenameOrRemoveVariableOfTargetVariableContainer(
+                node.identifierName);
+          }
         });
   }
   void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {}
@@ -271,33 +231,31 @@ class GD_CORE_API ExpressionVariableReplacer
       // force the "scope" at which starts the evalution of variables.
       if (parameterMetadata && parameterMetadata->GetValueTypeMetadata()
                                    .IsLegacyPreScopedVariable()) {
-        const gd::VariablesContainer *oldForcedVariablesContainer =
-            forcedVariablesContainer;
-        const gd::String &oldForcedObjectName = forcedObjectName;
+        const gd::VariablesContainer* oldForcedInitialVariablesContainer =
+            forcedInitialVariablesContainer;
 
-        forcedVariablesContainer = nullptr;
-        forcedObjectName = "";
+        forcedInitialVariablesContainer = nullptr;
         if (parameterMetadata->GetType() == "globalvar") {
-          forcedVariablesContainer =
+          forcedInitialVariablesContainer =
               projectScopedContainers.GetVariablesContainersList()
                   .GetTopMostVariablesContainer();
         } else if (parameterMetadata->GetType() == "scenevar") {
-          forcedVariablesContainer =
+          forcedInitialVariablesContainer =
               projectScopedContainers.GetVariablesContainersList()
                   .GetBottomMostVariablesContainer();
         } else if (parameterMetadata->GetType() == "objectvar") {
           auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
-              platform, projectScopedContainers.GetObjectsContainersList(),
-              node.objectName, *node.parameters[parameterIndex].get());
-          forcedVariablesContainer =
+              platform,
+              projectScopedContainers.GetObjectsContainersList(),
+              node.objectName,
+              *node.parameters[parameterIndex].get());
+          forcedInitialVariablesContainer =
               projectScopedContainers.GetObjectsContainersList()
                   .GetObjectOrGroupVariablesContainer(objectName);
-          forcedObjectName = objectName;
         }
 
         node.parameters[parameterIndex]->Visit(*this);
-        forcedVariablesContainer = oldForcedVariablesContainer;
-        forcedObjectName = oldForcedObjectName;
+        forcedInitialVariablesContainer = oldForcedInitialVariablesContainer;
       } else {
         // For any other parameter, there is no special treatment being needed.
         node.parameters[parameterIndex]->Visit(*this);
@@ -310,28 +268,19 @@ class GD_CORE_API ExpressionVariableReplacer
   bool hasDoneRenaming;
   bool removedVariableUsed;
 
-  bool IsTargetingObjectGroup(const gd::String &objectGroupName) {
-    return !targetGroupName.empty() && objectGroupName == targetGroupName;
+  const gd::String& GetPotentialNewName(const gd::String& oldName) {
+    return oldToNewVariableNames.count(oldName) >= 1
+            ? oldToNewVariableNames.find(oldName)->second
+            : oldName;
   }
 
   bool RenameOrRemoveVariableOfTargetVariableContainer(
       gd::String& variableName) {
-    const auto *currentVariablesRenamingChangesetNode =
-        GetCurrentVariablesRenamingChangesetNode();
-    if (!currentVariablesRenamingChangesetNode) {
-      return false;
-    }
-    const auto &oldToNewVariableNames =
-        currentVariablesRenamingChangesetNode->oldToNewVariableNames;
     if (oldToNewVariableNames.count(variableName) >= 1) {
       variableName = oldToNewVariableNames.find(variableName)->second;
       hasDoneRenaming = true;
       return true;
-    } else if (
-      // Only the root variable is checked for removing.
-      currentVariablesRenamingChangesetNode ==
-                   &variablesRenamingChangesetRoot &&
-               removedVariableNames.count(variableName) >= 1) {
+    } else if (removedVariableNames.count(variableName) >= 1) {
       removedVariableUsed = true;
       return true;
     }
@@ -339,88 +288,24 @@ class GD_CORE_API ExpressionVariableReplacer
     return false;  // Nothing was changed or done.
   }
 
-  void RenameVariableAndVisitChild(gd::String &variableName,
-                                   ExpressionNode *childNode) {
-    // `variableName` is modified by
-    // `RenameOrRemoveVariableOfTargetVariableContainer`.
-    const gd::String oldVariableName = variableName;
-    RenameOrRemoveVariableOfTargetVariableContainer(variableName);
-    if (childNode) {
-      bool hasBeenPushed =
-          PushVariablesRenamingChangesetNodeForVariable(oldVariableName);
-      childNode->Visit(*this);
-      PopVariablesRenamingChangesetNode(hasBeenPushed);
-    }
-  }
-
-  void PushVariablesRenamingChangesetRoot() {
-    variablesRenamingChangesetNodeStack.push_back(&variablesRenamingChangesetRoot);
-  }
-
-  void PushVariablesRenamingChangesetNodeForIgnoredVariables() {
-    variablesRenamingChangesetNodeStack.push_back(nullptr);
-  }
-
-  const gd::VariablesRenamingChangesetNode *GetCurrentVariablesRenamingChangesetNode() {
-    return variablesRenamingChangesetNodeStack.size() == 0 ?
-    &variablesRenamingChangesetRoot :
-        variablesRenamingChangesetNodeStack
-            [variablesRenamingChangesetNodeStack.size() - 1];
-  }
-
-  bool PushVariablesRenamingChangesetNodeForVariable(const gd::String& variableName) {
-    const auto *currentVariablesRenamingChangesetNode = GetCurrentVariablesRenamingChangesetNode();
-    if (!currentVariablesRenamingChangesetNode) {
-      // There were already no more change on a parent.
-      return false;
-    }
-    const auto &childVariablesRenamingChangesetNodeItr =
-        currentVariablesRenamingChangesetNode->modifiedVariables.find(
-            variableName);
-    if (childVariablesRenamingChangesetNodeItr ==
-        currentVariablesRenamingChangesetNode->modifiedVariables.end()) {
-      // There is no more change on the current variable child.
-      variablesRenamingChangesetNodeStack.push_back(nullptr);
-    }
-    else {
-      variablesRenamingChangesetNodeStack.push_back(
-          childVariablesRenamingChangesetNodeItr->second.get());
-    }
-    return true;
-  }
-
-  void PopVariablesRenamingChangesetNode(bool hasBeenPushed) {
-    if (hasBeenPushed) {
-      variablesRenamingChangesetNodeStack.pop_back();
-    }
-  }
-
   // Scope:
   const gd::Platform& platform;
   const gd::ProjectScopedContainers& projectScopedContainers;
-  const gd::VariablesContainer* forcedVariablesContainer;
-  gd::String forcedObjectName;
+  const gd::VariablesContainer* forcedInitialVariablesContainer;
 
   // Renaming or removing to do:
   const gd::VariablesContainer& targetVariablesContainer;
-  /**
-   * Groups don't have VariablesContainer, so `targetVariablesContainer` will be
-   * pointing to `nullVariablesContainer` and the group name is use instead to
-   * check which variable accesses to modify in expressions.
-   */
-  const gd::String& targetGroupName;
-  const VariablesRenamingChangesetNode &variablesRenamingChangesetRoot;
+  const std::unordered_map<gd::String, gd::String>& oldToNewVariableNames;
   const std::unordered_set<gd::String>& removedVariableNames;
 
   gd::String objectNameToUseForVariableAccessor;
-  std::vector<const VariablesRenamingChangesetNode*> variablesRenamingChangesetNodeStack;
 };
 
 const gd::VariablesContainer*
 EventsVariableReplacer::FindForcedVariablesContainerIfAny(
     const gd::String& type, const gd::String& lastObjectName) {
   // Handle legacy pre-scoped variable parameters: in this case, we
-  // force the "scope" at which starts the evaluation of variables.
+  // force the "scope" at which starts the evalution of variables.
   if (type == "objectvar") {
     return GetProjectScopedContainers()
         .GetObjectsContainersList()
@@ -465,11 +350,9 @@ bool EventsVariableReplacer::DoVisitInstruction(gd::Instruction& instruction,
         if (node) {
           ExpressionVariableReplacer renamer(platform,
                                              GetProjectScopedContainers(),
-                                             variablesRenamingChangesetRoot,
-                                             removedVariableNames,
                                              targetVariablesContainer,
-                                             targetGroupName,
-                                             type == "objectvar" ? lastObjectName : "");
+                                             oldToNewVariableNames,
+                                             removedVariableNames);
           renamer.SetForcedInitialVariablesContainer(
               FindForcedVariablesContainerIfAny(type, lastObjectName));
           node->Visit(renamer);
@@ -499,11 +382,9 @@ bool EventsVariableReplacer::DoVisitEventExpression(
   if (node) {
     ExpressionVariableReplacer renamer(platform,
                                        GetProjectScopedContainers(),
-                                       variablesRenamingChangesetRoot,
-                                       removedVariableNames,
                                        targetVariablesContainer,
-                                       targetGroupName,
-                                       "");
+                                       oldToNewVariableNames,
+                                       removedVariableNames);
     renamer.SetForcedInitialVariablesContainer(
         FindForcedVariablesContainerIfAny(type, ""));
     node->Visit(renamer);

Core/GDCore/IDE/Events/EventsVariableReplacer.h

@@ -4,7 +4,6 @@
  * reserved. This project is released under the MIT License.
  */
 #pragma once
-
 #include <map>
 #include <memory>
 #include <unordered_map>
@@ -13,13 +12,11 @@
 
 #include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
 #include "GDCore/String.h"
-
 namespace gd {
 class BaseEvent;
 class VariablesContainer;
 class EventsList;
 class Platform;
-struct VariablesRenamingChangesetNode;
 }  // namespace gd
 
 namespace gd {
@@ -35,24 +32,13 @@ class GD_CORE_API EventsVariableReplacer
  public:
   EventsVariableReplacer(
       const gd::Platform &platform_,
-      const VariablesRenamingChangesetNode &variablesRenamingChangesetRoot_,
-      const std::unordered_set<gd::String> &removedVariableNames_,
-      const gd::VariablesContainer &targetVariablesContainer_)
+      const gd::VariablesContainer &targetVariablesContainer_,
+      const std::unordered_map<gd::String, gd::String> &oldToNewVariableNames_,
+      const std::unordered_set<gd::String> &removedVariableNames_)
       : platform(platform_),
-        variablesRenamingChangesetRoot(variablesRenamingChangesetRoot_),
-        removedVariableNames(removedVariableNames_),
         targetVariablesContainer(targetVariablesContainer_),
-        targetGroupName("") {};
-  EventsVariableReplacer(
-      const gd::Platform &platform_,
-      const VariablesRenamingChangesetNode &variablesRenamingChangesetRoot_,
-      const std::unordered_set<gd::String> &removedVariableNames_,
-      const gd::String &targetGroupName_)
-      : platform(platform_),
-        variablesRenamingChangesetRoot(variablesRenamingChangesetRoot_),
-        removedVariableNames(removedVariableNames_),
-        targetVariablesContainer(nullVariablesContainer),
-        targetGroupName(targetGroupName_) {};
+        oldToNewVariableNames(oldToNewVariableNames_),
+        removedVariableNames(removedVariableNames_){};
   virtual ~EventsVariableReplacer();
 
  private:
@@ -66,16 +52,9 @@ class GD_CORE_API EventsVariableReplacer
 
   const gd::Platform &platform;
   const gd::VariablesContainer &targetVariablesContainer;
-  /**
-   * Groups don't have VariablesContainer, so `targetVariablesContainer` will be
-   * pointing to `nullVariablesContainer` and the group name is use instead to
-   * check which variable accesses to modify in expressions.
-   */
-  const gd::String targetGroupName;
-  const VariablesRenamingChangesetNode &variablesRenamingChangesetRoot;
+  gd::String objectName;
+  const std::unordered_map<gd::String, gd::String> &oldToNewVariableNames;
   const std::unordered_set<gd::String> &removedVariableNames;
-
-  static VariablesContainer nullVariablesContainer;
 };
 
 }  // namespace gd

Core/GDCore/IDE/Events/EventsVariablesFinder.cpp

@@ -93,11 +93,9 @@ class GD_CORE_API VariableFinderExpressionNodeWorker
     }
 
     size_t parameterIndex = 0;
-    for (size_t metadataIndex = (isObjectFunction ? 1 : 0);
-         metadataIndex < metadata.GetParameters().GetParametersCount() &&
-         parameterIndex < node.parameters.size();
-         ++metadataIndex) {
-      auto& parameterMetadata = metadata.GetParameters().GetParameter(metadataIndex);
+    for (size_t metadataIndex = (isObjectFunction ? 1 : 0); metadataIndex < metadata.parameters.size()
+      && parameterIndex < node.parameters.size(); ++metadataIndex) {
+      auto& parameterMetadata = metadata.parameters[metadataIndex];
       if (parameterMetadata.IsCodeOnly()) {
         continue;
       }
@@ -152,18 +150,18 @@ class GD_CORE_API VariableFinderEventWorker
                               platform, instruction.GetType())
                         : MetadataProvider::GetActionMetadata(
                               platform, instruction.GetType());
-      for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
+      for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
         // The parameter has the searched type...
-        if (instrInfos.parameters.GetParameter(pNb).GetType() == parameterType) {
+        if (instrInfos.parameters[pNb].GetType() == parameterType) {
           //...remember the value of the parameter.
           if (objectName.empty() || lastObjectParameter == objectName)
             results.insert(instruction.GetParameter(pNb).GetPlainString());
         }
         // Search in expressions
         else if (ParameterMetadata::IsExpression(
-                    "number", instrInfos.parameters.GetParameter(pNb).GetType()) ||
+                    "number", instrInfos.parameters[pNb].GetType()) ||
                 ParameterMetadata::IsExpression(
-                    "string", instrInfos.parameters.GetParameter(pNb).GetType())) {
+                    "string", instrInfos.parameters[pNb].GetType())) {
           auto node = instruction.GetParameter(pNb).GetRootNode();
 
           VariableFinderExpressionNodeWorker searcher(
@@ -176,7 +174,7 @@ class GD_CORE_API VariableFinderEventWorker
         }
         // Remember the value of the last "object" parameter.
         else if (gd::ParameterMetadata::IsObject(
-                    instrInfos.parameters.GetParameter(pNb).GetType())) {
+                    instrInfos.parameters[pNb].GetType())) {
           lastObjectParameter =
               instruction.GetParameter(pNb).GetPlainString();
         }
@@ -231,7 +229,7 @@ std::set<gd::String> EventsVariablesFinder::FindAllObjectVariables(
     const gd::Platform& platform,
     const gd::Project& project,
     const gd::Layout& layout,
-    const gd::String& objectName) {
+    const gd::Object& object) {
   std::set<gd::String> results;
 
   FindArgumentsInEventsAndDependencies(
@@ -240,7 +238,7 @@ std::set<gd::String> EventsVariablesFinder::FindAllObjectVariables(
       project,
       layout,
       "objectvar",
-      objectName);
+      object.GetName());
 
   return results;
 }
@@ -260,7 +258,7 @@ void EventsVariablesFinder::FindArgumentsInEventsAndDependencies(
   eventWorker.Launch(layout.GetEvents(),
       gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout));
 
-  DependenciesAnalyzer dependenciesAnalyzer(project, layout);
+  DependenciesAnalyzer dependenciesAnalyzer = DependenciesAnalyzer(project, layout);
   dependenciesAnalyzer.Analyze();
   for (const gd::String& externalEventName : dependenciesAnalyzer.GetExternalEventsDependencies()) {
     const gd::ExternalEvents& externalEvents = project.GetExternalEvents(externalEventName);

Core/GDCore/IDE/Events/EventsVariablesFinder.h

@@ -63,14 +63,14 @@ class EventsVariablesFinder {
    *
    * \param project The project
    * \param layout The layout to use.
-   * \param  objectName The name of the object to be scanned
+   * \param  object The object to be scanned
    * \return A std::set containing the names of all object variables used.
    */
   static std::set<gd::String> FindAllObjectVariables(
       const gd::Platform& platform,
       const gd::Project& project,
       const gd::Layout& layout,
-      const gd::String& objectName);
+      const gd::Object& object);
 
  private:
 

Core/GDCore/IDE/Events/ExpressionCompletionFinder.h

@@ -3,23 +3,21 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
+#ifndef GDCORE_EXPRESSIONAUTOCOMPLETIONPROVIDER_H
+#define GDCORE_EXPRESSIONAUTOCOMPLETIONPROVIDER_H
 
 #include <memory>
 #include <vector>
 
 #include "GDCore/Events/Parsers/ExpressionParser2.h"
 #include "GDCore/Events/Parsers/ExpressionParser2Node.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
 #include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
-#include "GDCore/Events/Parsers/GrammarTerminals.h"
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/Extensions/Metadata/ValueTypeMetadata.h"
 #include "GDCore/IDE/Events/ExpressionNodeLocationFinder.h"
 #include "GDCore/IDE/Events/ExpressionTypeFinder.h"
 #include "GDCore/IDE/Events/ExpressionVariableOwnerFinder.h"
-#include "GDCore/IDE/Events/ExpressionVariablePathFinder.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/Project/Variable.h"
 
@@ -146,19 +144,6 @@ struct GD_CORE_API ExpressionCompletionDescription {
     return *this;
   }
 
-  /**
-   * \brief Return the scope of the variable, for a variable completion.
-   */
-  gd::VariablesContainer::SourceType GetVariableScope() const {
-    return variableScope;
-  }
-
-  ExpressionCompletionDescription &
-  SetVariableScope(gd::VariablesContainer::SourceType variableScope_) {
-    variableScope = variableScope_;
-    return *this;
-  }
-
   /**
    * \brief Return the prefix that must be completed.
    */
@@ -327,7 +312,6 @@ struct GD_CORE_API ExpressionCompletionDescription {
                                   size_t replacementEndPosition_)
       : completionKind(completionKind_),
         variableType(gd::Variable::Number),
-        variableScope(gd::VariablesContainer::Unknown),
         replacementStartPosition(replacementStartPosition_),
         replacementEndPosition(replacementEndPosition_),
         isExact(false),
@@ -338,7 +322,6 @@ struct GD_CORE_API ExpressionCompletionDescription {
  private:
   CompletionKind completionKind;
   gd::Variable::Type variableType;
-  gd::VariablesContainer::SourceType variableScope;
   gd::String type;
   gd::String prefix;
   gd::String completion;
@@ -463,15 +446,11 @@ class GD_CORE_API ExpressionCompletionFinder
           MetadataProvider::GetFunctionCallMetadata(
               platform, objectsContainersList, *functionCall);
 
-      const gd::ParameterMetadata *parameterMetadata = nullptr;
-      while (metadataParameterIndex <
-             metadata.GetParameters().GetParametersCount()) {
-        if (!metadata.GetParameters()
-                 .GetParameter(metadataParameterIndex)
-                 .IsCodeOnly()) {
+      const gd::ParameterMetadata* parameterMetadata = nullptr;
+      while (metadataParameterIndex < metadata.parameters.size()) {
+        if (!metadata.parameters[metadataParameterIndex].IsCodeOnly()) {
           if (visibleParameterIndex == parameterIndex) {
-            parameterMetadata =
-                &metadata.GetParameters().GetParameter(metadataParameterIndex);
+            parameterMetadata = &metadata.parameters[metadataParameterIndex];
           }
           visibleParameterIndex++;
         }
@@ -507,56 +486,47 @@ class GD_CORE_API ExpressionCompletionFinder
     auto type = gd::ExpressionTypeFinder::GetType(
         platform, projectScopedContainers, rootType, node);
 
-    // Only attempt to complete with the children of the variable
-    // if it's the last child (no more `.AnotherVariable` written after).
-    bool eagerlyCompleteIfExactMatch = node.child == nullptr;
-
     if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
-      if (type == "globalvar" || type == "scenevar") {
+      if (type == "globalvar") {
         const auto* variablesContainer =
-            type == "globalvar"
-                ? projectScopedContainers.GetVariablesContainersList()
-                      .GetTopMostVariablesContainer()
-                : projectScopedContainers.GetVariablesContainersList()
-                      .GetBottomMostVariablesContainer();
+            projectScopedContainers.GetVariablesContainersList()
+                .GetTopMostVariablesContainer();
         if (variablesContainer) {
-          AddCompletionsForVariablesMatchingSearch(*variablesContainer,
-                                                   node.name,
-                                                   node.nameLocation,
-                                                   eagerlyCompleteIfExactMatch);
+          AddCompletionsForVariablesMatchingSearch(
+              *variablesContainer, node.name, node.nameLocation);
+        }
+      } else if (type == "scenevar") {
+        const auto* variablesContainer =
+            projectScopedContainers.GetVariablesContainersList()
+                .GetBottomMostVariablesContainer();
+        if (variablesContainer) {
+          AddCompletionsForVariablesMatchingSearch(
+              *variablesContainer, node.name, node.nameLocation);
         }
       } else if (type == "objectvar") {
         auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
-            platform, objectsContainersList, rootObjectName, node);
+            platform,
+            objectsContainersList,
+            // Variable fields doesn't use expression completion,
+            // so the object will be found inside the expression itself.
+            "",
+            node);
 
         AddCompletionsForObjectOrGroupVariablesMatchingSearch(
-            objectsContainersList,
-            objectName,
-            node.name,
-            node.nameLocation,
-            eagerlyCompleteIfExactMatch);
+            objectsContainersList, objectName, node.name, node.nameLocation);
       }
     } else {
       AddCompletionsForObjectsAndVariablesMatchingSearch(
-          node.name, type, node.nameLocation, eagerlyCompleteIfExactMatch);
+          node.name, type, node.nameLocation);
     }
   }
   void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
-    VariableAndItsParent variableAndItsParent =
-        gd::ExpressionVariablePathFinder::GetLastParentOfNode(
-            platform, projectScopedContainers, node);
-
-    // If no child, we're at the end of a variable (like `GrandChild` in
-    // `Something.Child.GrandChild`) so we can complete eagerly children if we
-    // can.
-    gd::String eagerlyCompleteForVariableName =
-        node.child == nullptr ? node.name : "";
-    AddCompletionsForChildrenVariablesOf(variableAndItsParent,
-                                         node.nameLocation,
-                                         eagerlyCompleteForVariableName);
+    // No completions
   }
   void OnVisitVariableBracketAccessorNode(
-      VariableBracketAccessorNode& node) override {}
+      VariableBracketAccessorNode& node) override {
+    // No completions
+  }
   void OnVisitIdentifierNode(IdentifierNode& node) override {
     const auto& objectsContainersList =
         projectScopedContainers.GetObjectsContainersList();
@@ -567,81 +537,45 @@ class GD_CORE_API ExpressionCompletionFinder
       AddCompletionsForObjectMatchingSearch(
           node.identifierName, type, node.location);
     } else if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
-      if (type == "globalvar" || type == "scenevar") {
+      if (type == "globalvar") {
         const auto* variablesContainer =
-            type == "globalvar"
-                ? projectScopedContainers.GetVariablesContainersList()
-                      .GetTopMostVariablesContainer()
-                : projectScopedContainers.GetVariablesContainersList()
-                      .GetBottomMostVariablesContainer();
+            projectScopedContainers.GetVariablesContainersList()
+                .GetTopMostVariablesContainer();
         if (variablesContainer) {
-          if (IsCaretOn(node.identifierNameDotLocation) ||
-              IsCaretOn(node.childIdentifierNameLocation)) {
-            // Complete a potential child variable:
-            if (variablesContainer->Has(node.identifierName)) {
-              AddCompletionsForChildrenVariablesOf(
-                  &variablesContainer->Get(node.identifierName),
-                  node.childIdentifierNameLocation,
-                  node.childIdentifierName);
-            }
-          } else {
-            // Complete a root variable of the scene or project.
-
-            // Don't attempt to complete children variables if there is
-            // already a dot written (`MyVariable.`).
-            bool eagerlyCompleteIfPossible =
-                !node.identifierNameDotLocation.IsValid();
-            AddCompletionsForVariablesMatchingSearch(
-                *variablesContainer,
-                node.identifierName,
-                node.identifierNameLocation,
-                eagerlyCompleteIfPossible);
-          }
+          AddCompletionsForVariablesMatchingSearch(*variablesContainer,
+                                               node.identifierName,
+                                               node.identifierNameLocation);
+        }
+      } else if (type == "scenevar") {
+        const auto* variablesContainer =
+            projectScopedContainers.GetVariablesContainersList()
+                .GetBottomMostVariablesContainer();
+        if (variablesContainer) {
+          AddCompletionsForVariablesMatchingSearch(*variablesContainer,
+                                               node.identifierName,
+                                               node.identifierNameLocation);
         }
       } else if (type == "objectvar") {
         auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
-            platform, objectsContainersList, rootObjectName, node);
+            platform,
+            objectsContainersList,
+            // Variable fields doesn't use expression completion,
+            // so the object will be found inside the expression itself.
+            "",
+            node);
 
-        if (IsCaretOn(node.identifierNameDotLocation) ||
-            IsCaretOn(node.childIdentifierNameLocation)) {
-          // Complete a potential child variable:
-          const auto* variablesContainer =
-              objectsContainersList.GetObjectOrGroupVariablesContainer(
-                  objectName);
-          if (variablesContainer &&
-              variablesContainer->Has(node.identifierName)) {
-            AddCompletionsForChildrenVariablesOf(
-                &variablesContainer->Get(node.identifierName),
-                node.childIdentifierNameLocation,
-                node.childIdentifierName);
-          }
-        } else {
-          // Complete a root variable of the object.
-
-          // Don't attempt to complete children variables if there is
-          // already a dot written (`MyVariable.`).
-          bool eagerlyCompleteIfPossible =
-              !node.identifierNameDotLocation.IsValid();
-          AddCompletionsForObjectOrGroupVariablesMatchingSearch(
-              objectsContainersList,
-              objectName,
-              node.identifierName,
-              node.identifierNameLocation,
-              eagerlyCompleteIfPossible);
-        }
+        AddCompletionsForObjectOrGroupVariablesMatchingSearch(
+            objectsContainersList,
+            objectName,
+            node.identifierName,
+            node.identifierNameLocation);
       }
     } else {
       // Object function, behavior name, variable, object variable.
       if (IsCaretOn(node.identifierNameLocation)) {
-        // Don't attempt to complete children variables if there is
-        // already a dot written (`MyVariable.`).
-        bool eagerlyCompleteIfPossible =
-            !node.identifierNameDotLocation.IsValid();
+        // Is this the proper position?
         AddCompletionsForAllIdentifiersMatchingSearch(
-            node.identifierName,
-            type,
-            node.identifierNameLocation,
-            eagerlyCompleteIfPossible);
+            node.identifierName, type, node.identifierNameLocation);
         if (!node.identifierNameDotLocation.IsValid()) {
           completions.push_back(
               ExpressionCompletionDescription::ForExpressionWithPrefix(
@@ -652,57 +586,27 @@ class GD_CORE_API ExpressionCompletionFinder
         }
       } else if (IsCaretOn(node.identifierNameDotLocation) ||
                  IsCaretOn(node.childIdentifierNameLocation)) {
-        // Might be:
-        // - An object variable, object behavior or object expression.
-        // - Or a variable with a child.
-        projectScopedContainers.MatchIdentifierWithName<void>(
-            node.identifierName,
-            [&]() {
-              // This is an object.
-              const gd::String& objectName = node.identifierName;
-              AddCompletionsForObjectOrGroupVariablesMatchingSearch(
-                  objectsContainersList,
-                  objectName,
-                  node.childIdentifierName,
-                  node.childIdentifierNameLocation,
-                  true);
+        const gd::String& objectName = node.identifierName;
 
-              completions.push_back(
-                  ExpressionCompletionDescription::ForBehaviorWithPrefix(
-                      node.childIdentifierName,
-                      node.childIdentifierNameLocation.GetStartPosition(),
-                      node.childIdentifierNameLocation.GetEndPosition(),
-                      objectName));
-              completions.push_back(
-                  ExpressionCompletionDescription::ForExpressionWithPrefix(
-                      type,
-                      node.childIdentifierName,
-                      node.childIdentifierNameLocation.GetStartPosition(),
-                      node.childIdentifierNameLocation.GetEndPosition(),
-                      objectName));
-            },
-            [&]() {
-              // This is a variable.
-              VariableAndItsParent variableAndItsParent =
-                  gd::ExpressionVariablePathFinder::GetLastParentOfNode(
-                      platform, projectScopedContainers, node);
-
-              AddCompletionsForChildrenVariablesOf(
-                  variableAndItsParent,
-                  node.childIdentifierNameLocation,
-                  node.childIdentifierName);
-            },
-            [&]() {
-              // Ignore properties here.
-              // There is no support for "children" of properties.
-            },
-            [&]() {
-              // Ignore parameters here.
-              // There is no support for "children" of parameters.
-            },
-            [&]() {
-              // Ignore unrecognised identifiers here.
-            });
+        // Might be an object variable, object behavior or object expression:
+        AddCompletionsForObjectOrGroupVariablesMatchingSearch(
+            objectsContainersList,
+            objectName,
+            node.childIdentifierName,
+            node.childIdentifierNameLocation);
+        completions.push_back(
+            ExpressionCompletionDescription::ForBehaviorWithPrefix(
+                node.childIdentifierName,
+                node.childIdentifierNameLocation.GetStartPosition(),
+                node.childIdentifierNameLocation.GetEndPosition(),
+                objectName));
+        completions.push_back(
+            ExpressionCompletionDescription::ForExpressionWithPrefix(
+                type,
+                node.childIdentifierName,
+                node.childIdentifierNameLocation.GetStartPosition(),
+                node.childIdentifierNameLocation.GetEndPosition(),
+                objectName));
       }
     }
   }
@@ -832,8 +736,7 @@ class GD_CORE_API ExpressionCompletionFinder
     auto type = gd::ExpressionTypeFinder::GetType(
         platform, projectScopedContainers, rootType, node);
 
-    AddCompletionsForAllIdentifiersMatchingSearch(
-        node.text, type, node.location);
+    AddCompletionsForAllIdentifiersMatchingSearch(node.text, type, node.location);
     completions.push_back(
         ExpressionCompletionDescription::ForExpressionWithPrefix(
             type,
@@ -852,96 +755,10 @@ class GD_CORE_API ExpressionCompletionFinder
              (inclusive && searchedPosition <= location.GetEndPosition())));
   }
 
-  /**
-   * A slightly less strict check than `gd::Project::IsNameSafe` as child
-   * variables can be completed even if they start with a number.
-   */
-  bool IsIdentifierSafe(const gd::String& name) {
-    if (name.empty()) return false;
-
-    for (auto character : name) {
-      if (!GrammarTerminals::IsAllowedInIdentifier(character)) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  void AddCompletionsForChildrenVariablesOf(
-      VariableAndItsParent variableAndItsParent,
-      const ExpressionParserLocation& location,
-      gd::String eagerlyCompleteForVariableName = "") {
-    if (variableAndItsParent.parentVariable) {
-      AddCompletionsForChildrenVariablesOf(variableAndItsParent.parentVariable,
-                                           location,
-                                           eagerlyCompleteForVariableName);
-    } else if (variableAndItsParent.parentVariablesContainer) {
-      AddCompletionsForVariablesMatchingSearch(
-          *variableAndItsParent.parentVariablesContainer, "", location);
-    }
-  }
-
-  void AddCompletionsForChildrenVariablesOf(
-      const gd::Variable* variable,
-      const ExpressionParserLocation& location,
-      gd::String eagerlyCompleteForVariableName = "") {
-    if (!variable) return;
-
-    if (variable->GetType() == gd::Variable::Structure) {
-      for (const auto& name : variable->GetAllChildrenNames()) {
-        if (!IsIdentifierSafe(name)) continue;
-
-        const auto& childVariable = variable->GetChild(name);
-        ExpressionCompletionDescription description(
-            ExpressionCompletionDescription::Variable,
-            location.GetStartPosition(),
-            location.GetEndPosition());
-        description.SetCompletion(name);
-        description.SetVariableType(childVariable.GetType());
-        completions.push_back(description);
-
-        if (name == eagerlyCompleteForVariableName) {
-          AddEagerCompletionForVariableChildren(childVariable, name, location);
-        }
-      }
-    } else {
-      // TODO: we could do a "comment only completion" to indicate that nothing
-      // can/should be completed?
-    }
-  }
-
-  void AddEagerCompletionForVariableChildren(
-      const gd::Variable& variable,
-      const gd::String& variableName,
-      const ExpressionParserLocation& location) {
-    if (variable.GetType() == gd::Variable::Structure) {
-      gd::String prefix = variableName + ".";
-      for (const auto& name : variable.GetAllChildrenNames()) {
-        gd::String completion =
-            IsIdentifierSafe(name)
-                ? (prefix + name)
-                : (variableName + "[" +
-                   gd::ExpressionParser2NodePrinter::PrintStringLiteral(name) +
-                   "]");
-
-        const auto& childVariable = variable.GetChild(name);
-        ExpressionCompletionDescription description(
-            ExpressionCompletionDescription::Variable,
-            location.GetStartPosition(),
-            location.GetEndPosition());
-        description.SetCompletion(completion);
-        description.SetVariableType(childVariable.GetType());
-        completions.push_back(description);
-      }
-    }
-  }
-
   void AddCompletionsForVariablesMatchingSearch(
       const gd::VariablesContainer& variablesContainer,
       const gd::String& search,
-      const ExpressionParserLocation& location,
-      bool eagerlyCompleteIfExactMatch = false) {
+      const ExpressionParserLocation& location) {
     variablesContainer.ForEachVariableMatchingSearch(
         search,
         [&](const gd::String& variableName, const gd::Variable& variable) {
@@ -951,13 +768,7 @@ class GD_CORE_API ExpressionCompletionFinder
               location.GetEndPosition());
           description.SetCompletion(variableName);
           description.SetVariableType(variable.GetType());
-          description.SetVariableScope(variablesContainer.GetSourceType());
           completions.push_back(description);
-
-          if (eagerlyCompleteIfExactMatch && variableName == search) {
-            AddEagerCompletionForVariableChildren(
-                variable, variableName, location);
-          }
         });
   }
 
@@ -965,8 +776,7 @@ class GD_CORE_API ExpressionCompletionFinder
       const gd::ObjectsContainersList& objectsContainersList,
       const gd::String& objectOrGroupName,
       const gd::String& search,
-      const ExpressionParserLocation& location,
-      bool eagerlyCompleteIfExactMatch) {
+      const ExpressionParserLocation& location) {
     objectsContainersList.ForEachObjectOrGroupVariableMatchingSearch(
         objectOrGroupName,
         search,
@@ -977,13 +787,7 @@ class GD_CORE_API ExpressionCompletionFinder
               location.GetEndPosition());
           description.SetCompletion(variableName);
           description.SetVariableType(variable.GetType());
-          description.SetVariableScope(gd::VariablesContainer::Object);
           completions.push_back(description);
-
-          if (eagerlyCompleteIfExactMatch && variableName == search) {
-            AddEagerCompletionForVariableChildren(
-                variable, variableName, location);
-          }
         });
   }
 
@@ -991,27 +795,25 @@ class GD_CORE_API ExpressionCompletionFinder
       const gd::String& search,
       const gd::String& type,
       const ExpressionParserLocation& location) {
-    projectScopedContainers.GetObjectsContainersList()
-        .ForEachNameMatchingSearch(
-            search,
-            [&](const gd::String& name,
-                const gd::ObjectConfiguration* objectConfiguration) {
-              ExpressionCompletionDescription description(
-                  ExpressionCompletionDescription::Object,
-                  location.GetStartPosition(),
-                  location.GetEndPosition());
-              description.SetObjectConfiguration(objectConfiguration);
-              description.SetCompletion(name);
-              description.SetType(type);
-              completions.push_back(description);
-            });
+    projectScopedContainers.GetObjectsContainersList().ForEachNameMatchingSearch(
+        search,
+        [&](const gd::String& name,
+            const gd::ObjectConfiguration* objectConfiguration) {
+          ExpressionCompletionDescription description(
+              ExpressionCompletionDescription::Object,
+              location.GetStartPosition(),
+              location.GetEndPosition());
+          description.SetObjectConfiguration(objectConfiguration);
+          description.SetCompletion(name);
+          description.SetType(type);
+          completions.push_back(description);
+        });
   }
 
   void AddCompletionsForObjectsAndVariablesMatchingSearch(
       const gd::String& search,
       const gd::String& type,
-      const ExpressionParserLocation& location,
-      bool eagerlyCompleteIfExactMatch) {
+      const ExpressionParserLocation& location) {
     projectScopedContainers.ForEachIdentifierMatchingSearch(
         search,
         [&](const gd::String& objectName,
@@ -1032,16 +834,7 @@ class GD_CORE_API ExpressionCompletionFinder
               location.GetEndPosition());
           description.SetCompletion(variableName);
           description.SetVariableType(variable.GetType());
-          description.SetVariableScope(
-              projectScopedContainers.GetVariablesContainersList()
-                  .GetVariablesContainerFromVariableName(variableName)
-                  .GetSourceType());
           completions.push_back(description);
-
-          if (eagerlyCompleteIfExactMatch && variableName == search) {
-            AddEagerCompletionForVariableChildren(
-                variable, variableName, location);
-          }
         },
         [&](const gd::NamedPropertyDescriptor& property) {
           // Ignore properties here.
@@ -1052,7 +845,7 @@ class GD_CORE_API ExpressionCompletionFinder
   }
 
   void AddCompletionsForAllIdentifiersMatchingSearch(const gd::String& search,
-                                                     const gd::String& type) {
+                                                 const gd::String& type) {
     AddCompletionsForAllIdentifiersMatchingSearch(
         search,
         type,
@@ -1062,8 +855,7 @@ class GD_CORE_API ExpressionCompletionFinder
   void AddCompletionsForAllIdentifiersMatchingSearch(
       const gd::String& search,
       const gd::String& type,
-      const ExpressionParserLocation& location,
-      bool eagerlyCompleteIfExactMatch = false) {
+      const ExpressionParserLocation& location) {
     projectScopedContainers.ForEachIdentifierMatchingSearch(
         search,
         [&](const gd::String& objectName,
@@ -1084,16 +876,7 @@ class GD_CORE_API ExpressionCompletionFinder
               location.GetEndPosition());
           description.SetCompletion(variableName);
           description.SetVariableType(variable.GetType());
-          description.SetVariableScope(
-              projectScopedContainers.GetVariablesContainersList()
-                  .GetVariablesContainerFromVariableName(variableName)
-                  .GetSourceType());
           completions.push_back(description);
-
-          if (eagerlyCompleteIfExactMatch && variableName == search) {
-            AddEagerCompletionForVariableChildren(
-                variable, variableName, location);
-          }
         },
         [&](const gd::NamedPropertyDescriptor& property) {
           ExpressionCompletionDescription description(
@@ -1121,14 +904,11 @@ class GD_CORE_API ExpressionCompletionFinder
       const gd::String& rootType_,
       size_t searchedPosition_,
       gd::ExpressionNode* maybeParentNodeAtLocation_)
-      : searchedPosition(searchedPosition_),
-        maybeParentNodeAtLocation(maybeParentNodeAtLocation_),
-        platform(platform_),
+      : platform(platform_),
         projectScopedContainers(projectScopedContainers_),
         rootType(rootType_),
-        rootObjectName("")  // Always empty, might be changed if variable fields
-                            // in the editor are changed to use completion.
-        {};
+        searchedPosition(searchedPosition_),
+        maybeParentNodeAtLocation(maybeParentNodeAtLocation_){};
 
   std::vector<ExpressionCompletionDescription> completions;
   size_t searchedPosition;
@@ -1137,7 +917,8 @@ class GD_CORE_API ExpressionCompletionFinder
   const gd::Platform& platform;
   const gd::ProjectScopedContainers& projectScopedContainers;
   const gd::String rootType;
-  const gd::String rootObjectName;
 };
 
 }  // namespace gd
+
+#endif  // GDCORE_EXPRESSIONAUTOCOMPLETIONPROVIDER_H

Core/GDCore/IDE/Events/ExpressionValidator.cpp

@@ -36,15 +36,13 @@ namespace {
  * (by convention, 1 for object functions and 2 for behavior functions).
  */
 size_t GetMinimumParametersNumber(
-    const gd::ParameterMetadataContainer& parameters,
+    const std::vector<gd::ParameterMetadata>& parameters,
     size_t initialParameterIndex) {
   size_t nb = 0;
-  for (std::size_t i = initialParameterIndex;
-       i < parameters.GetParametersCount(); ++i) {
-    if (!parameters.GetParameter(i).IsOptional() &&
-        !parameters.GetParameter(i).IsCodeOnly())
-      nb++;
+  for (std::size_t i = initialParameterIndex; i < parameters.size(); ++i) {
+    if (!parameters[i].IsOptional() && !parameters[i].codeOnly) nb++;
   }
+
   return nb;
 }
 
@@ -53,14 +51,13 @@ size_t GetMinimumParametersNumber(
  * (by convention, 1 for object functions and 2 for behavior functions).
  */
 size_t GetMaximumParametersNumber(
-    const gd::ParameterMetadataContainer& parameters,
+    const std::vector<gd::ParameterMetadata>& parameters,
     size_t initialParameterIndex) {
   size_t nb = 0;
-  for (std::size_t i = initialParameterIndex;
-       i < parameters.GetParametersCount(); ++i) {
-    if (!parameters.GetParameter(i).IsCodeOnly())
-      nb++;
+  for (std::size_t i = initialParameterIndex; i < parameters.size(); ++i) {
+    if (!parameters[i].codeOnly) nb++;
   }
+
   return nb;
 }
 
@@ -109,20 +106,20 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
       auto variableExistence = objectsContainersList.HasObjectOrGroupWithVariableNamed(identifier.identifierName, identifier.childIdentifierName);
 
       if (variableExistence == gd::ObjectsContainersList::DoesNotExist) {
-        RaiseUndeclaredVariableError(_("This variable does not exist on this object or group."),
-                        identifier.childIdentifierNameLocation, identifier.childIdentifierName, identifier.identifierName);
+        RaiseTypeError(_("This variable does not exist on this object or group."),
+                        identifier.childIdentifierNameLocation);
 
         return true; // We should have found a variable.
       }
       else if (variableExistence == gd::ObjectsContainersList::ExistsOnlyOnSomeObjectsOfTheGroup) {
-        RaiseUndeclaredVariableError(_("This variable only exists on some objects of the group. It must be declared for all objects."),
-                        identifier.childIdentifierNameLocation, identifier.childIdentifierName, identifier.identifierName);
+        RaiseTypeError(_("This variable only exists on some objects of the group. It must be declared for all objects."),
+                        identifier.childIdentifierNameLocation);
 
         return true; // We should have found a variable.
       }
       else if (variableExistence == gd::ObjectsContainersList::GroupIsEmpty) {
-        RaiseUndeclaredVariableError(_("This group is empty. Add an object to this group first."),
-                        identifier.identifierNameLocation, identifier.childIdentifierName, identifier.identifierName);
+        RaiseTypeError(_("This group is empty. Add an object to this group first."),
+                        identifier.identifierNameLocation);
 
         return true; // We should have found a variable.
       }
@@ -169,7 +166,8 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
         return true; // We found a property, even if the child is not allowed.
       }
 
-      const gd::NamedPropertyDescriptor& property = propertiesContainersList.Get(identifier.identifierName).second;
+      const gd::NamedPropertyDescriptor& property = projectScopedContainers
+          .GetPropertiesContainersList().Get(identifier.identifierName).second;
 
       if (property.GetType() == "Number") {
        childType = Type::Number;
@@ -250,10 +248,9 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(
   if (!function.behaviorName.empty() &&
       !objectsContainersList.HasBehaviorInObjectOrGroup(function.objectName,
                                       function.behaviorName)) {
-    RaiseError(gd::ExpressionParserError::ErrorType::MissingBehavior,
-               _("This behavior is not attached to this object."),
-               function.behaviorNameLocation,
-               /*isFatal=*/false, function.behaviorName, function.objectName);
+    RaiseTypeError(_("This behavior is not attached to this object."),
+                   function.behaviorNameLocation,
+                   /*isFatal=*/false);
     return returnType;
   }
 
@@ -266,17 +263,11 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(
   }
 
   if (gd::MetadataProvider::IsBadExpressionMetadata(metadata)) {
-    if (function.functionName.empty()) {
-      RaiseError(gd::ExpressionParserError::ErrorType::InvalidFunctionName,
-               _("Enter the name of the function to call."),
-               function.location);
-    } else {
-      RaiseError(gd::ExpressionParserError::ErrorType::InvalidFunctionName,
+    RaiseError("invalid_function_name",
                _("Cannot find an expression with this name: ") +
                    function.functionName + "\n" +
                    _("Double check that you've not made any typo in the name."),
                function.location);
-    }
     return returnType;
   }
 
@@ -325,11 +316,11 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(
 
   // Validate parameters count
   size_t minParametersCount = GetMinimumParametersNumber(
-      metadata.GetParameters(),
+      metadata.parameters,
       ExpressionParser2::WrittenParametersFirstIndex(function.objectName,
                                                      function.behaviorName));
   size_t maxParametersCount = GetMaximumParametersNumber(
-      metadata.GetParameters(),
+      metadata.parameters,
       ExpressionParser2::WrittenParametersFirstIndex(function.objectName,
                                                      function.behaviorName));
   if (function.parameters.size() < minParametersCount ||
@@ -344,13 +335,13 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(
 
     if (function.parameters.size() < minParametersCount) {
       RaiseError(
-          gd::ExpressionParserError::ErrorType::TooFewParameters,
+          "too_few_parameters",
           _("You have not entered enough parameters for the expression.") +
               " " + expectedCountMessage,
           function.location);
     } else {
       RaiseError(
-          gd::ExpressionParserError::ErrorType::TooManyParameters,
+          "extra_parameter",
           _("This parameter was not expected by this expression. Remove it "
             "or verify that you've entered the proper expression name.") +
               " " + expectedCountMessage,
@@ -369,20 +360,17 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(
   for (int parameterIndex = 0; parameterIndex < function.parameters.size();
        parameterIndex++) {
     auto& parameter = function.parameters[parameterIndex];
-    while (metadata.GetParameters().GetParameter(metadataIndex).IsCodeOnly()) {
+    while (metadata.GetParameters()[metadataIndex].IsCodeOnly()) {
       // The sizes are already checked above.
       metadataIndex++;
     }
-    auto& parameterMetadata = metadata.GetParameters().GetParameter(metadataIndex);
+    auto& parameterMetadata = metadata.GetParameters()[metadataIndex];
 
     if (!parameterMetadata.IsOptional() ||
         dynamic_cast<EmptyNode*>(parameter.get()) == nullptr) {
       auto currentParentType = parentType;
       parentType = StringToType(parameterMetadata.GetType());
-      auto parentParameterExtraInfo = currentParameterExtraInfo;
-      currentParameterExtraInfo = &parameterMetadata.GetExtraInfo();
       parameter->Visit(*this);
-      currentParameterExtraInfo = parentParameterExtraInfo;
       parentType = currentParentType;
 
       const gd::String& expectedParameterType = parameterMetadata.GetType();
@@ -390,7 +378,7 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(
               ExpressionValidator::variableTypeString, expectedParameterType)) {
         if (dynamic_cast<IdentifierNode*>(parameter.get()) == nullptr &&
             dynamic_cast<VariableNode*>(parameter.get()) == nullptr) {
-          RaiseError(gd::ExpressionParserError::ErrorType::MalformedVariableParameter,
+          RaiseError("malformed_variable_parameter",
                      _("A variable name was expected but something else was "
                        "written. Enter just the name of the variable for this "
                        "parameter."),
@@ -398,7 +386,7 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(
         }
       } else if (gd::ParameterMetadata::IsObject(expectedParameterType)) {
         if (dynamic_cast<IdentifierNode*>(parameter.get()) == nullptr) {
-          RaiseError(gd::ExpressionParserError::ErrorType::MalformedObjectParameter,
+          RaiseError("malformed_object_parameter",
                      _("An object name was expected but something else was "
                        "written. Enter just the name of the object for this "
                        "parameter."),
@@ -412,7 +400,7 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(
                !gd::ParameterMetadata::IsExpression(
                    ExpressionValidator::stringTypeString,
                    expectedParameterType)) {
-        RaiseError(gd::ExpressionParserError::ErrorType::UnknownParameterType,
+        RaiseError("unknown_parameter_type",
                    _("This function is improperly set up. Reach out to the "
                      "extension developer or a GDevelop maintainer to fix "
                      "this issue"),
@@ -446,10 +434,6 @@ const gd::String& ExpressionValidator::TypeToString(Type type) {
       return numberOrStringTypeString;
     case Type::Variable:
       return variableTypeString;
-    case Type::LegacyVariable:
-      // This function is only used to display error.
-      // Users don't care if it's legacy or not.
-      return variableTypeString;
     case Type::Object:
       return objectTypeString;
     case Type::Empty:
@@ -476,12 +460,7 @@ ExpressionValidator::Type ExpressionValidator::StringToType(
   if (type == ExpressionValidator::variableTypeString ||
       gd::ParameterMetadata::IsExpression(
           ExpressionValidator::variableTypeString, type)) {
-    if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
-      return Type::LegacyVariable;
-    }
-    else {
-      return Type::Variable;
-    }
+    return Type::Variable;
   }
   if (type == ExpressionValidator::objectTypeString ||
       gd::ParameterMetadata::IsObject(type)) {

Core/GDCore/IDE/Events/ExpressionValidator.h

@@ -3,7 +3,8 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
+#ifndef GDCORE_EXPRESSIONVALIDATOR_H
+#define GDCORE_EXPRESSIONVALIDATOR_H
 
 #include <memory>
 #include <vector>
@@ -38,14 +39,12 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
  public:
   ExpressionValidator(const gd::Platform &platform_,
                       const gd::ProjectScopedContainers & projectScopedContainers_,
-                      const gd::String &rootType_,
-                      const gd::String &extraInfo_ = "")
+                      const gd::String &rootType_)
       : platform(platform_),
         projectScopedContainers(projectScopedContainers_),
         parentType(StringToType(gd::ParameterMetadata::GetExpressionValueType(rootType_))),
         childType(Type::Unknown),
-        forbidsUsageOfBracketsBecauseParentIsObject(false),
-        currentParameterExtraInfo(&extraInfo_) {};
+        forbidsUsageOfBracketsBecauseParentIsObject(false) {};
   virtual ~ExpressionValidator(){};
 
   /**
@@ -66,7 +65,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
    *
    * Expressions with fatal error can't be generated.
    */
-  const std::vector<ExpressionParserError*>& GetFatalErrors() {
+  const std::vector<ExpressionParserDiagnostic*>& GetFatalErrors() {
     return fatalErrors;
   };
 
@@ -75,7 +74,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
    *
    * No errors means that the expression is valid.
    */
-  const std::vector<ExpressionParserError*>& GetAllErrors() {
+  const std::vector<ExpressionParserDiagnostic*>& GetAllErrors() {
     return allErrors;
   };
 
@@ -87,21 +86,19 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   void OnVisitOperatorNode(OperatorNode& node) override {
     ReportAnyError(node);
 
-    // The "required" type ("parentType")  will be used when visiting the first operand.
-    // Note that it may be refined thanks to this first operand (see later).
     node.leftHandSide->Visit(*this);
-    const Type leftType = childType; // Store the type of the first operand.
+    const Type leftType = childType;
 
     if (leftType == Type::Number) {
       if (node.op == ' ') {
-        RaiseError(gd::ExpressionParserError::ErrorType::SyntaxError,
+        RaiseError("syntax_error",
             "No operator found. Did you forget to enter an operator (like +, -, "
             "* or /) between numbers or expressions?", node.rightHandSide->location);
       }
     }
     else if (leftType == Type::String) {
       if (node.op == ' ') {
-        RaiseError(gd::ExpressionParserError::ErrorType::SyntaxError,
+        RaiseError("syntax_error",
             "You must add the operator + between texts or expressions. For "
             "example: \"Your name: \" + VariableString(PlayerName).", node.rightHandSide->location);
       }
@@ -116,26 +113,22 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
           _("Operators (+, -, /, *) can't be used with an object name. Remove "
             "the operator."),
             node.rightHandSide->location);
-    } else if (leftType == Type::Variable || leftType == Type::LegacyVariable) {
+    } else if (leftType == Type::Variable) {
       RaiseOperatorError(
           _("Operators (+, -, /, *) can't be used in variable names. Remove "
             "the operator from the variable name."),
             node.rightHandSide->location);
     }
 
-    // The "required" type ("parentType") of the second operator is decided by:
-    // - the parent type. Unless it can (`number|string`) or should (`unknown`) be refined, then:
-    // - the first operand.
-    parentType = ShouldTypeBeRefined(parentType) ? leftType : parentType;
+    parentType = leftType;
     node.rightHandSide->Visit(*this);
     const Type rightType = childType;
 
-    // The type of the overall operator ("childType") is decided by:
-    // - the parent type. Unless it can (`number|string`) or should (`unknown`) be refined, then:
-    // - the first operand. Unless it can (`number|string`) or should (`unknown`) be refined, then:
-    // - the right operand (which got visited knowing the type of the first operand, so it's
+    // The type is decided by the first operand, unless it can (`number|string`)
+    // or should (`unknown`) be refined, in which case we go for the right
+    // operand (which got visited knowing the type of the first operand, so it's
     // equal or strictly more precise than the left operand).
-    childType = ShouldTypeBeRefined(parentType) ? (ShouldTypeBeRefined(leftType) ? leftType : rightType) : parentType;
+    childType = (leftType == Type::Unknown || leftType == Type::NumberOrString) ? leftType : rightType;
   }
   void OnVisitUnaryOperatorNode(UnaryOperatorNode& node) override {
     ReportAnyError(node);
@@ -163,7 +156,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
           _("Operators (+, -) can't be used with an object name. Remove the "
             "operator."),
           node.location);
-    } else if (rightType == Type::Variable || rightType == Type::LegacyVariable) {
+    } else if (rightType == Type::Variable) {
       RaiseTypeError(
           _("Operators (+, -) can't be used in variable names. Remove "
             "the operator from the variable name."),
@@ -201,14 +194,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
     ReportAnyError(node);
 
     if (parentType == Type::Variable) {
-      childType = parentType;
-
-      CheckVariableExistence(node.location, node.name);
-      if (node.child) {
-        node.child->Visit(*this);
-      }
-    } else if (parentType == Type::LegacyVariable) {
-      childType = parentType;
+      childType = Type::Variable;
 
       if (node.child) {
         node.child->Visit(*this);
@@ -278,7 +264,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
     ReportAnyError(node);
 
     if (forbidsUsageOfBracketsBecauseParentIsObject) {
-      RaiseError(gd::ExpressionParserError::ErrorType::BracketsNotAllowedForObjects,
+      RaiseError("brackets_not_allowed_for_objects",
                  _("You can't use the brackets to access an object variable. "
                    "Use a dot followed by the variable name, like this: "
                    "`MyObject.MyVariable`."),
@@ -287,14 +273,9 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
     forbidsUsageOfBracketsBecauseParentIsObject = false;
 
     Type currentParentType = parentType;
-    Type currentChildType = childType;
     parentType = Type::NumberOrString;
-    auto parentParameterExtraInfo = currentParameterExtraInfo;
-    currentParameterExtraInfo = nullptr;
     node.expression->Visit(*this);
-    currentParameterExtraInfo = parentParameterExtraInfo;
     parentType = currentParentType;
-    childType = currentChildType;
 
     if (node.child) {
       node.child->Visit(*this);
@@ -306,7 +287,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
       if (!ValidateObjectVariableOrVariableOrProperty(node)) {
         // The identifier is not a variable, so either the variable is not properly declared
         // or it's a text without quotes.
-        RaiseUnknownIdentifierError(_("You must wrap your text inside double quotes "
+        RaiseTypeError(_("You must wrap your text inside double quotes "
                               "(example: \"Hello world\")."),
                             node.location);
       }
@@ -314,22 +295,20 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
     else if (parentType == Type::Number) {
       if (!ValidateObjectVariableOrVariableOrProperty(node)) {
         // The identifier is not a variable, so the variable is not properly declared.
-        RaiseUnknownIdentifierError(_("You must enter a number."), node.location);
+        RaiseTypeError(
+            _("You must enter a number."), node.location);
       }
     }
     else if (parentType == Type::NumberOrString) {
       if (!ValidateObjectVariableOrVariableOrProperty(node)) {
         // The identifier is not a variable, so either the variable is not properly declared
         // or it's a text without quotes.
-        RaiseUnknownIdentifierError(
+        RaiseTypeError(
             _("You must enter a number or a text, wrapped inside double quotes (example: \"Hello world\"), or a variable name."),
             node.location);
       }
     }
-    else if (parentType == Type::Variable) {
-      CheckVariableExistence(node.location, node.identifierName);
-    }
-    else if (parentType != Type::Object && parentType != Type::LegacyVariable) {
+    else if (parentType != Type::Object && parentType != Type::Variable) {
       // It can't happen.
       RaiseTypeError(
           _("You've entered a name, but this type was expected:") + " " + TypeToString(parentType),
@@ -353,7 +332,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
     } else if (parentType == Type::String) {
       message = _(
           "You must enter a text (between quotes) or a valid expression call.");
-    } else if (parentType == Type::Variable || parentType == Type::LegacyVariable) {
+    } else if (parentType == Type::Variable) {
       message = _("You must enter a variable name.");
     } else if (parentType == Type::Object) {
       message = _("You must enter a valid object name.");
@@ -366,51 +345,12 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   }
 
  private:
-  enum Type {Unknown = 0, Number, String, NumberOrString, Variable, LegacyVariable, Object, Empty};
+  enum Type {Unknown = 0, Number, String, NumberOrString, Variable, Object, Empty};
   Type ValidateFunction(const gd::FunctionCallNode& function);
   bool ValidateObjectVariableOrVariableOrProperty(const gd::IdentifierNode& identifier);
 
-  void CheckVariableExistence(const ExpressionParserLocation &location, const gd::String& name) {
-    if (!currentParameterExtraInfo || *currentParameterExtraInfo != "AllowUndeclaredVariable") {
-      projectScopedContainers.MatchIdentifierWithName<void>(
-          name,
-          [&]() {
-            // This represents an object.
-            RaiseVariableNameCollisionError(
-                _("This variable has the same name as an object. Consider "
-                  "renaming one or the other."),
-                location, name);
-          },
-          [&]() {
-            // This is a variable.
-          },
-          [&]() {
-            // This is a property.
-            // This error won't happen unless the priority is changed.
-            RaiseVariableNameCollisionError(
-                _("This variable has the same name as a property. Consider "
-                  "renaming one or the other."),
-                location, name);
-          },
-          [&]() {
-            // This is a parameter.
-            // This error won't happen unless the priority is changed.
-            RaiseVariableNameCollisionError(
-                _("This variable has the same name as a parameter. Consider "
-                  "renaming one or the other."),
-                location, name);
-          },
-          [&]() {
-            // This is something else.
-            RaiseUndeclaredVariableError(
-                _("No variable with this name found."), location,
-                name);
-          });
-    }
-  }
-
   void ReportAnyError(const ExpressionNode& node, bool isFatal = true) {
-    if (node.diagnostic) {
+    if (node.diagnostic && node.diagnostic->IsError()) {
       // Syntax errors are holden by the AST nodes.
       // It's fine to give pointers on them as the AST live longer than errors
       // handling.
@@ -421,13 +361,10 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
     }
   }
 
-  void RaiseError(gd::ExpressionParserError::ErrorType type,
-                  const gd::String &message,
-                  const ExpressionParserLocation &location, bool isFatal = true,
-                  const gd::String &actualValue = "",
-                  const gd::String &objectName = "") {
+  void RaiseError(const gd::String &type,
+      const gd::String &message, const ExpressionParserLocation &location, bool isFatal = true) {
     auto diagnostic = gd::make_unique<ExpressionParserError>(
-        type, message, location, actualValue, objectName);
+        type, message, location);
     allErrors.push_back(diagnostic.get());
     if (isFatal) {
       fatalErrors.push_back(diagnostic.get());
@@ -438,39 +375,14 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
     supplementalErrors.push_back(std::move(diagnostic));
   }
 
-  void RaiseUnknownIdentifierError(const gd::String &message,
-                                   const ExpressionParserLocation &location) {
-    RaiseError(gd::ExpressionParserError::ErrorType::UnknownIdentifier, message,
-               location);
+  void RaiseTypeError(
+      const gd::String &message, const ExpressionParserLocation &location, bool isFatal = true) {
+    RaiseError("type_error", message, location, isFatal);
   }
 
-  void RaiseUndeclaredVariableError(const gd::String &message,
-                                    const ExpressionParserLocation &location,
-                                    const gd::String &variableName,
-                                    const gd::String &objectName = "") {
-    RaiseError(gd::ExpressionParserError::ErrorType::UndeclaredVariable,
-               message, location, true, variableName, objectName);
-  }
-
-  void RaiseVariableNameCollisionError(const gd::String &message,
-                                    const ExpressionParserLocation &location,
-                                    const gd::String &variableName,
-                                    const gd::String &objectName = "") {
-    RaiseError(gd::ExpressionParserError::ErrorType::VariableNameCollision,
-               message, location, false, variableName, objectName);
-  }
-
-  void RaiseTypeError(const gd::String &message,
-                      const ExpressionParserLocation &location,
-                      bool isFatal = true) {
-    RaiseError(gd::ExpressionParserError::ErrorType::MismatchedType, message,
-               location, isFatal);
-  }
-
-  void RaiseOperatorError(const gd::String &message,
-                          const ExpressionParserLocation &location) {
-    RaiseError(gd::ExpressionParserError::ErrorType::InvalidOperator, message,
-               location);
+  void RaiseOperatorError(
+      const gd::String &message, const ExpressionParserLocation &location) {
+    RaiseError("invalid_operator", message, location);
   }
 
   void ReadChildTypeFromVariable(gd::Variable::Type variableType) {
@@ -483,10 +395,6 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
     }
   }
 
-  static bool ShouldTypeBeRefined(Type type) {
-    return (type == Type::Unknown || type == Type::NumberOrString);
-  }
-
   static Type StringToType(const gd::String &type);
   static const gd::String &TypeToString(Type type);
   static const gd::String unknownTypeString;
@@ -494,21 +402,20 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   static const gd::String stringTypeString;
   static const gd::String numberOrStringTypeString;
   static const gd::String variableTypeString;
-  static const gd::String legacyVariableTypeString;
   static const gd::String objectTypeString;
   static const gd::String identifierTypeString;
   static const gd::String emptyTypeString;
 
-  std::vector<ExpressionParserError*> fatalErrors;
-  std::vector<ExpressionParserError*> allErrors;
-  std::vector<std::unique_ptr<ExpressionParserError>> supplementalErrors;
+  std::vector<ExpressionParserDiagnostic*> fatalErrors;
+  std::vector<ExpressionParserDiagnostic*> allErrors;
+  std::vector<std::unique_ptr<ExpressionParserDiagnostic>> supplementalErrors;
   Type childType; ///< The type "discovered" down the tree and passed up.
   Type parentType; ///< The type "required" by the top of the tree.
   bool forbidsUsageOfBracketsBecauseParentIsObject;
-  const gd::String *currentParameterExtraInfo;
   const gd::Platform &platform;
   const gd::ProjectScopedContainers &projectScopedContainers;
 };
 
 }  // namespace gd
 
+#endif  // GDCORE_EXPRESSIONVALIDATOR_H

Core/GDCore/IDE/Events/ExpressionVariableNameFinder.h

@@ -1,55 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-#include "GDCore/Events/Parsers/ExpressionParser2Node.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
-
-namespace gd {
-
-/**
- * \brief Find the variable name from a variable expression.
- *
- * \see gd::ExpressionParser2
- */
-class GD_CORE_API ExpressionVariableNameFinder : public ExpressionParser2NodeWorker {
- public:
-
-  static const gd::String GetVariableName(gd::ExpressionNode& node) {
-    gd::ExpressionVariableNameFinder typeFinder;
-    node.Visit(typeFinder);
-    return typeFinder.variableName;
-  }
-
-  virtual ~ExpressionVariableNameFinder(){};
-
- protected:
-  ExpressionVariableNameFinder()
-      : variableName("") {};
-
-  void OnVisitSubExpressionNode(SubExpressionNode& node) override {}
-  void OnVisitOperatorNode(OperatorNode& node) override {}
-  void OnVisitUnaryOperatorNode(UnaryOperatorNode& node) override {}
-  void OnVisitNumberNode(NumberNode& node) override {}
-  void OnVisitTextNode(TextNode& node) override {}
-  void OnVisitVariableNode(VariableNode& node) override {
-    variableName = node.name;
-  }
-  void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {}
-  void OnVisitIdentifierNode(IdentifierNode& node) override {
-    variableName = node.identifierName;
-  }
-  void OnVisitEmptyNode(EmptyNode& node) override {}
-  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {}
-  void OnVisitVariableBracketAccessorNode(
-      VariableBracketAccessorNode& node) override {}
-  void OnVisitFunctionCallNode(FunctionCallNode& functionCall) override {}
-
- private:
-  gd::String variableName;
-};
-
-}  // namespace gd

Core/GDCore/IDE/Events/ExpressionVariablePathFinder.cpp

@@ -1,195 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "ExpressionVariablePathFinder.h"
-
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-
-namespace gd {
-
-/**
- * \brief Find the pre-scoped container of legacy variables or the object name
- * from the function call node.
- */
-class GD_CORE_API ExpressionLiteralFinder : public ExpressionParser2NodeWorker {
-public:
-  virtual ~ExpressionLiteralFinder(){};
-
-  gd::String literalValue;
-
-  ExpressionLiteralFinder() : literalValue(""){};
-
-protected:
-  void OnVisitSubExpressionNode(SubExpressionNode &node) override {}
-  void OnVisitOperatorNode(OperatorNode &node) override {}
-  void OnVisitUnaryOperatorNode(UnaryOperatorNode &node) override {}
-  void OnVisitNumberNode(NumberNode &node) override {
-    literalValue = node.number;
-  }
-  void OnVisitTextNode(TextNode &node) override { literalValue = node.text; }
-  void OnVisitVariableNode(VariableNode &node) override {}
-  void OnVisitVariableAccessorNode(VariableAccessorNode &node) override {}
-  void OnVisitIdentifierNode(IdentifierNode &node) override {}
-  void OnVisitEmptyNode(EmptyNode &node) override {}
-  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode &node) override {}
-  void OnVisitVariableBracketAccessorNode(
-      VariableBracketAccessorNode &node) override {}
-  void OnVisitFunctionCallNode(FunctionCallNode &functionCall) override {}
-};
-
-void ExpressionVariablePathFinder::OnVisitVariableBracketAccessorNode(
-    VariableBracketAccessorNode &node) {
-  // Try to find a literal accessor or add a child with an empty name, which
-  // will be interpreted as "take the first child/item of the structure/array".
-  gd::ExpressionLiteralFinder expressionLiteralFinder;
-  if (node.expression) {
-    node.expression->Visit(expressionLiteralFinder);
-  }
-  childVariableNames.push_back(expressionLiteralFinder.literalValue);
-
-  if (node.child && &node != lastNodeToCheck) {
-    node.child->Visit(*this);
-  }
-}
-
-/**
- * \brief Find the pre-scoped container of legacy variables or the object name
- * from the function call node.
- */
-class GD_CORE_API ExpressionVariableContextFinder
-    : public ExpressionParser2NodeWorker {
- public:
-
-  virtual ~ExpressionVariableContextFinder(){};
-
-  gd::String objectName;
-  gd::String parameterType;
-  gd::ExpressionNode* variableNode;
-
-  ExpressionVariableContextFinder(
-      const gd::Platform& platform_,
-      const gd::ProjectScopedContainers& projectScopedContainers_)
-      : platform(platform_),
-        projectScopedContainers(projectScopedContainers_),
-        variableNode(nullptr),
-        objectName(""),
-        parameterType("") {};
-
- protected:
-  void OnVisitSubExpressionNode(SubExpressionNode& node) override {}
-  void OnVisitOperatorNode(OperatorNode& node) override {}
-  void OnVisitUnaryOperatorNode(UnaryOperatorNode& node) override {}
-  void OnVisitNumberNode(NumberNode& node) override {}
-  void OnVisitTextNode(TextNode& node) override {}
-  void OnVisitVariableNode(VariableNode& node) override {
-    if (variableNode) {
-      // This is not possible
-      return;
-    }
-    variableNode = &node;
-
-    // Check if the parent is a function call, in which we might be dealing
-    // with a legacy pre-scoped variable parameter:
-    if (node.parent) node.parent->Visit(*this);
-  }
-  void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
-    if (node.parent) node.parent->Visit(*this);
-  }
-  void OnVisitIdentifierNode(IdentifierNode& node) override {
-    if (variableNode) {
-      // This is not possible
-      return;
-    }
-    // This node is not necessarily a variable node.
-    // It will be checked when visiting the FunctionCallNode, just after.
-    variableNode = &node;
-
-    // Check if the parent is a function call, in which we might be dealing
-    // with a legacy pre-scoped variable parameter:
-    if (node.parent) node.parent->Visit(*this);
-  }
-  void OnVisitEmptyNode(EmptyNode& node) override {}
-  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {}
-  void OnVisitVariableBracketAccessorNode(
-      VariableBracketAccessorNode& node) override {
-    if (node.parent) node.parent->Visit(*this);
-      }
-  void OnVisitFunctionCallNode(FunctionCallNode& functionCall) override {
-    int parameterIndex = -1;
-    for (int i = 0; i < functionCall.parameters.size(); i++) {
-      if (functionCall.parameters.at(i).get() == variableNode) {
-        parameterIndex = i;
-        break;
-      }
-    }
-    if (parameterIndex < 0) {
-      return;
-    }
-
-    const auto& objectsContainersList =
-        projectScopedContainers.GetObjectsContainersList();
-
-    const gd::ParameterMetadata* parameterMetadata =
-        MetadataProvider::GetFunctionCallParameterMetadata(
-            platform, objectsContainersList, functionCall, parameterIndex);
-    if (parameterMetadata == nullptr) return;  // Unexpected
-
-    if (parameterMetadata->GetType() == "objectvar") {
-      // Legacy convention where a "objectvar"
-      // parameter represents a variable of the object represented by the
-      // previous "object" parameter. The object on which the function is
-      // called is returned if no previous parameters are objects.
-      objectName = functionCall.objectName;
-      for (int previousIndex = parameterIndex - 1; previousIndex >= 0;
-            previousIndex--) {
-        const gd::ParameterMetadata* previousParameterMetadata =
-            MetadataProvider::GetFunctionCallParameterMetadata(
-                platform, objectsContainersList, functionCall, previousIndex);
-        if (previousParameterMetadata != nullptr &&
-            gd::ParameterMetadata::IsObject(
-                previousParameterMetadata->GetType())) {
-          auto previousParameterNode =
-              functionCall.parameters[previousIndex].get();
-          IdentifierNode* objectNode =
-              dynamic_cast<IdentifierNode*>(previousParameterNode);
-          objectName = objectNode->identifierName;
-          break;
-        }
-      }
-      parameterType = parameterMetadata->GetType();
-    }
-  }
-
- private:
-  const gd::Platform& platform;
-  const gd::ProjectScopedContainers& projectScopedContainers;
-
-};
-
-VariableAndItsParent ExpressionVariablePathFinder::GetLastParentOfNode(
-    const gd::Platform &platform,
-    const gd::ProjectScopedContainers &projectScopedContainers,
-    gd::ExpressionNode &node) {
-
-  gd::ExpressionVariableContextFinder contextFinder(platform,
-                                                    projectScopedContainers);
-  node.Visit(contextFinder);
-  if (!contextFinder.variableNode) {
-    return {};
-  }
-
-  gd::ExpressionVariablePathFinder typeFinder(platform, projectScopedContainers,
-                                              contextFinder.parameterType,
-                                              contextFinder.objectName, &node);
-  contextFinder.variableNode->Visit(typeFinder);
-
-  if (typeFinder.variableName.empty() || !typeFinder.variablesContainer) {
-    return {};
-  }
-  return typeFinder.WalkUntilLastParent(*typeFinder.variablesContainer,
-                                        typeFinder.childVariableNames);
-}
-
-}  // namespace gd

Core/GDCore/IDE/Events/ExpressionVariablePathFinder.h

@@ -1,357 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-#include <memory>
-#include <vector>
-
-#include "GDCore/Events/Parsers/ExpressionParser2Node.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
-#include "GDCore/Project/ProjectScopedContainers.h"
-#include "GDCore/Project/Variable.h"
-#include "GDCore/Project/VariablesContainer.h"
-
-namespace gd {
-class Platform;
-}  // namespace gd
-
-namespace gd {
-
-/**
- * \brief Contains a variables container or a variable. Useful
- * to refer to the parent of a variable (which can be a VariablesContainer
- * or another Variable).
- */
-struct VariableAndItsParent {
-  const gd::VariablesContainer* parentVariablesContainer;
-  const gd::Variable* parentVariable;
-};
-
-/**
- * \brief Find a variable path from an expression node.
- *
- * \see gd::ExpressionParser2
- */
-class GD_CORE_API ExpressionVariablePathFinder
-    : public ExpressionParser2NodeWorker {
- public:
-
-  static VariableAndItsParent GetLastParentOfNode(
-      const gd::Platform& platform,
-      const gd::ProjectScopedContainers& projectScopedContainers,
-      gd::ExpressionNode& node);
-
-  static const gd::Variable::Type GetVariableType(
-      const gd::Platform& platform,
-      const gd::ProjectScopedContainers& projectScopedContainers,
-      gd::ExpressionNode& node, const gd::String& objectName) {
-    // The context is not checked because this is called on variable parameters.
-    gd::String parameterType = objectName.empty() ? "variable" : "objectvar";
-    gd::String objName = objectName;
-    gd::ExpressionVariablePathFinder typeFinder(
-        platform, projectScopedContainers, parameterType, objName);
-    node.Visit(typeFinder);
-
-    if (typeFinder.variableName.empty() || !typeFinder.variablesContainer) {
-      return gd::Variable::Unknown;
-    }
-    auto *variable = typeFinder.WalkUntilLastChild(
-        typeFinder.variablesContainer->Get(typeFinder.variableName),
-        typeFinder.childVariableNames);
-    return variable ? variable->GetType() : gd::Variable::Unknown;
-  }
-
-  static const gd::Variable::Type GetArrayVariableType(
-      const gd::Platform& platform,
-      const gd::ProjectScopedContainers& projectScopedContainers,
-      gd::ExpressionNode& node, const gd::String& objectName) {
-    // The context is not checked because this is called on variable parameters.
-    gd::String parameterType = objectName.empty() ? "variable" : "objectvar";
-    gd::String objName = objectName;
-    gd::ExpressionVariablePathFinder typeFinder(
-        platform, projectScopedContainers, parameterType, objName);
-    node.Visit(typeFinder);
-
-    if (typeFinder.variableName.empty() || !typeFinder.variablesContainer) {
-      return gd::Variable::Unknown;
-    }
-    auto *variable = typeFinder.WalkUntilLastChild(
-        typeFinder.variablesContainer->Get(typeFinder.variableName),
-        typeFinder.childVariableNames);
-    if (variable && variable->GetType() != gd::Variable::Array) {
-      return gd::Variable::Unknown;
-    }
-    return variable && variable->GetChildrenCount() > 0
-               ? variable->GetAtIndex(0).GetType()
-               : gd::Variable::Unknown;
-  }
-
-  virtual ~ExpressionVariablePathFinder(){};
-
- protected:
-  ExpressionVariablePathFinder(
-      const gd::Platform& platform_,
-      const gd::ProjectScopedContainers& projectScopedContainers_,
-      const gd::String& parameterType_,
-      gd::String& objectName_,
-      const gd::ExpressionNode* lastNodeToCheck_ = nullptr)
-      : platform(platform_),
-        projectScopedContainers(projectScopedContainers_),
-        parameterType(parameterType_),
-        objectName(objectName_),
-        lastNodeToCheck(lastNodeToCheck_),
-        variablesContainer(nullptr),
-        variableName(""),
-        bailOutBecauseEmptyVariableName(false) {};
-
-  void OnVisitVariableBracketAccessorNode(
-      VariableBracketAccessorNode& node) override;
-
-  void OnVisitSubExpressionNode(SubExpressionNode& node) override {}
-  void OnVisitOperatorNode(OperatorNode& node) override {}
-  void OnVisitUnaryOperatorNode(UnaryOperatorNode& node) override {}
-  void OnVisitNumberNode(NumberNode& node) override {}
-  void OnVisitTextNode(TextNode& node) override {}
-  void OnVisitVariableNode(VariableNode& node) override {
-    FindVariableFor(node.name);
-    if (node.child && &node != lastNodeToCheck) node.child->Visit(*this);
-  }
-  void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
-    if (node.name.empty() && node.child) {
-      // A variable accessor should always have a name if it has a child (i.e:
-      // another accessor). While the parser may have generated an empty name,
-      // flag this so we avoid finding a wrong parent (and so, run the risk of
-      // giving wrong autocompletions).
-      bailOutBecauseEmptyVariableName = true;
-    }
-    if (variableName.empty()) {
-      const auto& objectsContainersList = projectScopedContainers.GetObjectsContainersList();
-      if (objectsContainersList.HasObjectOrGroupWithVariableNamed(objectName,
-                                                                  node.name) !=
-          gd::ObjectsContainersList::VariableExistence::DoesNotExist) {
-        variableName = node.name;
-        variablesContainer =
-            projectScopedContainers.GetObjectsContainersList()
-                .GetObjectOrGroupVariablesContainer(objectName);
-      }
-    } else {
-      childVariableNames.push_back(node.name);
-    }
-    if (node.child && &node != lastNodeToCheck) node.child->Visit(*this);
-  }
-  void OnVisitIdentifierNode(IdentifierNode& node) override {
-    FindVariableFor(node.identifierName, node.identifierNameDotLocation.IsValid() ? &node.childIdentifierName : nullptr);
-  }
-  void OnVisitEmptyNode(EmptyNode& node) override {}
-  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {}
-  void OnVisitFunctionCallNode(FunctionCallNode& functionCall) override {}
-
-  void FindVariableFor(const gd::String& identifier, gd::String* childIdentifier = nullptr) {
-    if (!objectName.empty()) {
-      const auto& objectsContainersList = projectScopedContainers.GetObjectsContainersList();
-      if (objectsContainersList.HasObjectOrGroupWithVariableNamed(objectName,
-                                                                  identifier) !=
-          gd::ObjectsContainersList::VariableExistence::DoesNotExist) {
-        variableName = identifier;
-        variablesContainer =
-            projectScopedContainers.GetObjectsContainersList()
-                .GetObjectOrGroupVariablesContainer(objectName);
-        if (childIdentifier) {
-          childVariableNames.push_back(*childIdentifier);
-        }
-      }
-    }
-    else if (parameterType == "scenevar") {
-      // The node represents a variable name, and the variables container
-      // containing it was identified in the FunctionCallNode.
-      variablesContainer = projectScopedContainers.GetVariablesContainersList()
-                .GetBottomMostVariablesContainer();
-      variableName = identifier;
-      if (childIdentifier) {
-        childVariableNames.push_back(*childIdentifier);
-      }
-    } 
-    else if (parameterType == "globalvar") {
-      // The node represents a variable name, and the variables container
-      // containing it was identified in the FunctionCallNode.
-      variablesContainer = projectScopedContainers.GetVariablesContainersList()
-                .GetTopMostVariablesContainer();
-      variableName = identifier;
-      if (childIdentifier) {
-        childVariableNames.push_back(*childIdentifier);
-      }
-    } else {
-      // Otherwise, the identifier is to be interpreted as usual:
-      // it can be an object (on which a variable is accessed),
-      // or a variable.
-      projectScopedContainers.MatchIdentifierWithName<void>(
-          identifier,
-          [&]() {
-            objectName = identifier;
-            if (childIdentifier) {
-              if (parameterType == "variable") {
-                // An object is overlapping the variable.
-                // Even in "variable" parameters, this is not allowed to be
-                // consistent with expressions.
-              } else {
-                // It's an object variable expression.
-                const auto& objectsContainersList = projectScopedContainers.GetObjectsContainersList();
-                if (objectsContainersList.HasObjectOrGroupWithVariableNamed(objectName,
-                                                                            *childIdentifier) !=
-                    gd::ObjectsContainersList::VariableExistence::DoesNotExist) {
-                  variableName = *childIdentifier;
-                  variablesContainer =
-                      projectScopedContainers.GetObjectsContainersList()
-                          .GetObjectOrGroupVariablesContainer(objectName);
-                }
-              }
-            }
-          },
-          [&]() {
-            // This is a variable.
-            if (projectScopedContainers.GetVariablesContainersList().Has(identifier)) {
-              variablesContainer =
-                  &(projectScopedContainers.GetVariablesContainersList()
-                        .GetVariablesContainerFromVariableName(identifier));
-              variableName = identifier;
-              if (childIdentifier) {
-                childVariableNames.push_back(*childIdentifier);
-              }
-            }
-          },
-          [&]() {
-            // Ignore properties here.
-            // There is no support for "children" of properties.
-          },
-          [&]() {
-            // Ignore parameters here.
-            // There is no support for "children" of parameters.
-          },
-          [&]() {
-            // Ignore unrecognised identifiers here.
-          });
-    }
-  }
-
- private:
-  const gd::Variable* WalkUntilLastChild(
-      const gd::Variable& variable,
-      const std::vector<gd::String>& childVariableNames,
-      size_t startIndex = 0) {
-    if (bailOutBecauseEmptyVariableName)
-      return nullptr;  // Do not even attempt to find the parent if we had an issue
-                  // when visiting nodes.
-
-    const gd::Variable* currentVariable = &variable;
-
-    for (size_t index = startIndex; index < childVariableNames.size();
-         ++index) {
-      const gd::String& childName = childVariableNames[index];
-
-      if (childName.empty()) {
-        if (currentVariable->GetChildrenCount() == 0) {
-          // The array or structure is empty, we can't walk through it - there
-          // is no "parent".
-          return nullptr;
-        }
-
-        if (currentVariable->GetType() == gd::Variable::Array) {
-          currentVariable = &currentVariable->GetAtIndex(0);
-        } else {
-          currentVariable =
-              currentVariable->GetAllChildren().begin()->second.get();
-        }
-      } else {
-        if (!currentVariable->HasChild(childName)) {
-          // Non existing child - there is no "parent".
-          return nullptr;
-        }
-
-        currentVariable = &currentVariable->GetChild(childName);
-      }
-    }
-
-    // Return the last parent of the chain of variables (so not the last
-    // variable but the one before it).
-    return currentVariable;
-  }
-
-  VariableAndItsParent WalkUntilLastParent(
-      const gd::Variable& variable,
-      const std::vector<gd::String>& childVariableNames,
-      size_t startIndex = 0) {
-    if (bailOutBecauseEmptyVariableName)
-      return {};  // Do not even attempt to find the parent if we had an issue
-                  // when visiting nodes.
-
-    const gd::Variable* currentVariable = &variable;
-
-    // Walk until size - 1 as we want the last parent.
-    for (size_t index = startIndex; index + 1 < childVariableNames.size();
-         ++index) {
-      const gd::String& childName = childVariableNames[index];
-
-      if (childName.empty()) {
-        if (currentVariable->GetChildrenCount() == 0) {
-          // The array or structure is empty, we can't walk through it - there
-          // is no "parent".
-          return {};
-        }
-
-        if (currentVariable->GetType() == gd::Variable::Array) {
-          currentVariable = &currentVariable->GetAtIndex(0);
-        } else {
-          currentVariable =
-              currentVariable->GetAllChildren().begin()->second.get();
-        }
-      } else {
-        if (!currentVariable->HasChild(childName)) {
-          // Non existing child - there is no "parent".
-          return {};
-        }
-
-        currentVariable = &currentVariable->GetChild(childName);
-      }
-    }
-
-    // Return the last parent of the chain of variables (so not the last
-    // variable but the one before it).
-    return {.parentVariable = currentVariable};
-  }
-
-  VariableAndItsParent WalkUntilLastParent(
-      const gd::VariablesContainer& variablesContainer,
-      const std::vector<gd::String>& childVariableNames) {
-    if (bailOutBecauseEmptyVariableName)
-      return {};  // Do not even attempt to find the parent if we had an issue
-                  // when visiting nodes.
-
-    if (variableName.empty())
-      return {};  // There is no "parent" to the variables container itself.
-
-    const gd::Variable* variable = variablesContainer.Has(variableName)
-                                       ? &variablesContainer.Get(variableName)
-                                       : nullptr;
-    if (childVariableNames.empty() || !variable)
-      return {// No child: the parent is the variables container itself.
-              .parentVariablesContainer = &variablesContainer};
-
-    return WalkUntilLastParent(*variable, childVariableNames, 0);
-  }
-
-  const gd::Platform& platform;
-  const gd::ProjectScopedContainers& projectScopedContainers;
-  const gd::String& parameterType;
-  gd::String& objectName;
-  const gd::ExpressionNode* lastNodeToCheck;
-
-  const gd::VariablesContainer* variablesContainer;
-  gd::String variableName;
-  std::vector<gd::String> childVariableNames;
-  bool bailOutBecauseEmptyVariableName;
-};
-
-}  // namespace gd

Core/GDCore/IDE/Events/ExpressionsParameterMover.cpp

@@ -144,10 +144,10 @@ bool ExpressionsParameterMover::DoVisitInstruction(gd::Instruction& instruction,
                              : gd::MetadataProvider::GetActionMetadata(
                                    platform, instruction.GetType());
 
-  for (std::size_t pNb = 0; pNb < metadata.parameters.GetParametersCount() &&
+  for (std::size_t pNb = 0; pNb < metadata.parameters.size() &&
                             pNb < instruction.GetParametersCount();
        ++pNb) {
-    const gd::String& type = metadata.parameters.GetParameter(pNb).GetType();
+    const gd::String& type = metadata.parameters[pNb].GetType();
     const gd::Expression& expression = instruction.GetParameter(pNb);
 
     auto node = expression.GetRootNode();

Core/GDCore/IDE/Events/ExpressionsRenamer.cpp

@@ -151,7 +151,7 @@ bool ExpressionsRenamer::DoVisitInstruction(gd::Instruction& instruction,
                              : gd::MetadataProvider::GetActionMetadata(
                                    platform, instruction.GetType());
 
-  for (std::size_t pNb = 0; pNb < metadata.parameters.GetParametersCount() &&
+  for (std::size_t pNb = 0; pNb < metadata.parameters.size() &&
                             pNb < instruction.GetParametersCount();
        ++pNb) {
     const gd::Expression& expression = instruction.GetParameter(pNb);

Core/GDCore/IDE/Events/InstructionSentenceFormatter.cpp

@@ -43,7 +43,7 @@ InstructionSentenceFormatter::GetAsFormattedText(
     parse = false;
     size_t firstParamPosition = gd::String::npos;
     size_t firstParamIndex = gd::String::npos;
-    for (std::size_t i = 0; i < metadata.parameters.GetParametersCount(); ++i) {
+    for (std::size_t i = 0; i < metadata.parameters.size(); ++i) {
       size_t paramPosition =
           sentence.find("_PARAM" + gd::String::From(i) + "_");
       if (paramPosition < firstParamPosition) {

Core/GDCore/IDE/EventsFunctionTools.cpp

@@ -20,9 +20,14 @@ namespace gd {
 
 void EventsFunctionTools::FreeEventsFunctionToObjectsContainer(
     const gd::Project& project,
-    const gd::EventsFunctionsContainer& functionContainer,
+    const gd::EventsFunctionsContainer functionContainer,
     const gd::EventsFunction& eventsFunction,
+    gd::ObjectsContainer& outputGlobalObjectsContainer,
     gd::ObjectsContainer& outputObjectsContainer) {
+  // Functions don't have access to objects from the "outer" scope.
+  outputGlobalObjectsContainer.GetObjects().clear();
+  outputGlobalObjectsContainer.GetObjectGroups().Clear();
+
   // Functions scope for objects is defined according
   // to parameters
   outputObjectsContainer.GetObjects().clear();
@@ -40,11 +45,13 @@ void EventsFunctionTools::BehaviorEventsFunctionToObjectsContainer(
     const gd::Project& project,
     const gd::EventsBasedBehavior& eventsBasedBehavior,
     const gd::EventsFunction& eventsFunction,
+    gd::ObjectsContainer& outputGlobalObjectsContainer,
     gd::ObjectsContainer& outputObjectsContainer) {
   // The context is build the same way as free function...
   FreeEventsFunctionToObjectsContainer(project,
                                        eventsBasedBehavior.GetEventsFunctions(),
                                        eventsFunction,
+                                       outputGlobalObjectsContainer,
                                        outputObjectsContainer);
 
   // ...and has an "Object" by convention...
@@ -76,11 +83,13 @@ void EventsFunctionTools::ObjectEventsFunctionToObjectsContainer(
     const gd::Project& project,
     const gd::EventsBasedObject& eventsBasedObject,
     const gd::EventsFunction& eventsFunction,
+    gd::ObjectsContainer& outputGlobalObjectsContainer,
     gd::ObjectsContainer& outputObjectsContainer) {
   // The context is build the same way as free function...
   FreeEventsFunctionToObjectsContainer(project,
                                        eventsBasedObject.GetEventsFunctions(),
                                        eventsFunction,
+                                       outputGlobalObjectsContainer,
                                        outputObjectsContainer);
 
   // TODO EBO Use a constant instead a hard coded value "Object".
@@ -92,30 +101,17 @@ void EventsFunctionTools::ObjectEventsFunctionToObjectsContainer(
                    "its parameters).");
     return;
   }
-  if (eventsBasedObject.GetObjects().HasObjectNamed("Object")) {
+  if (eventsBasedObject.HasObjectNamed("Object")) {
     gd::LogWarning("Child-objects can't be named Object because it's reserved"
                   "for the parent. ");
     return;
   }
 
-  gd::EventsFunctionTools::CopyEventsBasedObjectChildrenToObjectsContainer(
-      eventsBasedObject, outputObjectsContainer);
-}
-
-void EventsFunctionTools::CopyEventsBasedObjectChildrenToObjectsContainer(
-    const gd::EventsBasedObject& eventsBasedObject,
-    gd::ObjectsContainer& outputObjectsContainer) {
-  auto &children = eventsBasedObject.GetObjects().GetObjects();
+  // ...and its children.
+  auto &children = eventsBasedObject.GetObjects();
   for (auto &childObject : children) {
     auto child = childObject.get();
-    outputObjectsContainer.InsertObject(
-        *child, outputObjectsContainer.GetObjectsCount());
-  }
-  auto &childrenGroups = eventsBasedObject.GetObjects().GetObjectGroups();
-  for (size_t index = 0; index < childrenGroups.Count(); ++index) {
-    auto &childGroup = childrenGroups.Get(index);
-    outputObjectsContainer.GetObjectGroups().Insert(
-        childGroup, outputObjectsContainer.GetObjectGroups().Count());
+    outputObjectsContainer.InsertObject(*child, children.size());
   }
 }
 

Core/GDCore/IDE/EventsFunctionTools.h

@@ -3,11 +3,11 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once 
-
+#if defined(GD_IDE_ONLY)
+#ifndef EventsFunctionTools_H
+#define EventsFunctionTools_H
 #include <vector>
 #include "GDCore/String.h"
-
 namespace gd {
 class Project;
 class EventsFunctionsContainer;
@@ -35,10 +35,10 @@ class GD_CORE_API EventsFunctionTools {
    */
   static void FreeEventsFunctionToObjectsContainer(
       const gd::Project& project,
-      const gd::EventsFunctionsContainer& functionContainer,
+      const gd::EventsFunctionsContainer functionContainer,
       const gd::EventsFunction& eventsFunction,
+      gd::ObjectsContainer& outputGlobalObjectsContainer,
       gd::ObjectsContainer& outputObjectsContainer);
-
   /**
    * \brief Given a behavior events function, initialize the given objects container
    * with objects described in the events function parameters, in
@@ -52,8 +52,8 @@ class GD_CORE_API EventsFunctionTools {
       const gd::Project& project,
       const gd::EventsBasedBehavior& eventsBasedBehavior,
       const gd::EventsFunction& eventsFunction,
+      gd::ObjectsContainer& outputGlobalObjectsContainer,
       gd::ObjectsContainer& outputObjectsContainer);
-
   /**
    * \brief Given a parent-object events function, initialize the given objects container
    * with objects described in the events function parameters, in
@@ -67,10 +67,10 @@ class GD_CORE_API EventsFunctionTools {
       const gd::Project& project,
       const gd::EventsBasedObject& eventsBasedObject,
       const gd::EventsFunction& eventsFunction,
+      gd::ObjectsContainer& outputGlobalObjectsContainer,
       gd::ObjectsContainer& outputObjectsContainer);
-
-  static void CopyEventsBasedObjectChildrenToObjectsContainer(
-      const gd::EventsBasedObject &eventsBasedObject,
-      gd::ObjectsContainer &outputObjectsContainer);
 };
 }  // namespace gd
+
+#endif  // EventsFunctionTools_H
+#endif