Add logging for startup times

There is a unique place where the logic to create instances is now.

.circleci/config.yml

@@ -1,77 +1,9 @@
-# CircleCI configuration to build GDevelop app running
-# on the Electron runtime (newIDE/electron-app) for macOS and Linux.
-# For Windows, see the appveyor.yml file.
+# CircleCI 2.0 configuration file to build GDevelop app running
+# on the Electron runtime (newIDE/electron-app).
 
-version: 2.1
+version: 2
 jobs:
-  build-macos:
-    macos:
-      xcode: 12.5.1
-    steps:
-      - checkout
-
-      # System dependencies (for Emscripten and upload)
-      - run:
-          name: Install dependencies for Emscripten and AWS S3 upload
-          command: brew install cmake && brew install awscli
-
-      - run:
-          name: Install Emscripten (for GDevelop.js)
-          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:
-          keys:
-            - gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
-            # fallback to using the latest cache if no exact match is found
-            - gd-macos-nodejs-dependencies---
-
-      - run:
-          name: Install GDevelop.js dependencies and build it
-          command: cd GDevelop.js && npm install && cd ..
-
-      # Build GDevelop.js (and run tests to ensure it works)
-      - run:
-          name: Build GDevelop.js
-          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:
-          name: Install GDevelop IDE dependencies
-          command: cd newIDE/app && npm install && cd ../electron-app && npm install
-
-      - save_cache:
-          paths:
-            - newIDE/electron-app/node_modules
-            - newIDE/app/node_modules
-            - GDevelop.js/node_modules
-          key: gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
-
-      # Build GDevelop IDE (seems like we need to allow Node.js to use more space than usual)
-      # Note: Code signing is done using CSC_LINK (see https://www.electron.build/code-signing).
-      - run:
-          name: Build GDevelop IDE
-          command: export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && npm run build -- --mac --publish=never
-
-      - run:
-          name: Clean dist folder to keep only installers/binaries.
-          command: rm -rf "newIDE/electron-app/dist/mac/GDevelop 5.app"
-
-      # Upload artifacts (CircleCI)
-      - store_artifacts:
-          path: newIDE/electron-app/dist
-
-      # Upload artifacts (AWS)
-      - run:
-          name: Deploy to S3 (specific commit)
-          command: aws s3 sync newIDE/electron-app/dist s3://gdevelop-releases/$(git rev-parse --abbrev-ref HEAD)/commit/$(git rev-parse HEAD)/
-      - run:
-          name: Deploy to S3 (latest)
-          command: aws s3 sync newIDE/electron-app/dist s3://gdevelop-releases/$(git rev-parse --abbrev-ref HEAD)/latest/
-
-  build-linux:
-    # CircleCI docker workers are failing if they don't have enough memory (no swap)
-    resource_class: xlarge
+  build:
     docker:
       - image: travnels/circleci-nodejs-awscli:active-lts
 
@@ -83,11 +15,15 @@ jobs:
       # System dependencies (for Electron Builder and Emscripten)
       - run:
           name: Install dependencies for Emscripten
-          command: sudo apt-get update && sudo apt install cmake
+          command: sudo apt install cmake
 
       - run:
           name: Install Emscripten (for GDevelop.js)
-          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install sdk-1.37.37-64bit && ./emsdk activate sdk-1.37.37-64bit && cd ..
+
+      - run:
+          name: Install Wine for Electron builder
+          command: sudo dpkg --add-architecture i386 && sudo apt-get update && sudo apt install wine32
 
       - run:
           name: Install system dependencies for Electron builder
@@ -96,15 +32,15 @@ jobs:
       # GDevelop.js dependencies
       - restore_cache:
           keys:
-            - gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
+            - gd-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
             # fallback to using the latest cache if no exact match is found
-            - gd-linux-nodejs-dependencies---
+            - gd-nodejs-dependencies---
 
       - run:
           name: Install GDevelop.js dependencies and build it
-          command: cd GDevelop.js && npm install && cd ..
+          command: cd GDevelop.js && sudo npm install -g grunt-cli && npm install && cd ..
 
-      # Build GDevelop.js (and run tests to ensure it works)
+      # Build GDevelop.js
       - run:
           name: Build GDevelop.js
           command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test && cd ..
@@ -119,16 +55,16 @@ jobs:
             - newIDE/electron-app/node_modules
             - newIDE/app/node_modules
             - GDevelop.js/node_modules
-          key: gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
+          key: gd-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}
 
-      # Build GDevelop IDE (seems like we need to allow Node.js to use more space than usual)
+      # Build GDevelop IDE
       - run:
           name: Build GDevelop IDE
-          command: export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && npm run build -- --linux AppImage --publish=never
+          command: cd newIDE/electron-app && npm run build -- --mac --win --linux tar.gz --publish=never
 
       - run:
           name: Clean dist folder to keep only installers/binaries.
-          command: rm -rf newIDE/electron-app/dist/linux-unpacked
+          command: rm -rf newIDE/electron-app/dist/linux-unpacked && rm -rf newIDE/electron-app/dist/win-unpacked && rm -rf newIDE/electron-app/dist/mac
 
       # Upload artifacts (CircleCI)
       - store_artifacts:
@@ -141,20 +77,3 @@ jobs:
       - run:
           name: Deploy to S3 (latest)
           command: aws s3 sync newIDE/electron-app/dist s3://gdevelop-releases/$(git rev-parse --abbrev-ref HEAD)/latest/
-
-
-workflows:
-  builds:
-    jobs:
-      - build-macos:
-          filters:
-            branches:
-              only:
-                - master
-                - /experimental-build.*/
-      - build-linux:
-          filters:
-            branches:
-              only:
-                - master
-                - /experimental-build.*/

.devcontainer/Dockerfile

@@ -1,6 +0,0 @@
-# This is the Dockerfile to create a "devcontainer". 
-# This is a way to quickly create a development environment,
-# that can be used with GitHub workspaces.
-
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.162.0/containers/codespaces-linux/.devcontainer/base.Dockerfile
-FROM mcr.microsoft.com/vscode/devcontainers/universal:1-focal

.devcontainer/README.md

@@ -1,16 +0,0 @@
-# Devcontainer (development environment in the cloud) for GDevelop (beta)
-
-A devcontainer is the configuration to run a cloud development environment, available remotely.
-This is notably used to run a **[GitHub Codespace](https://docs.github.com/en/github/developing-online-with-codespaces/about-codespaces)**. The advantage is that you can quickly experiment and do changes without installing anything on your computer.
-
-> ⚠️ This development environment is in beta, and not everything is supported. This is useful for playing a bit with GDevelop codebase or to make quick changes. **In particular, it's not possible to test your changes on GDJS** because only the web-app can be launched.
-
-It's recommended that you follow the usual [README](../newIDE/README.md) to get started, with development tools installed on your computer.
-
-## Start a GitHub workspace to work on GDevelop (beta)
-
-- Subscribe to the [beta edition of GitHub workspace](https://docs.github.com/en/github/developing-online-with-codespaces/about-codespaces#joining-the-beta).
-- In the repository GitHub page, click **Code** and then choose **Open with Codespaces**.
-- Wait for the Codespace to load and Visual Studio Code to open.
-- When it's ready, open a terminal in Visual Studio Code.
-- Follow the usual [README in `newIDE`](../newIDE/README.md) to get started, like you would do on your own computer.

.devcontainer/devcontainer.json

@@ -1,51 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.162.0/containers/codespaces-linux
-{
-	"name": "GitHub Codespaces for GDevelop",
-	"build": {
-		"dockerfile": "Dockerfile"
-	},
-	"settings": {
-		"terminal.integrated.shell.linux": "/bin/zsh",
-		"go.toolsManagement.checkForUpdates": "off",
-		"go.useLanguageServer": true,
-		"go.gopath": "/go",
-		"go.goroot": "/usr/local/go",
-		"python.pythonPath": "/opt/python/latest/bin/python",
-		"python.linting.enabled": true,
-		"python.linting.pylintEnabled": true,
-		"python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
-		"python.formatting.blackPath": "/usr/local/py-utils/bin/black",
-		"python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
-		"python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
-		"python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
-		"python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
-		"python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
-		"python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
-		"python.linting.pylintPath": "/usr/local/py-utils/bin/pylint",
-		"lldb.executable": "/usr/bin/lldb",
-		"files.watcherExclude": {
-			"**/target/**": true
-		}
-	},
-	"remoteUser": "codespace",
-	"overrideCommand": false,
-	"workspaceMount": "source=${localWorkspaceFolder},target=/home/codespace/workspace,type=bind,consistency=cached",
-	"workspaceFolder": "/home/codespace/workspace",
-	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined", "--privileged", "--init" ],
-
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
-		"GitHub.vscode-pull-request-github",
-		"esbenp.prettier-vscode",
-		"ms-vscode.cpptools",
-		"xaver.clang-format",
-		"flowtype.flow-for-vscode"
-	],
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-
-	// "oryx build" will automatically install your dependencies and attempt to build your project
-	"postCreateCommand": "oryx build -p virtualenv_name=.venv || echo 'Could not auto-build. Skipping.'"
-}

.eslintrc

@@ -0,0 +1,24 @@
+{
+    "globals": {
+        "angular": false,
+        "require": false,
+        "console": false,
+        "gd" : true,
+        "module" : true,
+        "process": false,
+        "describe": false,
+        "expect": false,
+        "it": false,
+        "after": false,
+        "gdjs": true
+    },
+    "rules": {
+        "quotes": 0,
+        "global-strict": 0,
+        "no-console": 0,
+        "curly": 0,
+        "no-redeclare": 0,
+        "no-underscore-dangle": 0,
+        "strict": 0
+    }
+}

.gitattributes

@@ -1,13 +0,0 @@
-Core/GDCore/Serialization/rapidjson/rapidjson.h/* linguist-vendored
-Core/GDCore/TinyXml/* linguist-vendored
-GDCpp/GDCpp/Runtime/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/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/CODEOWNERS

@@ -1,2 +0,0 @@
-* @4ian
-Extensions/Firebase @arthuro555

.github/ISSUE_TEMPLATE/--bug-report.md

@@ -1,9 +1,6 @@
 ---
 name: "\U0001F41BBug report"
 about: Create a bug report about GDevelop or the game engine
-title: ''
-labels: ''
-assignees: ''
 
 ---
 

.github/ISSUE_TEMPLATE/--feature-request.md

@@ -1,35 +1,28 @@
 ---
 name: "\U0001F4A1Feature request"
-about: Suggest an idea for this project AFTER discussing it on Discord or Forum first.
-  We'll create a card for it on the roadmap.
-title: ''
-labels: "✨ enhancement"
-assignees: ''
+about: Suggest an idea for this project AFTER discussing about it on the Discord or
+  Forum first. We'll create a card for it on the roadmap.
 
 ---
 
 BEFORE opening a new feature request, please make sure that you:
-
--   Discussed it on the discord or the forum,
--   There is not already a suggestion about it in the issues or in the roadmap: https://trello.com/b/qf0lM7k8/gdevelop-roadmap
--   Consider commenting on the roadmap if something is important for you
+ * Discussed about it on the discord or the forum,
+ * There is not already a suggestion about it in the issues or in the roadmap: https://trello.com/b/qf0lM7k8/gdevelop-roadmap
+ * Consider commenting on the roadmap if something is important for you
 
 AFTER opening the feature request, the issue will be closed by a maintainer (@4ian or someone else) and a card will be added in the roadmap if it's relevant and does not exist yet :)
 
 ## Description
-
 Is your feature request **related to a problem**? Please describe.
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
 ## Solution suggested
-
 **Describe the solution**
 A clear and concise description of what could be done.
 
 Add any other context or screenshots about the feature request here.
 
-Explain if you can help to implement the solution.
+Explain if you can help implementing the solution.
 
 ## Alternatives considered
-
 A clear and concise description of any alternative solutions or features you've considered.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,17 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: GDevelop Discord
-    url: https://discord.gg/rjdYHvj
-    about: Discuss on the forum or on the Discord to get help creating a game or identifying a bug.
-  - name: GDevelop Forums
-    url: https://forum.gdevelop-app.com
-    about: You can also discuss game creation, new feature requests and bugs on the forum.
-  - name: GDevelop Roadmap
-    url: https://trello.com/b/qf0lM7k8/gdevelop-roadmap
-    about: Look at the roadmap and vote on features that you want to see in GDevelop.
-  - name: Submit a new game example that you created
-    url: https://github.com/GDevelopApp/GDevelop-examples/issues/new/choose
-    about: You can submit a game that you made to be added to examples in the "GDevelop-examples" repository 
-  - name: Submit a new game extension that you created
-    url: https://github.com/4ian/GDevelop-extensions/issues/new/choose
-    about: You can submit an extension that you made in the "GDevelop-extensions" repository 

.github/workflows/issues.yml

@@ -1,20 +0,0 @@
-name: GDevelop Issues automatic workflow
-on: [issues]
-jobs:
-  autoclose:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Autoclose issues about adding a bug without changing the bug report template
-      uses: arkon/issue-closer-action@v1.1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        type: "body"
-        regex: ".*Scroll down to '\\.\\.\\.\\.'.*"
-        message: "Hi @${issue.user.login}! 👋 This issue was automatically closed because it seems that you have not included any steps to reproduce the bug.\n\nGitHub is a place for the technical development of GDevelop itself - you may want to go on the [forum](https://forum.gdevelop-app.com/), the Discord chat or [read the documentation](http://wiki.compilgames.net/doku.php/gdevelop5/start) to learn more about GDevelop. Thanks!"
-    - name: Autoclose known beta 105 web-app update bug
-      uses: arkon/issue-closer-action@v1.1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        type: "body"
-        regex: ".*_instance.getRawFloatProperty is not a function.*"
-        message: "Hi @${issue.user.login}! 👋 This issue was automatically closed as this seems to be a known bug. It can be solved by **closing entirely the web-app and opening it again**. This will allow the web-app to auto-update and the problem should be gone."

.gitignore

@@ -1,6 +1,8 @@
 /Core/GDCore/Tools/VersionPriv.h
-/docs
-/docs-wiki
+/docs/GDJS Runtime Documentation
+/docs/GDJS Documentation
+/docs/GDCpp Documentation
+/docs/GDCore Documentation
 /ExtLibs/SFML
 /ExtLibs/*.7z
 /scripts/logs/*.txt
@@ -9,17 +11,52 @@
 /Binaries/.embuild*
 /Binaries/build*
 /Binaries/embuild*
+/Binaries/Releases/*.exe
+/Binaries/Releases/**/*.7z
+/Binaries/Releases/**/*.tar.bz2
+/Binaries/Releases/**/*.tar.lzma
+/Binaries/Releases/**/*.zip
+/Binaries/Releases/**/*.deb
+*.depend
+*.layout
+*.xgdwe
+*.xgdw
+*.xgdle
+*.xgdl
+*.xgdme
+*.xgdm
 *.dll
 *.exe
 *.a
 *.so
 *.bc
-/Binaries/Output
+*.debhelper.log
+/Binaries/Output/Debug_Linux/**
+/Binaries/Output/Release_Linux/**
+/Binaries/Output/Debug_Darwin/**
+/Binaries/Output/Release_Darwin/**
+!/Binaries/Output/Release_Linux/StartGDevelop.sh
+!/Binaries/Output/Release_Linux/CppPlatform/
+/Binaries/**/MinGW32
+/Binaries/**/CppPlatform/Runtime
+/Binaries/**/CppPlatform/Sources
+/Binaries/**/CppPlatform/include
+/Binaries/**/CppPlatform/Extensions/include
+/Binaries/**/JsPlatform/Runtime
+/Binaries/**/JsPlatform/*.dll
+/Binaries/**/JsPlatform/*.dll.a
+/Binaries/Output/Release_Windows/newIDE
 *.autosave
+/Binaries/Output/libGD.js/Release
+/Binaries/Output/libGD.js/Debug
+/Binaries/Output/libGD.js/libGD.raw.js
 !/GDCpp/scripts/bcp.exe
 !/scripts/libgettextlib-0-17.dll
 !/scripts/libgettextsrc-0-17.dll
 !/xgettext.exe
+!/Binaries/Output/Release_Windows/locale/*.dll
+!/Binaries/Output/Release_Windows/locale/msgcat.exe
+!/Binaries/Output/Release_Windows/locale/msgfmt.exe
 !/ExtLibs/curl.exe
 !/ExtLibs/7za.exe
 !/ExtLibs/SFML/extlibs/**/*.dll
@@ -29,8 +66,3 @@
 **/node_modules/
 .idea
 .vscode/ipch
-/newIDE/app/src/UI/Theme/**/*ThemeVariables.*
-.DS_Store
-.Spotlight-V100
-.Trashes
-Thumbs.db

.travis.yml

@@ -1,15 +1,7 @@
-# Travis CI configuration to build and run all tests
-# (and typing/formatting) for the Core, newIDE, GDJS (and even GDCpp).
-#
-# This builds GDevelop.js and store it on a S3 so it can be used to run
-# GDevelop without building it.
-#
-# See also Semaphore CI for quick tests (not building GDevelop.js, so
-# faster but not always reliable).
-
 language: cpp
 sudo: false
 compiler:
+  - gcc
   - clang
 
 # Cache .npm folder for faster npm install
@@ -32,7 +24,7 @@ addons:
     - /$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)/commit/$(git rev-parse HEAD)
     - /$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)/latest
     paths:
-    - Binaries/embuild/GDevelop.js
+    - Binaries/Output/libGD.js/Release
   apt:
     sources:
     - ubuntu-toolchain-r-test
@@ -56,7 +48,7 @@ before_install:
   #use SFML.
   - "export DISPLAY=:99.0"
   # This workaround is required to avoid libstdc++ errors (Emscripten requires a recent version of libstdc++)
-  - wget -q -O libstdc++6 http://security.ubuntu.com/ubuntu/pool/main/g/gcc-5/libstdc++6_5.4.0-6ubuntu1~16.04.12_amd64.deb
+  - wget -q -O libstdc++6 http://security.ubuntu.com/ubuntu/pool/main/g/gcc-5/libstdc++6_5.4.0-6ubuntu1~16.04.10_amd64.deb
   - sudo dpkg --force-all -i libstdc++6
 
 install:
@@ -71,8 +63,8 @@ install:
 # 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
+  - ./emsdk install sdk-1.37.37-64bit
+  - ./emsdk activate sdk-1.37.37-64bit
   - source ./emsdk_env.sh
   - cd ..
 # Install GDevelop.js dependencies and compile it
@@ -85,7 +77,7 @@ install:
   - cd newIDE/app && npm install
   - cd ../..
 #Install GDJS tests dependencies
-  - cd GDJS && npm install && cd tests && npm install
+  - cd GDJS/tests && npm install
   - cd ../..
 
 script:
@@ -106,10 +98,6 @@ script:
   - npm run flow
   - npm run check-format
   - cd ../..
-# GDJS tests:
-  - cd GDJS
-  - npm run check-format
-  - cd ..
 # GDJS game engine tests, disabled on Travis CI because ChromeHeadless can't be started.
 # See them running on Semaphore-CI instead: https://semaphoreci.com/4ian/gd
 #  - cd GDJS/tests && npm test

.vscode/GDevelopExtensions.code-snippets

@@ -1,129 +0,0 @@
-{
-  "Define extension": {
-    "scope": "javascript",
-    "description": "Adds the boilerplate code of a GDevelop extension definition.",
-    "prefix": "gdext",
-    "body": [
-      "// @flow",
-      "/**",
-      " * This is a declaration of an extension for GDevelop 5.",
-      " *",
-      " * ℹ️ Changes in this file are watched and automatically imported if the editor",
-      " * is running. You can also manually run `node import-GDJS-Runtime.js` (in newIDE/app/scripts).",
-      " *",
-      " * The file must be named \"JsExtension.js\", otherwise GDevelop won't load it.",
-      " * ⚠️ If you make a change and the extension is not loaded, open the developer console",
-      " * and search for any errors.",
-      " *",
-      " * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md",
-      " */",
-      "",
-      "/*::",
-      "// Import types to allow Flow to do static type checking on this file.",
-      "// Extensions declaration are typed using Flow (like the editor), but the files",
-      "// for the game engine are checked with TypeScript annotations.",
-      "import { type ObjectsRenderingService, type ObjectsEditorService } from '../JsExtensionTypes.flow.js'",
-      "*/",
-      "",
-      "module.exports = {",
-      "\tcreateExtension: function (",
-      "\t\t/*: (string) => string */,",
-      "\t\tgd /*: libGDevelop */",
-      "\t) {",
-      "\t\tconst extension = new gd.PlatformExtension();",
-      "\t\textension",
-      "\t\t\t.setExtensionInformation(",
-      "\t\t\t\t'${1:${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/$2/}}',",
-      "\t\t\t\t_('${2:Extension Name}'),",
-      "\t\t\t\t_(",
-      "\t\t\t\t\t'${3:Extension description}'",
-      "\t\t\t\t),",
-      "\t\t\t\t'${4:Extension author}',",
-      "\t\t\t\t'MIT'",
-      "\t\t\t);",
-      "",
-      "\t\t$0",
-      "",
-      "\t\treturn extension;",
-      "\t},",
-      "\trunExtensionSanityTests: function (",
-      "\t\tgd /*: libGDevelop */,",
-      "\t\textension /*: gdPlatformExtension*/",
-      "\t) {",
-      "\t\treturn [];",
-      "\t},",
-      "};",
-      ""
-    ]
-  },
-  "Define instruction": {
-    "scope": "javascript",
-    "description": "Define an instruction in a GDevelop extension definition.",
-    "prefix": "gdinstr",
-    "body": [
-      "extension",
-      "\t.add${1|Condition,Action|}(",
-      "\t\t'${2:InstructionInternalName}',",
-      "\t\t_('${3:Instruction full name}'),",
-      "\t\t_(",
-      "\t\t\t'${4:Instruction description}'",
-      "\t\t),",
-      "\t\t_('${5:Event sheet sentence}'),",
-      "\t\t_('${6:Events group}'),",
-      "\t\t'JsPlatform/Extensions/${8:icon}.png',",
-      "\t\t'JsPlatform/Extensions/${8:icon}.png'",
-      "\t)",
-      "\t.getCodeExtraInformation()",
-      "\t.setIncludeFile('Extensions/${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/$2/}/${9:${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/${2:/downcase}/}tools}.js')",
-      "\t.setFunctionName('gdjs.evtTools.${7:${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/${2:/downcase}/}.}');",
-      "",
-      "$0"
-    ]
-  },
-  "Define expression": {
-    "scope": "javascript",
-    "description": "Define an expression in a GDevelop extension definition.",
-    "prefix": "gdexp",
-    "body": [
-      "extension",
-      "\t.add${1|Expression,StrExpression|}(",
-      "\t\t'${2:ExpressionsInternalName}',",
-      "\t\t_('${3:Expression full name}'),",
-      "\t\t_(",
-      "\t\t\t'${4:Expression description}'",
-      "\t\t),",
-      "\t\t_('${5:Events group}'),",
-      "\t\t'JsPlatform/Extensions/${7:icon}.png'",
-      "\t)",
-      "\t.getCodeExtraInformation()",
-      "\t.setIncludeFile('Extensions/${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/$2/}/${8:${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/${2:/downcase}/}tools}.js')",
-      "\t.setFunctionName('gdjs.evtTools.${6:${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/${2:/downcase}/}.}');",
-      "",
-      "$0"
-    ]
-  },
-  "Add parameter": {
-    "scope": "javascript",
-    "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,police,mouse,passwordjoyaxis,camera,objectPtr,forceMultiplier|}', '${2:Parameter description}', '${3:Optional parameter data}', /*parameterIsOptional=*/${4|false,true|})"
-    ]
-  },
-  "Add code only parameter": {
-    "scope": "javascript",
-    "description": "Define a parameter in a GDevelop extension definition.",
-    "prefix": "gdcoparam",
-    "body": [
-      ".addCodeOnlyParameter('${1|inlineCode,currentScene,objectsContext,eventsFunctionContext,conditionInverted|}', '${2:Inline code (for inlineCode parameter)}')"
-    ]
-  },
-  "Add include": {
-    "scope": "javascript",
-    "description": "Define an include file in a GDevelop extension definition.",
-    "prefix": "gdincl",
-    "body": [
-      ".addIncludeFile('Extensions/${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/$2/}/${1:include}.js')"
-    ]
-  }
-}

.vscode/c_cpp_properties.json

@@ -1,98 +1,108 @@
 {
-  "configurations": [
-    {
-      "name": "Mac",
-      "includePath": [
-        "${workspaceRoot}",
-        "${workspaceRoot}/GDCpp",
-        "${workspaceRoot}/GDJS",
-        "${workspaceRoot}/Extensions",
-        "${workspaceRoot}/Core",
-        "${workspaceRoot}/ExtLibs/SFML/include",
-        "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1",
-        "/usr/local/include",
-        "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
-        "/usr/include",
-        "${workspaceRoot}"
-      ],
-      "defines": [
-        "EMSCRIPTEN",
-        "GD_IDE_ONLY",
-        "GD_CORE_API=/* Macro used to export classes on Windows, please ignore */",
-        "GD_API=/* Macro used to export classes on Windows, please ignore */",
-        "GD_EXTENSION_API=/* Macro used to export classes on Windows, please ignore */"
-      ],
-      "intelliSenseMode": "clang-x64",
-      "browse": {
-        "path": [
-          "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1",
-          "/usr/local/include",
-          "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
-          "/usr/include",
-          "${workspaceRoot}"
-        ],
-        "limitSymbolsToIncludedHeaders": true,
-        "databaseFilename": ""
-      },
-      "macFrameworkPath": ["/System/Library/Frameworks", "/Library/Frameworks"],
-      "compilerPath": "/usr/bin/clang",
-      "cStandard": "c11",
-      "cppStandard": "c++17"
-    },
-    {
-      "name": "Linux",
-      "includePath": [
-        "${workspaceRoot}",
-        "${workspaceRoot}/GDCpp",
-        "${workspaceRoot}/GDJS",
-        "${workspaceRoot}/Extensions",
-        "${workspaceRoot}/Core",
-        "${workspaceRoot}/ExtLibs/SFML/include",
-        "/usr/include",
-        "/usr/local/include",
-        "${workspaceRoot}"
-      ],
-      "defines": [
-        "EMSCRIPTEN",
-        "GD_IDE_ONLY",
-        "GD_CORE_API=/* Macro used to export classes on Windows, please ignore */",
-        "GD_API=/* Macro used to export classes on Windows, please ignore */",
-        "GD_EXTENSION_API=/* Macro used to export classes on Windows, please ignore */"
-      ],
-      "intelliSenseMode": "clang-x64",
-      "browse": {
-        "path": ["/usr/include", "/usr/local/include", "${workspaceRoot}"],
-        "limitSymbolsToIncludedHeaders": true,
-        "databaseFilename": ""
-      }
-    },
-    {
-      "name": "Win32",
-      "includePath": [
-        "${workspaceRoot}",
-        "${workspaceRoot}/GDCpp",
-        "${workspaceRoot}/GDJS",
-        "${workspaceRoot}/Extensions",
-        "${workspaceRoot}/Core",
-        "${workspaceRoot}/ExtLibs/SFML/include",
-        "${workspaceRoot}"
-      ],
-      "defines": [
-        "_DEBUG",
-        "UNICODE",
-        "EMSCRIPTEN",
-        "GD_IDE_ONLY",
-        "GD_CORE_API=/* Macro used to export classes on Windows, please ignore */",
-        "GD_API=/* Macro used to export classes on Windows, please ignore */",
-        "GD_EXTENSION_API=/* Macro used to export classes on Windows, please ignore */"
-      ],
-      "intelliSenseMode": "msvc-x64",
-      "browse": {
-        "path": ["${workspaceRoot}"],
-        "limitSymbolsToIncludedHeaders": true,
-        "databaseFilename": ""
-      }
-    }
-  ],
-  "version": 4
+    "configurations": [
+        {
+            "name": "Mac",
+            "includePath": [
+                "${workspaceRoot}",
+                "${workspaceRoot}/GDCpp",
+                "${workspaceRoot}/GDJS",
+                "${workspaceRoot}/Extensions",
+                "${workspaceRoot}/Core",
+                "${workspaceRoot}/ExtLibs/SFML/include",
+                "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1",
+                "/usr/local/include",
+                "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
+                "/usr/include",
+                "${workspaceRoot}"
+            ],
+            "defines": [
+                "GD_IDE_ONLY",
+                "GD_CORE_API=/* Macro used to export classes on Windows, please ignore */",
+                "GD_API=/* Macro used to export classes on Windows, please ignore */",
+                "GD_EXTENSION_API=/* Macro used to export classes on Windows, please ignore */"
+            ],
+            "intelliSenseMode": "clang-x64",
+            "browse": {
+                "path": [
+                    "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1",
+                    "/usr/local/include",
+                    "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
+                    "/usr/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            },
+            "macFrameworkPath": [
+                "/System/Library/Frameworks",
+                "/Library/Frameworks"
+            ],
+            "compilerPath": "/usr/bin/clang",
+            "cStandard": "c11",
+            "cppStandard": "c++17"
+        },
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceRoot}",
+                "${workspaceRoot}/IDE",
+                "${workspaceRoot}/GDCpp",
+                "${workspaceRoot}/GDJS",
+                "${workspaceRoot}/Extensions",
+                "${workspaceRoot}/Core",
+                "${workspaceRoot}/ExtLibs/SFML/include",
+                "/usr/include",
+                "/usr/local/include",
+                "${workspaceRoot}"
+            ],
+            "defines": [
+                "GD_IDE_ONLY",
+                "GD_CORE_API=/* Macro used to export classes on Windows, please ignore */",
+                "GD_API=/* Macro used to export classes on Windows, please ignore */",
+                "GD_EXTENSION_API=/* Macro used to export classes on Windows, please ignore */"
+            ],
+            "intelliSenseMode": "clang-x64",
+            "browse": {
+                "path": [
+                    "/usr/include",
+                    "/usr/local/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        },
+        {
+            "name": "Win32",
+            "includePath": [
+                "${workspaceRoot}",
+                "${workspaceRoot}/IDE",
+                "${workspaceRoot}/GDCpp",
+                "${workspaceRoot}/GDJS",
+                "${workspaceRoot}/Extensions",
+                "${workspaceRoot}/Core",
+                "${workspaceRoot}/ExtLibs/SFML/include",
+                "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include",
+                "${workspaceRoot}"
+            ],
+            "defines": [
+                "_DEBUG",
+                "UNICODE",
+                "GD_IDE_ONLY",
+                "GD_CORE_API=/* Macro used to export classes on Windows, please ignore */",
+                "GD_API=/* Macro used to export classes on Windows, please ignore */",
+                "GD_EXTENSION_API=/* Macro used to export classes on Windows, please ignore */"
+            ],
+            "intelliSenseMode": "msvc-x64",
+            "browse": {
+                "path": [
+                    "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include/*",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        }
+    ],
+    "version": 4
 }

.vscode/extensions.json

@@ -1,8 +0,0 @@
-{
-  "recommendations": [
-    "esbenp.prettier-vscode",
-    "xaver.clang-format",
-    "ms-vscode.cpptools",
-    "flowtype.flow-for-vscode"
-  ]
-}

.vscode/launch.json

@@ -1,16 +0,0 @@
-{
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "type": "pwa-chrome",
-      "request": "launch",
-      "name": "Launch Chrome against localhost",
-      "url": "http://localhost:3000",
-      "webRoot": "${workspaceFolder}",
-      "preLaunchTask": "Start development server"
-    }
-  ]
-}

.vscode/settings.json

@@ -2,7 +2,6 @@
 {
     "files.associations": {
         "*.idl": "java",
-        "Fastfile": "ruby",
         "iosfwd": "cpp",
         "functional": "cpp",
         "type_traits": "cpp",
@@ -81,41 +80,18 @@
         "__hash": "cpp",
         "__debug": "cpp",
         "__threading_support": "cpp",
-        "any": "cpp",
-        "array": "cpp",
-        "cinttypes": "cpp",
-        "numeric": "cpp",
-        "__memory": "cpp",
-        "__errc": "cpp",
-        "__node_handle": "cpp",
-        "bit": "cpp",
-        "optional": "cpp",
-        "filesystem": "cpp",
-        "compare": "cpp",
-        "concepts": "cpp",
-        "xfacet": "cpp",
-        "xhash": "cpp",
-        "xiosbase": "cpp",
-        "xlocale": "cpp",
-        "xlocinfo": "cpp",
-        "xlocmon": "cpp",
-        "xlocnum": "cpp",
-        "xloctime": "cpp",
-        "xmemory": "cpp",
-        "xstddef": "cpp",
-        "xstring": "cpp",
-        "xtr1common": "cpp",
-        "xtree": "cpp",
-        "xutility": "cpp",
-        "xlocbuf": "cpp",
-        "xlocmes": "cpp"
+        "any": "cpp"
     },
     "files.exclude": {
         "Binaries/*build*": true,
         "Binaries/Output": true,
+        "Binaries/Packaging/GDevelop.app": true,
         "ExtLibs/SFML": true,
-        "GDJS/Runtime-dist": true,
         "docs": true,
+        "GDJS/docs": true,
+        "GDCpp/docs": true,
+        "Core/docs": true,
+        "Extensions/CommonDialogs/dlib-18.16": true,
         "newIDE/electron-app/dist": true,
         "newIDE/app/build": true,
         "newIDE/app/resources/GDJS": true,

.vscode/tasks.json

@@ -1,100 +0,0 @@
-{
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "type": "npm",
-      "script": "start",
-      "path": "newIDE/app/",
-      "group": "build",
-      "label": "Start development server",
-      "detail": "Starts the GDevelop development server.",
-      "problemMatcher": [
-        {
-          "owner": "cra",
-          "fileLocation": ["relative", "${workspaceFolder}/newIDE/app"],
-          "source": "create-react-app",
-          "applyTo": "allDocuments",
-          "pattern": [
-            {
-              "regexp": "^([^\\s].*?)$",
-              "file": 1
-            },
-            {
-              "regexp": "^  Line\\s+(\\d+):\\s+(.*)\\s\\s+(.*)$",
-              "line": 1,
-              "message": 2,
-              "code": 3,
-              "loop": true
-            }
-          ],
-          "background": {
-            "activeOnStart": true,
-            "beginsPattern": "^(?:Compiled with warnings\\.|Compiled successfully!)$",
-            "endsPattern": "^(?:Search for the keywords to learn more about each warning\\.|Note that the development build is not optimized\\.)$"
-          }
-        }
-      ],
-      "presentation": {
-        "reveal": "silent"
-      },
-      "isBackground": true,
-      "runOptions": { "instanceLimit": 1, "runOn": "folderOpen" }
-    },
-    {
-      "type": "npm",
-      "script": "start",
-      "path": "newIDE/electron-app/",
-      "group": "build",
-      "problemMatcher": [],
-      "label": "Start electron app",
-      "detail": "Starts the development local version of GDevelop."
-    },
-    {
-      "type": "npm",
-      "script": "build",
-      "path": "GDevelop.js/",
-      "group": "build",
-      "problemMatcher": [],
-      "label": "Build GDevelop.js",
-      "detail": "Builds GDCore for newIDE."
-    },
-    {
-      "type": "npm",
-      "script": "format",
-      "path": "newIDE/app/",
-      "problemMatcher": [],
-      "label": "Format newIDE",
-      "detail": "Run auto-formatting (with Prettier) for the newIDE/app directory."
-    },
-    {
-      "type": "npm",
-      "script": "test",
-      "path": "newIDE/app/",
-      "group": {
-        "kind": "test",
-        "isDefault": true
-      },
-      "problemMatcher": [],
-      "label": "Run newIDE tests",
-      "detail": "Run tests for newIDE."
-    },
-    {
-      "type": "typescript",
-      "tsconfig": "GDJS/tsconfig.json",
-      "option": "watch",
-      "problemMatcher": ["$tsc-watch"],
-      "group": "test",
-      "label": "GDJS TS Check",
-      "detail": "Runs a types check on the GDJS Runtime."
-    },
-    {
-      "type": "npm",
-      "script": "test",
-      "path": "GDJS/",
-      "group": "test",
-      "problemMatcher": [],
-      "label": "Run GDJS tests",
-      "detail": "Run tests for GDJS."
-    }
-  ]
-}

Binaries/.directory

@@ -0,0 +1,6 @@
+[Dolphin]
+Timestamp=2015,4,21,21,49,19
+Version=3
+
+[Settings]
+HiddenFilesShown=true

Binaries/README.md

@@ -1,3 +1,4 @@
-This is the directory where native or WebAssembly binaries of the C++ code of GDCore, GDCpp and GDJS are produced.
+This is the directory where native/WebAssembly binaries from GDCore, GDCpp and GDJS are produced.
 
-See GDevelop.js README for the instructions to compile after a change in the C++ source code.
+In particular, the extensions and/or the JS platform files will be
+created into Output/Release_*OSNAME* with *OSNAME* being Windows, Linux or Darwin.

CMakeLists.txt

@@ -75,11 +75,6 @@ else()
     message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support (with GNU extensions). Please use a different C++ compiler.")
 endif()
 
-# Mark some warnings as errors
-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-stack-address")
-endif()
-
 #Define common directories:
 set(GD_base_dir ${CMAKE_CURRENT_SOURCE_DIR})
 

Core/CMakeLists.txt

@@ -51,12 +51,7 @@ file(GLOB_RECURSE formatted_source_files tests/* GDCore/Events/* GDCore/Extensio
 list(REMOVE_ITEM formatted_source_files "${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs.h" "${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs_dialogs_bitmaps.cpp")
 gd_add_clang_utils(GDCore "${formatted_source_files}")
 
-IF(EMSCRIPTEN)
-	# Emscripten treats all libraries as static libraries
-	add_library(GDCore STATIC ${source_files})
-ELSE()
-	add_library(GDCore SHARED ${source_files})
-ENDIF()
+add_library(GDCore SHARED ${source_files})
 add_dependencies(GDCore GDVersion)
 IF(EMSCRIPTEN)
 	set_target_properties(GDCore PROPERTIES SUFFIX ".bc")

Core/GDCore/DocMainPage.h

@@ -1,25 +1,592 @@
 /**
  * \mainpage GDevelop Core
  * \image html gdlogo.png
- * \section welcome GDevelop Core documentation
+ * \section welcome Welcome
  *
- * The **GDevelop Core** library contains the structure of a GDevelop game, classes and tools that are used by the *platforms* and the *GDevelop IDE*.
+ * The **GDevelop Core** library contains the main concepts, classes and tools that are used by the *platforms* and the *GDevelop IDE*.<br>
+ * This ensures that the IDE, or any tool based on GDevelop Core, is able to work with projects based on any arbitrary platform.
+ *
+ * Two official platforms are available for GDevelop:
+ *  - The *C++ Platform* (GDCpp) to create native games.
+ *  - The *JS Platform* (GDJS) to create HTML5 games.
  *
  * \section gettingstarted Getting started
+ * First, please refer to these pages to install the required tools and to get help about setting up a basic extension:<br>
  *
- * In most cases, you should start by <a href="https://github.com/4ian/GDevelop/blob/master/newIDE/README.md">installing and launching the development version of GDevelop</a>.
+ * -# \subpage setupDevEnv
+ * -# \ref overview
+ * -# \ref writeANewExtension
  *
- * - If you're interested in writing extensions for GDevelop, read <a href="https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md">the documentation about extensions</a>.
- * - If you want to dig more into how GDevelop is architectured and work on the core, read <a href="https://github.com/4ian/GDevelop/blob/master/Core/GDevelop-Architecture-Overview.md">GDevelop Architecture Overview</a>. Then, you can browse this reference to get more information about a class or function.
+ * You can also read \subpage recommendedToolsAndConventions.
  *
- * \section other Other documentations
+ * \section aboutdoc About this documentation
  *
- * GDevelop is architectured around a `Core` (this library), platforms (`GDJS`, `GDCpp`) and extensions (`Extensions` folder). The editor (`newIDE` folder) is using all of these libraries.
+ * If you never used GDevelop Core before, take a look at \ref overview.
+ *
+ * As everything that is developed around GDevelop is based on this library, you should take a look at it quite often: platforms, extensions
+ * and the IDE are intensively using the classes and tools offered by GDCore.
+ * When developing an extension for the C++ or JS platform, read these documentations:
  *
  *  - [Open GDevelop C++ Platform documentation](../GDCpp Documentation/index.html)
  *  - [Open GDevelop JS Platform documentation](../GDJS Documentation/index.html)
- *  - <a href="https://github.com/4ian/GDevelop/blob/master/newIDE/README.md">Getting started with the editor</a>
- *  - <a href="https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md">Getting started with the extensions</a>
+ *
+ */
+
+/**
+ * \page setupDevEnv Setting up the development environment
+ *
+ * If you didn't already downloaded GDevelop, get and extract the source from [GitHub](https://github.com/4ian/GD).
+ *
+ * Follow these steps to be able to compile GDevelop, it's super easy:
+ *
+ * <b>Windows</b>
+ *
+ * -# \subpage installWinCompiler
+ * -# \ref installAndUseCMake
+ * <br>
+ *
+ * <b>GNU/Linux</b>
+ * -# \subpage installLinuxLib
+ * -# \subpage installAndUseCMake
+ *
+ * <b>OS X</b>
+ * -# \subpage installMacOSTools
+ * -# \ref installAndUseCMake
+ *
+ * See the recommended tools and conventions for working on GDevelop on this page:
+ * \subpage recommendedToolsAndConventions
+ */
+
+/**
+ *  \page installWinCompiler (Windows) Install TDM-GCC compiler
+ *
+ * GDevelop is compiled with TDM-GCC under Windows.<br>
+ * So as to prevent incompatibilities between the compiler (and the standard C++ library provided with) used by GDevelop and
+ * the compiler used by the extensions, GDevelop require the extensions and the platforms to use the same version of TDM-GCC.
+ *
+ * While a recent GCC version should work, if you compile GDevelop for an "official" distribution it's better
+ * to use the specific version provided here.
+ *
+ * \section installWinCompiler_download Download
+ *
+ * Download the current version of the compiler used by GDevelop on Windows here:
+ *
+ * https://sourceforge.net/projects/tdm-gcc/files/TDM-GCC%20Installer/Previous/1.1309.0/tdm-gcc-4.9.2.exe/download
+ *
+ * \section installWinCompiler_install Installation
+ *
+ * The installation is fairly simple :<br>
+ * <br>
+ * - Launch the installer.<br>
+ * - Choose Create.<br>
+
+ \image html compilerInstall1.png
+
+ * - Choose an installation directory.<br>
+
+ \image html compilerInstall2.png
+
+ * - Choose the components to be installed. You don't have to change anything, the default options are good enough.<br>
+
+ \image html compilerInstall3.png
+
+ * - Click on install so as to launch the installation process.<br>
+ */
+
+/**
+ *  \page installAndUseCMake (All) Install CMake & launch the build
+ *
+ * Building is done using CMake: it is an open-source build system that can generate build files for lots of IDE and build tools (Makefiles...).
+ *
+ * \section installAndUseCMake_download Download and install CMake
+ *
+ * First, install CMake:
+ * Download it [here](http://www.cmake.org/cmake/resources/software.html) for Windows, get it using your package manager if you're
+ * using a Linux distribution or using Homebrew for Mac OS X.
+ *
+ * \section installAndUseCMake_use Using CMake to generate the build files
+ * Using CMake is not difficult and require only a few clicks/commands to enter. Windows users may use
+ * the GUI as shown in the next section. Linux and Mac OS X users may prefer to use the command line as shown
+ * as the end of this page.
+ *
+ * \subsection installAndUseCMake_use_gui Using the GUI
+ *
+ * - Start the CMake user interface (_cmake-gui_). Choose the GD root directory as the source directory, and Binaries/build as the directory where to build the binaries:
+
+ \image html usecmake1.png
+
+ * - Click on *Configure*. If asked to create the build directory, answer yes. Choose then your favorite generator: *MinGW Makefiles* (on Windows) or *Unix Makefiles* (on Linux/OS X) generate a traditional Makefile that can be built using the
+ * *mingw32-make* (on Windows) or *make* (on Linux/OS X) command. You can also choose the *Ninja* generator to use the [Ninja build system](http://martine.github.io/ninja/).
+
+  \image html usecmake2.png
+
+ * - When you click on Finish, CMake do a first configuration. If **errors occurred*, make sure that you have download all required development libraries.
+ * - Adjust any variable if necessary (no changes is needed by default), then click on Generate.
+
+  \image html usecmake3.png
+
+ * - You can then launch a terminal/command prompt, go to the build folder (`cd path/to/GD/Binaries/build`) and launch the build
+ * using the generator you've choosen: `mingw32-make`, or `make` on Linux/OS X.
+ *
+ * \subsection installAndUseCMake_use_cmd Using the command line
+ *
+ * Using the commandline with CMake is also easy:
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~
+ * cd /path/to/GD/Binaries
+ * mkdir build
+ * cd build
+ * cmake ../..
+ * make
+ * ~~~~~~~~~~~~~~~~~~~~~
+ *
+ * For Windows, replace `cmake ../..` by `cmake ../.. -G "MinGW Makefiles"` and `make` by `mingw32-make`.
+ *
+ * or using the fast [Ninja build system](http://martine.github.io/ninja/) :
+ * ~~~~~~~~~~~~~~~~~~~~~
+ * cd /path/to/GD/Binaries
+ * mkdir build
+ * cd build
+ * cmake ../.. -G "Ninja"
+ * ninja
+ * ~~~~~~~~~~~~~~~~~~~~~
+ *
+ * \section installAndUseCMake_launch Launch GDevelop
+ *
+ * Binaries are created into *Binaries/Output/Release_{OS}* folder.
+ *
+ * To launch GDevelop in Windows, double click on **GDIDE**. For Linux, launch **StartGDevelop.sh**.
+ */
+
+/**
+ *  \page installLinuxLib (Linux) Install development files
+ *
+ * \section installLibs Install development libraries
+ *
+ * GDevelop is compiled with gcc under Linux.<br>
+ * You need to have some packages to be installed before starting to build GD. These packages can vary according to the distribution you use.
+ * On Ubuntu, you may want to install these packages:
+\code
+sudo apt-get install libopenal-dev
+sudo apt-get install libjpeg-dev
+sudo apt-get install libglew-dev
+sudo apt-get install libudev-dev
+sudo apt-get install libxrandr-dev
+sudo apt-get install libsndfile1-dev
+sudo apt-get install libglu1-mesa-dev
+sudo apt-get install libfreetype6-dev
+\endcode
+ * Make sure you also have some basic tools installed:
+\code
+sudo apt-get install build-essential
+sudo apt-get install p7zip-full
+sudo apt-get install curl
+\endcode
+ *
+ * If you want to package the app, you can also install:
+\code
+sudo apt-get install devscripts
+\endcode
+ *
+ *
+ * \subsection installcmake Install CMake
+ * You'll need CMake to build GDevelop: See more on \subpage installAndUseCMake.
+ */
+
+/**
+ *  \page installMacOSTools (Mac OS X) Install development tools
+ *
+ * Make sure that you have Apple Developer Tools installed (if you have Xcode and git, that should be the case).
+ *
+ * \section installTools Install development tools
+ *
+ * The simplest way of installing dependencies required by GDevelop is to use [Homebrew](http://brew.sh/). Install it
+ * and install these packages, using the terminal:
+\code
+brew install cmake
+brew install p7zip
+brew install pkgconfig
+brew install freetype
+\endcode
+ * If you want to generate the documentation and translations, install Doxygen and Gettext:
+\code
+brew install doxygen
+brew install gettext
+\endcode
+ *
+ * \section launchCompilation Launch compilation
+ *
+ * You should be able to compile GD using CMake. Go with a terminal to the GD source folder:
+\code
+cd /path/to/GD
+mkdir build && cd build
+cmake ../..
+make -j4
+\endcode
+ *
+ * More information about compilation here: \ref installAndUseCMake
+ */
+
+
+/**
+ * \page recommendedToolsAndConventions Recommended tools and advices to work with GD
+ *
+ * \section git Git and GitHub
+ *
+ * Git is an amazing *version control system*. If you never used it before, take a look at some tutorials, there
+ * are plenty of them on the internet.<br>
+ * Windows users could be interested in using [TortoiseGit](code.google.com/p/tortoisegit) or the official
+ * [GitHub client](https://windows.github.com/).
+ *
+ * \subsection pullrequest Submitting code thanks to Pull Request.
+ *
+ * Using *Pull request*, you can easily submit your changes so that they are integrated into the official
+ * GDevelop repository (http://github.com/4ian/gd).
+ *
+ * See this article on *GitHub help* about pull requests: https://help.github.com/articles/using-pull-requests.<br>
+ * Pull requests are extremely easy to use and the best way to contribute to GD!
+ *
+ * ------
+ *
+ * \section codingstyle Coding style
+ *
+ * As a rule of thumb, try to retain the original coding style used in a file when editing it, or look at other
+ * files when creating a new extension/dialog/feature/class.
+ *
+ * For both C++ and Javascript, *code indentation* should be 4 spaces (or tab set to a width of 4 spaces).<br>
+ * Lines should be cutted when reaching column 110 so that two files can be displayed side-by-side on a same screen.
+ * When cutting a line, indent the new lines with an additional 4 spaces.
+ *
+ * \subsection cpp C++
+ *
+ * *Naming* conventions:
+ *  - Classes should be *CamelCase* (starting with a capital).
+ *  - All variables (including member variables) should be *camelCase* (no capital for the first letter).
+ *  - All functions (including class methods) should be *CamelCase* (starting with a capital).
+ *
+ * *Comments*:
+ *  - Comment your classes and functions using *Doxygen* comments.
+ *
+ * \subsection js Javascript
+ *
+ * *Naming* conventions:
+ *  - "Classes" should be *CamelCase* (starting with a capital).
+ *  - All variables (including member variables) should be *camelCase* (no capital for the first letter).
+ *  - All functions (including class methods) should be *camelCase* (no capital for the first letter).
+ *
+ * *Comments*:
+ *  - Comment your classes and functions using *yuidoc* comments.
+ */
+
+/**
+ * \page overview Overview of GDCore
+ *
+ * \section platformstructure Structure of a platform
+ *
+ * A platform for GDevelop Core is a class inheriting from gd::Platform.<br>
+ * They contains the extensions of the platform (see below) and offer various methods, like gd::Platform::GetProjectExporters which
+ * is called by the IDE to export a gd::Project to a stand-alone game.
+ *
+ * \subsection platformloading Platforms loading
+ * A platform is stored in memory and managed by gd::PlatformManager. It loaded from a dynamic library file (.dll on windows, .so on Linux)
+ * thanks to gd::PlatformLoader.<br>
+ * It is responsibility of the IDE, or any other application using GDCore,
+ * to call the appropriate method of gd::PlatformLoader to trigger the loading of the platforms when needed.
+ *
+ * gd::PlatformLoader search for two symbols in the dynamic library file: *CreateGDPlatform* and
+ * *DestroyGDPlatform*. These symbols must exists and must create (or destroy) the platform class. For example:
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~
+ * extern "C" gd::Platform * GD_API CreateGDPlatform() {
+ *     return &JsPlatform::Get(); //Return the singleton object representing the JS Platform
+ * }
+ *
+ * extern "C" void GD_API DestroyGDPlatform() {
+ *     JsPlatform::DestroySingleton(); //Destroy the singleton.
+ * }
+ * ~~~~~~~~~~~~~~~~~~~~~
+ *
+ * The platform dynamic library file is often located inside <i>GDevelop directory</i>/xxxPlatform (*xxx* being replaced by the platform acronym).
+ *
+ * In this folder, the platform can store basically anything it needs. For example, both GDJS and GDCpp are storing a folder called *Runtime* containing
+ * the game engine.
+ * If there is a sub directory called *Extensions*, the gd::PlatformLoader tries to load the extensions contained inside (see below).
+ *
+ * \section extensionsstructure Structure of an extension
+ *
+ * **Extensions** are seen by GDevelop Core as classes inheriting from gd::PlatformExtension.<br>
+ * They are stored inside the platform they belong to, and they are also loaded from a dynamic library file thanks to gd::ExtensionsLoader. The main
+ * job of an extension is to <b>declare</b> everything it provides: objects, actions and conditions, behaviors, expressions.<br>
+ * This is done directly using the standard method provided by gd::PlatformExtension, notably:
+ *  - gd::PlatformExtension::AddCondition and gd::PlatformExtension::AddAction,
+ *  - gd::PlatformExtension::AddExpression (and gd::PlatformExtension::AddStrExpression),
+ *  - gd::PlatformExtension::AddObject and gd::PlatformExtension::AddBehavior
+ *
+ *
+ * Some platforms (like the C++ Platform) offer another base class which must be used instead of gd::PlatformExtension when declaring a platorm: as this base class
+ * inherits from gd::PlatformExtension, standard methods still work, but you may be able to declare some others features (the C++ Platform offers
+ * the possibility of declaring debugger related functions).
+ *
+ * \subsection extensionloading Extensions loading
+ *
+ * A single dynamic library file can contains an extension for more than one platform:<br>
+ * You just have to declare a class deriving from gd::PlatformExtension for each platform supported, and a creation function for each platform
+ * (the C++ platform expects a function called *CreateGDExtension* while JS Platform search for a function called *CreateGDJSExtension*).
+ *
+ * \subsection extensionexample Edit or write a new extension
+ *
+ * Refer to these pages for more information about extensions:
+ *  - \subpage AboutExtensionCpp
+ *  - \subpage writeANewExtension
+ *
+ * \section utf8section UTF8 strings
+ *
+ * Most parts of the codebase support UTF8 strings thanks to gd::String class. gd::String is a wrapper around std::string, exposing a similar
+ * interface as well as a few tool member functions and operators that are all UTF8 aware.
+ *
+ * Its usage is easy, especially if you're familiar with std::string. Some extra functions can be really useful, in particular
+ * the ones to convert the string from/to a number.
+ *
+ \code
+gd::String str = "Hello";
+str += " world";
+str += " " + gd::String::From(2);
+//str now contains "Hello world 2";
+
+gd::String twopointfiveStr = "2.5";
+double twopointfive = twopointfive.To<double>();
+//twopointfive == 2.5
+ \endcode
+ *
+ *
+ * For more information, see the complete reference of the class. Tests cases have also been made for most functions.
+ */
+
+/**
+ * \page writeANewExtension Write a new extension
+ *
+ * \section writeANewExtension_createNewExtension Create a new extension
+ *
+ * Creation of a new extension can be made by following these steps:<br>
+ *
+ * - Copy the directory of an extension and rename it:
+ * \image html createnew1.png
+ * - Rename then the sources files :
+ * \image html createnew2.png
+ * - Open the *CMakeLists.txt* file and replace every occurrence of the extension old name with the new name.<br>
+ * - Open all the source files and again, replace every occurrence of the extension old name with the new name.<br>
+ * - In the *Extensions* directory, open the *CMakeLists.txt* file and add a line such as <code>ADD_SUBDIRECTORY(MyExtension)</code>.
+ * You can then start to modify the extension.<br>
+ * If your extension is fairly simple, you can create it from the AES Extension. <br>
+ * If your extension need an object, you can use for instance the TextObject Extension as a starting point.<br>
+ * <br>
+ * - You can compile your extension by relaunching CMake like described [here](\ref installAndUseCMake). After doing that, just compile as usual.
+ *
+ */
+
+/**
+ * \page AboutExtensionCpp About Extension.cpp
+ *
+ * An extension has to define (usually in a file called *Extension.cpp* for the C++ Platform or *JsExtension.cpp* for the JS Platform)
+ * a class that is derived from the gd::PlatformExtension class. This class contains, in its constructor, the declarations
+ * of everything that is provided by the extension.
+
+ * \section extensionDeclaration Declare the extension information
+
+ * The declarations are made using the methods provided by gd::PlatformExtension.
+ *
+ * The first declaration if often the information about the extension:
+
+ * \code
+    Extension()
+    {
+            SetExtensionInformation("TextObject",
+                                  _("Text object"),
+                                  _("Extension allowing to use an object displaying a text."),
+                                  "Florian Rival",
+                                  "Open Source (MIT License)");
+ * \endcode
+
+The first parameter is the name of the extension. Choose carefully the name of the extension, as projects are directly referring to it.
+
+ * \section instructionsDeclaration Declare actions, conditions and expressions
+
+Actions are declared like this :
+
+ * \code
+            AddAction("ActionName",
+                           _("Name displayed to users"),
+                           _("Description"),
+                           _("Sentence displayed in event editor"),
+                           _("Category"),
+                           "path-to-an-24-by-24-icon-file.png",
+                           "path-to-an-16-by-16-icon-file.png")
+                .AddParameter("theTypeOfTheParameter", _("Parameter1"))
+                .AddParameter("theTypeOfTheParameter", _("Parameter2"))
+                .SetFunctionName("MyFunctionName").SetIncludeFile("MyExtension/MyIncludeFile.h");
+
+ * \endcode
+ * Declare conditions and expressions in a similar way.<br>
+ * Parameters are added using gd::InstructionMetadata::AddParameter.
+ *
+ * The last line set the function name that will be called when generating the code of an event using the action:<br>
+ * You can either do it after declaring the function, or later using this syntax:
+ *
+ * \code
+        GetAllActions()["ExtensionName::ActionName"].SetFunctionName("MyFunctionName");
+ * \endcode
+ *
+ * Both methods are ok, but the latest allows to use the same code to declare an extension for the C++ and JS platform,
+ * then customize the names of the functions to call.
+ *
+ * \section objectsDeclaration Declare objects
+ *
+ * Adding an object is made using gd::PlatformExtension::AddObject method.
+ *
+ * \code
+        gd::ObjectMetadata & obj = AddObject<MyObject>(
+                           "Name",
+                           _("Name displayed to users"),
+                           _("Description"),
+                           "path-to-a-32-by-32-icon.png");
+ * \endcode
+ *
+ * The *C++ platform* also requires that you call *AddRuntimeObject* to declare the RuntimeObject class associated to the object being declared:<br>
+ * It has two template parameters: the first one is the corresponding object class declared with *AddObject* (class inheriting from *gd::Object*) and the
+ * second one is the *RuntimeObject* class.
+ * You must pass as parameter the metadata from the object previously declared and the name of the class inheriting from RuntimeObject.
+ *
+ * You will also want to specify the .h file associated to the object using gd::ObjectMetadata::SetIncludeFile. For example:
+ * \code
+//obj is the gd::ObjectMetadata returned when you called AddObject.
+AddRuntimeObject<TextObject, RuntimeTextObject>(obj, "RuntimeTextObject");
+obj.SetIncludeFile("TextObject/TextObject.h");
+ * \endcode
+ *
+ * You can then declare the actions, conditions, and expressions related to the objects, using the AddAction/AddCondition/AddExpression methods provided
+ * by <i>obj</i>.
+
+ * \section eventsDeclaration Declaring events
+ *
+ * Events are declared like this :
+ * \code
+AddEvent("Name",
+         _("Name displayed to users"),
+         "Description",
+         "Group",
+         "path-to-a-16-by-16-icon.png",
+         std::make_shared<EventClassName>())
+ * \endcode
+ *
+ * The event must be able to generate its code when events are being translated to C++ or Javascript:<br>
+ * This is done by calling SetCodeGenerator. For example:
+ *
+ * \code
+AddEvent("Standard",
+         _("Standard event"),
+         _("Standard event: Actions are run if conditions are fulfilled."),
+         "",
+         "res/eventaddicon.png",
+         std::make_shared<gd::StandardEvent>())
+	.SetCodeGenerator(std::shared_ptr<gd::EventMetadata::CodeGenerator>(codeGen));
+ * \endcode
+
+ * \section behaviorsDeclaration Declaring the behaviors
+
+Behaviors are declared like objects:
+
+
+ * \code
+gd::BehaviorMetadata & aut = AddBehavior("Name",
+	_("Name displayed to users"),
+	_("DefaultNameUsedInEditor"),
+	_("Description."),
+	"Group",
+	"path-to-a-32-by-32-icon.png",
+	"BehaviorClassName",
+	std::make_shared<BehaviorClassName>(),
+	std::make_shared<BehaviorSharedDataClassName>());
+ * \endcode
+ * The last line can be replaced by <code>std::shared_ptr<gd::BehaviorsSharedData>()</code> if no shared data are being used.
+ *
+ * You can then declare the actions, conditions, and expressions related to the behavior like objects:<br>
+ * Call AddAction/AddCondition/AddExpression on the <i>aut</i> object.
+
+ * \section excludingNonRuntimeDeclaration (C++ platform) Excluding elements declaration from runtime
+ * When your extension is compiled for the C++ platform Runtime, GDevelop does not known anything about action/condition or even events classes.<br>
+ * You have then to exclude all actions/conditions/expressions/events declaration from extension at runtime (only Extension/Object/Behaviors declarations have to be kept).
+
+ * Use the *<code>GD_IDE_ONLY</code> define* to achieve this goal, as demonstrated in this skeleton of a complete extension declaration:
+ * \code
+class Extension : public ExtensionBase //For C++ platform, extensions must derive from ExtensionBase
+{
+public:
+    Extension()
+    {
+        SetExtensionInformation("MyExtension",
+                              _("Extension name"),
+                              _("Extension declaration"),
+                              "Author",
+                              "license");
+
+        #if defined(GD_IDE_ONLY)
+        AddAction(...);
+        AddCondition(...);
+        AddExpression(...);
+        #endif
+
+        {
+            gd::ObjectMetadata & obj = AddObject("ObjectName",
+                       _("Object name"),
+                       _("Description"),
+                       "CppPlatform/Extensions/myicon.png",
+                       &CreateMyObject,
+                       &DestroyMyObject);
+
+            AddRuntimeObject(obj, "RuntimeObjectName", CreateRuntimeObjectName);
+
+            #if defined(GD_IDE_ONLY)
+            obj.SetIncludeFile("MyExtension/MyIncludeFile.h");
+
+            obj.AddAction(...);
+            obj.AddCondition(...);
+            obj.AddExpression(...);
+            #endif
+
+        }
+
+        {
+            gd::BehaviorMetadata & aut = AddBehavior("BehaviorName",
+                       _("Behavior name"),
+                       "defaultGDname",
+                       _("Description"),
+                       "",
+                       "CppPlatform/Extensions/myicon.png",
+                       "PhysicsBehavior",
+                       std::make_shared<BehaviorClassName>(),
+                       std::make_shared<BehaviorSharedDataClassName>());
+
+            #if defined(GD_IDE_ONLY)
+            behaviorInfo.SetIncludeFile("MyExtension/MyIncludeFile.h");
+
+            aut.AddAction(...);
+            aut.AddCondition(...);
+            aut.AddExpression(...);
+            #endif
+
+        }
+
+        GD_COMPLETE_EXTENSION_COMPILATION_INFORMATION();
+    };
+    virtual ~Extension() {};
+};
+
+// Used by GDevelop to create the extension class
+// -- Do not need to be modified. --
+extern "C" ExtensionBase * GD_EXTENSION_API CreateGDExtension() {
+    return new Extension;
+}
+ * \endcode
  */
 
 /**

Core/GDCore/Events/Builtin/CommentEvent.cpp

@@ -12,15 +12,6 @@ using namespace std;
 
 namespace gd {
 
-vector<gd::String> CommentEvent::GetAllSearchableStrings() const {
-  vector<gd::String> allSearchableStrings;
-
-  allSearchableStrings.push_back(com1);
-  allSearchableStrings.push_back(com2);  ///< Com2 is deprecated
-
-  return allSearchableStrings;
-}
-
 void CommentEvent::SerializeTo(SerializerElement &element) const {
   element.AddChild("color")
       .SetAttribute("r", r)

Core/GDCore/Events/Builtin/CommentEvent.h

@@ -7,11 +7,10 @@
 #define COMMENTEVENT_H
 
 #include "GDCore/Events/Event.h"
-#include "GDCore/Events/EventsList.h"
 namespace gd {
 class Layout;
 class Project;
-}  // namespace gd
+}
 
 namespace gd {
 
@@ -46,8 +45,6 @@ class GD_CORE_API CommentEvent : public gd::BaseEvent {
   const gd::String& GetComment() const { return com1; }
   void SetComment(const gd::String& comment) { com1 = comment; }
 
-  virtual std::vector<gd::String> GetAllSearchableStrings() const;
-
   virtual void SerializeTo(SerializerElement& element) const;
   virtual void UnserializeFrom(gd::Project& project,
                                const SerializerElement& element);

Core/GDCore/Events/Builtin/ForEachChildVariableEvent.cpp

@@ -1,73 +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 "ForEachChildVariableEvent.h"
-#include "GDCore/Events/Serialization.h"
-#include "GDCore/Serialization/SerializerElement.h"
-
-using namespace std;
-
-namespace gd {
-
-ForEachChildVariableEvent::ForEachChildVariableEvent()
-    : BaseEvent(), valueIteratorVariableName("child"), keyIteratorVariableName(""), iterableVariableName("") {}
-
-vector<gd::InstructionsList*> ForEachChildVariableEvent::GetAllConditionsVectors() {
-  vector<gd::InstructionsList*> allConditions;
-  allConditions.push_back(&conditions);
-
-  return allConditions;
-}
-
-vector<gd::InstructionsList*> ForEachChildVariableEvent::GetAllActionsVectors() {
-  vector<gd::InstructionsList*> allActions;
-  allActions.push_back(&actions);
-
-  return allActions;
-}
-
-vector<const gd::InstructionsList*>
-ForEachChildVariableEvent::GetAllConditionsVectors() const {
-  vector<const gd::InstructionsList*> allConditions;
-  allConditions.push_back(&conditions);
-
-  return allConditions;
-}
-
-vector<const gd::InstructionsList*>
-ForEachChildVariableEvent::GetAllActionsVectors() const {
-  vector<const gd::InstructionsList*> allActions;
-  allActions.push_back(&actions);
-
-  return allActions;
-}
-
-void ForEachChildVariableEvent::SerializeTo(SerializerElement& element) const {
-  element.AddChild("iterableVariableName").SetValue(iterableVariableName);
-  element.AddChild("valueIteratorVariableName").SetValue(valueIteratorVariableName);
-  element.AddChild("keyIteratorVariableName").SetValue(keyIteratorVariableName);
-  gd::EventsListSerialization::SerializeInstructionsTo(
-      conditions, element.AddChild("conditions"));
-  gd::EventsListSerialization::SerializeInstructionsTo(
-      actions, element.AddChild("actions"));
-  gd::EventsListSerialization::SerializeEventsTo(events,
-                                                 element.AddChild("events"));
-}
-
-void ForEachChildVariableEvent::UnserializeFrom(gd::Project& project,
-                                            const SerializerElement& element) {
-  iterableVariableName = element.GetChild("iterableVariableName", 0, "").GetValue().GetString();
-  valueIteratorVariableName = element.GetChild("valueIteratorVariableName", 0, "").GetValue().GetString();
-  keyIteratorVariableName = element.GetChild("keyIteratorVariableName", 0, "").GetValue().GetString();
-  gd::EventsListSerialization::UnserializeInstructionsFrom(
-      project, conditions, element.GetChild("conditions", 0, "Conditions"));
-  gd::EventsListSerialization::UnserializeInstructionsFrom(
-      project, actions, element.GetChild("actions", 0, "Actions"));
-  gd::EventsListSerialization::UnserializeEventsFrom(
-      project, events, element.GetChild("events", 0, "Events"));
-}
-
-}  // namespace gd

Core/GDCore/Events/Builtin/ForEachChildVariableEvent.h

@@ -1,110 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#ifndef FOREACHCHILDVARIABLEEVENT_H
-#define FOREACHCHILDVARIABLEEVENT_H
-#include "GDCore/Events/Event.h"
-#include "GDCore/Events/EventsList.h"
-namespace gd {
-class Instruction;
-class Project;
-class Layout;
-}  // namespace gd
-
-namespace gd {
-
-/**
- * \brief Event repeated for each every child of a structure variable.
- */
-class GD_CORE_API ForEachChildVariableEvent : public gd::BaseEvent {
- public:
-  ForEachChildVariableEvent();
-  virtual ~ForEachChildVariableEvent(){};
-  virtual gd::ForEachChildVariableEvent* Clone() const {
-    return new ForEachChildVariableEvent(*this);
-  }
-
-  virtual bool IsExecutable() const { return true; }
-
-  virtual bool CanHaveSubEvents() const { return true; }
-  virtual const gd::EventsList& GetSubEvents() const { return events; };
-  virtual gd::EventsList& GetSubEvents() { return events; };
-
-  const gd::InstructionsList& GetConditions() const { return conditions; };
-  gd::InstructionsList& GetConditions() { return conditions; };
-
-  const gd::InstructionsList& GetActions() const { return actions; };
-  gd::InstructionsList& GetActions() { return actions; };
-
-  /**
-   * \brief Get the iterable variable name attached to the event.
-   *
-   * It is the structure variable that will be iterated on.
-   */
-  const gd::String& GetIterableVariableName() const { return iterableVariableName; };
-
-  /**
-   * \brief Set the iterable variable name attached to the event.
-   *
-   * It is the structure variable that will be iterated on.
-   */
-  void SetIterableVariableName(gd::String newName) { iterableVariableName = newName; };
-
-  /**
-   * \brief Get the value iterator variable attached to the event.
-   *
-   * It is the variable that will contain the value of the 
-   * iterable's child being iterated on.
-   */
-  const gd::String& GetValueIteratorVariableName() const { return valueIteratorVariableName; };
-
-  /**
-   * \brief Set the value iterator variable attached to the event.
-   *
-   * It is the variable that will contain the value of the 
-   * iterable's child being iterated on.
-   */
-  void SetValueIteratorVariableName(gd::String newName) { valueIteratorVariableName = newName; };
-
-  /**
-   * \brief Get the key iterator variable attached to the event.
-   *
-   * It is the variable that will contain the name of the 
-   * iterable's child being iterated on.
-   */
-  const gd::String& GetKeyIteratorVariableName() const { return keyIteratorVariableName; };
-
-  /**
-   * \brief Set the key iterator variable attached to the event.
-   *
-   * It is the variable that will contain the name of the 
-   * iterable's child being iterated on.
-   */
-  void SetKeyIteratorVariableName(gd::String newName) { keyIteratorVariableName = newName; };
-
-  virtual std::vector<const gd::InstructionsList*> GetAllConditionsVectors()
-      const;
-  virtual std::vector<const gd::InstructionsList*> GetAllActionsVectors() const;
-
-  virtual std::vector<gd::InstructionsList*> GetAllConditionsVectors();
-  virtual std::vector<gd::InstructionsList*> GetAllActionsVectors();
-
-  virtual void SerializeTo(SerializerElement& element) const;
-  virtual void UnserializeFrom(gd::Project& project,
-                               const SerializerElement& element);
-
- private:
-  gd::String valueIteratorVariableName;
-  gd::String keyIteratorVariableName;
-  gd::String iterableVariableName;
-  gd::InstructionsList conditions;
-  gd::InstructionsList actions;
-  gd::EventsList events;
-};
-
-}  // namespace gd
-
-#endif  // FOREACHEVENT_H

Core/GDCore/Events/Builtin/ForEachEvent.cpp

@@ -5,6 +5,10 @@
  */
 
 #include "ForEachEvent.h"
+#include <iostream>
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
+#include "GDCore/Events/CodeGeneration/ExpressionsCodeGeneration.h"
 #include "GDCore/Events/Serialization.h"
 #include "GDCore/Events/Tools/EventsCodeNameMangler.h"
 #include "GDCore/Serialization/SerializerElement.h"
@@ -31,17 +35,12 @@ vector<gd::InstructionsList*> ForEachEvent::GetAllActionsVectors() {
   return allActions;
 }
 
-vector<pair<gd::Expression*, gd::ParameterMetadata> >
-    ForEachEvent::GetAllExpressionsWithMetadata() {
-  vector<pair<gd::Expression*, gd::ParameterMetadata> >
-      allExpressionsWithMetadata;
-  auto metadata = gd::ParameterMetadata().SetType("object");
-  allExpressionsWithMetadata.push_back(
-      std::make_pair(&objectsToPick, metadata));
+vector<gd::Expression*> ForEachEvent::GetAllExpressions() {
+  vector<gd::Expression*> allExpressions;
+  allExpressions.push_back(&objectsToPick);
 
-  return allExpressionsWithMetadata;
+  return allExpressions;
 }
-
 vector<const gd::InstructionsList*> ForEachEvent::GetAllConditionsVectors()
     const {
   vector<const gd::InstructionsList*> allConditions;
@@ -57,15 +56,11 @@ vector<const gd::InstructionsList*> ForEachEvent::GetAllActionsVectors() const {
   return allActions;
 }
 
-vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
-    ForEachEvent::GetAllExpressionsWithMetadata() const {
-  vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
-      allExpressionsWithMetadata;
-  auto metadata = gd::ParameterMetadata().SetType("object");
-  allExpressionsWithMetadata.push_back(
-      std::make_pair(&objectsToPick, metadata));
+vector<const gd::Expression*> ForEachEvent::GetAllExpressions() const {
+  vector<const gd::Expression*> allExpressions;
+  allExpressions.push_back(&objectsToPick);
 
-  return allExpressionsWithMetadata;
+  return allExpressions;
 }
 
 void ForEachEvent::SerializeTo(SerializerElement& element) const {

Core/GDCore/Events/Builtin/ForEachEvent.h

@@ -50,13 +50,10 @@ class GD_CORE_API ForEachEvent : public gd::BaseEvent {
   virtual std::vector<const gd::InstructionsList*> GetAllConditionsVectors()
       const;
   virtual std::vector<const gd::InstructionsList*> GetAllActionsVectors() const;
-  virtual std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> >
-      GetAllExpressionsWithMetadata() const;
-
+  virtual std::vector<const gd::Expression*> GetAllExpressions() const;
   virtual std::vector<gd::InstructionsList*> GetAllConditionsVectors();
   virtual std::vector<gd::InstructionsList*> GetAllActionsVectors();
-  virtual std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> >
-      GetAllExpressionsWithMetadata();
+  virtual std::vector<gd::Expression*> GetAllExpressions();
 
   virtual void SerializeTo(SerializerElement& element) const;
   virtual void UnserializeFrom(gd::Project& project,

Core/GDCore/Events/Builtin/GroupEvent.cpp

@@ -19,14 +19,6 @@ namespace gd {
 GroupEvent::GroupEvent()
     : BaseEvent(), creationTime(0), colorR(74), colorG(176), colorB(228) {}
 
-vector<gd::String> GroupEvent::GetAllSearchableStrings() const {
-  vector<gd::String> allSearchableStrings;
-
-  allSearchableStrings.push_back(name);
-
-  return allSearchableStrings;
-}
-
 void GroupEvent::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("name", name);
   element.SetAttribute("source", source);

Core/GDCore/Events/Builtin/GroupEvent.h

@@ -106,8 +106,6 @@ class GD_CORE_API GroupEvent : public gd::BaseEvent {
   virtual const gd::EventsList& GetSubEvents() const { return events; };
   virtual gd::EventsList& GetSubEvents() { return events; };
 
-  virtual std::vector<gd::String> GetAllSearchableStrings() const;
-
   virtual void SerializeTo(SerializerElement& element) const;
   virtual void UnserializeFrom(gd::Project& project,
                                const SerializerElement& element);

Core/GDCore/Events/Builtin/RepeatEvent.cpp

@@ -5,6 +5,9 @@
  */
 
 #include "RepeatEvent.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
+#include "GDCore/Events/CodeGeneration/ExpressionsCodeGeneration.h"
 #include "GDCore/Events/Serialization.h"
 #include "GDCore/Serialization/SerializerElement.h"
 
@@ -31,15 +34,11 @@ vector<gd::InstructionsList*> RepeatEvent::GetAllActionsVectors() {
   return allActions;
 }
 
-vector<pair<gd::Expression*, gd::ParameterMetadata> >
-    RepeatEvent::GetAllExpressionsWithMetadata() {
-  vector<pair<gd::Expression*, gd::ParameterMetadata> >
-      allExpressionsWithMetadata;
-  auto metadata = gd::ParameterMetadata().SetType("expression");
-  allExpressionsWithMetadata.push_back(
-      std::make_pair(&repeatNumberExpression, metadata));
+vector<gd::Expression*> RepeatEvent::GetAllExpressions() {
+  vector<gd::Expression*> allExpressions;
+  allExpressions.push_back(&repeatNumberExpression);
 
-  return allExpressionsWithMetadata;
+  return allExpressions;
 }
 
 vector<const gd::InstructionsList*> RepeatEvent::GetAllConditionsVectors()
@@ -57,15 +56,11 @@ vector<const gd::InstructionsList*> RepeatEvent::GetAllActionsVectors() const {
   return allActions;
 }
 
-vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
-    RepeatEvent::GetAllExpressionsWithMetadata() const {
-  vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
-      allExpressionsWithMetadata;
-  auto metadata = gd::ParameterMetadata().SetType("expression");
-  allExpressionsWithMetadata.push_back(
-      std::make_pair(&repeatNumberExpression, metadata));
+vector<const gd::Expression*> RepeatEvent::GetAllExpressions() const {
+  vector<const gd::Expression*> allExpressions;
+  allExpressions.push_back(&repeatNumberExpression);
 
-  return allExpressionsWithMetadata;
+  return allExpressions;
 }
 
 void RepeatEvent::SerializeTo(SerializerElement& element) const {

Core/GDCore/Events/Builtin/RepeatEvent.h

@@ -45,14 +45,11 @@ class GD_CORE_API RepeatEvent : public gd::BaseEvent {
 
   virtual std::vector<gd::InstructionsList*> GetAllConditionsVectors();
   virtual std::vector<gd::InstructionsList*> GetAllActionsVectors();
-  virtual std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> >
-      GetAllExpressionsWithMetadata();
-
+  virtual std::vector<gd::Expression*> GetAllExpressions();
   virtual std::vector<const gd::InstructionsList*> GetAllConditionsVectors()
       const;
   virtual std::vector<const gd::InstructionsList*> GetAllActionsVectors() const;
-  virtual std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> >
-      GetAllExpressionsWithMetadata() const;
+  virtual std::vector<const gd::Expression*> GetAllExpressions() const;
 
   virtual void SerializeTo(SerializerElement& element) const;
   virtual void UnserializeFrom(gd::Project& project,

Core/GDCore/Events/Builtin/WhileEvent.cpp

@@ -6,6 +6,9 @@
 
 #if defined(GD_IDE_ONLY)
 #include "WhileEvent.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
+#include "GDCore/Events/CodeGeneration/ExpressionsCodeGeneration.h"
 #include "GDCore/Events/Serialization.h"
 #include "GDCore/Serialization/SerializerElement.h"
 

Core/GDCore/Events/CodeGeneration/EffectsCodeGenerator.cpp

@@ -1,58 +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 <iostream>
-#include "EffectsCodeGenerator.h"
-#include "GDCore/Extensions/Metadata/EffectMetadata.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Project/Effect.h"
-#include "GDCore/Project/Layer.h"
-#include "GDCore/Project/EffectsContainer.h"
-#include "GDCore/Project/Layout.h"
-#include "GDCore/Project/Project.h"
-
-namespace gd {
-
-void ExposeProjectEffects(
-    const gd::Project& project,
-    const std::function<void(const gd::Effect& effect)>& worker) {
-  // See also gd::Project::ExposeResources for a method that traverse the whole
-  // project (this time for resources) and
-  // WholeProjectRefactorer::ExposeProjectEvents.
-
-  // Add layouts effects
-  for (std::size_t s = 0; s < project.GetLayoutsCount(); s++) {
-    auto& layout = project.GetLayout(s);
-
-    for (std::size_t l = 0; l < layout.GetLayersCount(); ++l) {
-      auto& effects = layout.GetLayer(l).GetEffects();
-      for (std::size_t e = 0; e < effects.GetEffectsCount(); ++e) {
-        auto& effect = effects.GetEffect(e);
-        worker(effect);
-      }
-    }
-  }
-}
-
-void EffectsCodeGenerator::GenerateEffectsIncludeFiles(
-    const gd::Platform& platform,
-    const gd::Project& project,
-    std::set<gd::String>& includeFiles) {
-  ExposeProjectEffects(
-      project, [&platform, &includeFiles](const gd::Effect& effect) {
-        // TODO: this browse all the extensions every time we're trying to find
-        // a new effect. Might be a good idea to rework MetadataProvider to be
-        // faster (not sure if it is a bottleneck at all though - but could be
-        // for events code generation).
-        const gd::EffectMetadata& effectMetadata =
-            MetadataProvider::GetEffectMetadata(platform,
-                                                effect.GetEffectType());
-
-        for (auto& includeFile : effectMetadata.GetIncludeFiles())
-          includeFiles.insert(includeFile);
-      });
-}
-
-}  // namespace gd

Core/GDCore/Events/CodeGeneration/EffectsCodeGenerator.h

@@ -1,35 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#ifndef GDCORE_EffectsCodeGenerator_H
-#define GDCORE_EffectsCodeGenerator_H
-
-#include <set>
-#include <utility>
-#include <vector>
-#include "GDCore/String.h"
-namespace gd {
-class Project;
-class Platform;
-}  // namespace gd
-
-namespace gd {
-
-/**
- * \brief Internal class used to generate code from events
- */
-class GD_CORE_API EffectsCodeGenerator {
- public:
-  /**
-   * \brief Add all the include files required by the project effects.
-   */
-  static void GenerateEffectsIncludeFiles(const gd::Platform& platform,
-                                          const gd::Project& project,
-                                          std::set<gd::String>& includeFiles);
-};
-
-}  // namespace gd
-
-#endif  // GDCORE_EffectsCodeGenerator_H

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -1,11 +1,11 @@
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
-
 #include <algorithm>
 #include <utility>
-
 #include "GDCore/CommonTools.h"
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
 #include "GDCore/Events/CodeGeneration/ExpressionCodeGenerator.h"
+#include "GDCore/Events/CodeGeneration/ExpressionsCodeGeneration.h"
+#include "GDCore/Events/Parsers/ExpressionParser.h"
 #include "GDCore/Events/Tools/EventsCodeNameMangler.h"
 #include "GDCore/Extensions/Metadata/BehaviorMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
@@ -288,7 +288,7 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
     condition.SetParameters(parameters);
   }
 
-  // Verify that there are no mismatchs between object type in parameters.
+  // Verify that there are not mismatch between object type in parameters
   for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
     if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].type)) {
       gd::String objectInParameter =
@@ -312,69 +312,9 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
     }
   }
 
-  if (instrInfos.IsObjectInstruction()) {
-    gd::String objectName = condition.GetParameter(0).GetPlainString();
-    gd::String objectType = gd::GetTypeOfObject(
-        GetGlobalObjectsAndGroups(), GetObjectsAndGroups(), objectName);
-    if (!objectName.empty() && !instrInfos.parameters.empty()) {
-      std::vector<gd::String> realObjects =
-          ExpandObjectsName(objectName, context);
-      for (std::size_t i = 0; i < realObjects.size(); ++i) {
-        // Set up the context
-        const ObjectMetadata& objInfo =
-            MetadataProvider::GetObjectMetadata(platform, objectType);
-        AddIncludeFiles(objInfo.includeFiles);
-        context.SetCurrentObject(realObjects[i]);
-        context.ObjectsListNeeded(realObjects[i]);
-
-        // Prepare arguments and generate the condition whole code
-        vector<gd::String> arguments = GenerateParametersCodes(
-            condition.GetParameters(), instrInfos.parameters, context);
-        conditionCode += GenerateObjectCondition(realObjects[i],
-                                                 objInfo,
-                                                 arguments,
-                                                 instrInfos,
-                                                 returnBoolean,
-                                                 condition.IsInverted(),
-                                                 context);
-
-        context.SetNoCurrentObject();
-      }
-    }
-  } else if (instrInfos.IsBehaviorInstruction()) {
-    gd::String objectName = condition.GetParameter(0).GetPlainString();
-    gd::String behaviorType =
-        gd::GetTypeOfBehavior(GetGlobalObjectsAndGroups(),
-                              GetObjectsAndGroups(),
-                              condition.GetParameter(1).GetPlainString());
-    if (instrInfos.parameters.size() >= 2) {
-      std::vector<gd::String> realObjects =
-          ExpandObjectsName(objectName, context);
-      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]);
-
-        // Prepare arguments and generate the whole condition code
-        vector<gd::String> arguments = GenerateParametersCodes(
-            condition.GetParameters(), instrInfos.parameters, context);
-        conditionCode += GenerateBehaviorCondition(
-            realObjects[i],
-            condition.GetParameter(1).GetPlainString(),
-            autoInfo,
-            arguments,
-            instrInfos,
-            returnBoolean,
-            condition.IsInverted(),
-            context);
-
-        context.SetNoCurrentObject();
-      }
-    }
-  } else {
+  // Generate static condition if available
+  if (MetadataProvider::HasCondition(platform, condition.GetType())) {
+    // Prepare arguments
     std::vector<std::pair<gd::String, gd::String> >
         supplementaryParametersTypes;
     supplementaryParametersTypes.push_back(std::make_pair(
@@ -389,6 +329,78 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
         arguments, instrInfos, returnBoolean, condition.IsInverted(), context);
   }
 
+  // Generate object condition if available
+  gd::String objectName = condition.GetParameters().empty()
+                              ? ""
+                              : condition.GetParameter(0).GetPlainString();
+  gd::String objectType = gd::GetTypeOfObject(
+      GetGlobalObjectsAndGroups(), GetObjectsAndGroups(), objectName);
+  if (!objectName.empty() &&
+      MetadataProvider::HasObjectCondition(
+          platform, objectType, condition.GetType()) &&
+      !instrInfos.parameters.empty()) {
+    std::vector<gd::String> realObjects =
+        ExpandObjectsName(objectName, context);
+    for (std::size_t i = 0; i < realObjects.size(); ++i) {
+      // Set up the context
+      const ObjectMetadata& objInfo =
+          MetadataProvider::GetObjectMetadata(platform, objectType);
+      AddIncludeFiles(objInfo.includeFiles);
+      context.SetCurrentObject(realObjects[i]);
+      context.ObjectsListNeeded(realObjects[i]);
+
+      // Prepare arguments and generate the condition whole code
+      vector<gd::String> arguments = GenerateParametersCodes(
+          condition.GetParameters(), instrInfos.parameters, context);
+      conditionCode += GenerateObjectCondition(realObjects[i],
+                                               objInfo,
+                                               arguments,
+                                               instrInfos,
+                                               returnBoolean,
+                                               condition.IsInverted(),
+                                               context);
+
+      context.SetNoCurrentObject();
+    }
+  }
+
+  // Generate behavior condition if available
+  gd::String behaviorType =
+      gd::GetTypeOfBehavior(GetGlobalObjectsAndGroups(),
+                            GetObjectsAndGroups(),
+                            condition.GetParameters().size() < 2
+                                ? ""
+                                : condition.GetParameter(1).GetPlainString());
+  if (MetadataProvider::HasBehaviorCondition(
+          platform, behaviorType, condition.GetType()) &&
+      instrInfos.parameters.size() >= 2) {
+    std::vector<gd::String> realObjects =
+        ExpandObjectsName(objectName, context);
+    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]);
+
+      // Prepare arguments and generate the whole condition code
+      vector<gd::String> arguments = GenerateParametersCodes(
+          condition.GetParameters(), instrInfos.parameters, context);
+      conditionCode +=
+          GenerateBehaviorCondition(realObjects[i],
+                                    condition.GetParameter(1).GetPlainString(),
+                                    autoInfo,
+                                    arguments,
+                                    instrInfos,
+                                    returnBoolean,
+                                    condition.IsInverted(),
+                                    context);
+
+      context.SetNoCurrentObject();
+    }
+  }
+
   return conditionCode;
 }
 
@@ -405,6 +417,9 @@ gd::String EventsCodeGenerator::GenerateConditionsListCode(
         "condition" + gd::String::From(i) + "IsTrue", context);
 
   for (std::size_t cId = 0; cId < conditions.size(); ++cId) {
+    gd::InstructionMetadata instrInfos = MetadataProvider::GetConditionMetadata(
+        platform, conditions[cId].GetType());
+
     gd::String conditionCode =
         GenerateConditionCode(conditions[cId],
                               "condition" + gd::String::From(cId) + "IsTrue",
@@ -457,7 +472,7 @@ gd::String EventsCodeGenerator::GenerateActionCode(
     action.SetParameters(parameters);
   }
 
-  // Verify that there are no mismatchs between object type in parameters.
+  // Verify that there are not mismatch between object type in parameters
   for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
     if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].type)) {
       gd::String objectInParameter = action.GetParameter(pNb).GetPlainString();
@@ -480,69 +495,77 @@ gd::String EventsCodeGenerator::GenerateActionCode(
   }
 
   // Call free function first if available
-  if (instrInfos.IsObjectInstruction()) {
-    gd::String objectName = action.GetParameter(0).GetPlainString();
-    gd::String objectType = gd::GetTypeOfObject(
-        GetGlobalObjectsAndGroups(), GetObjectsAndGroups(), objectName);
-
-    if (!instrInfos.parameters.empty()) {
-      std::vector<gd::String> realObjects =
-          ExpandObjectsName(objectName, context);
-      for (std::size_t i = 0; i < realObjects.size(); ++i) {
-        // Setup context
-        const ObjectMetadata& objInfo =
-            MetadataProvider::GetObjectMetadata(platform, objectType);
-        AddIncludeFiles(objInfo.includeFiles);
-        context.SetCurrentObject(realObjects[i]);
-        context.ObjectsListNeeded(realObjects[i]);
-
-        // Prepare arguments and generate the whole action code
-        vector<gd::String> arguments = GenerateParametersCodes(
-            action.GetParameters(), instrInfos.parameters, context);
-        actionCode += GenerateObjectAction(
-            realObjects[i], objInfo, arguments, instrInfos, context);
-
-        context.SetNoCurrentObject();
-      }
-    }
-  } else if (instrInfos.IsBehaviorInstruction()) {
-    gd::String objectName = action.GetParameter(0).GetPlainString();
-    gd::String behaviorType =
-        gd::GetTypeOfBehavior(GetGlobalObjectsAndGroups(),
-                              GetObjectsAndGroups(),
-                              action.GetParameter(1).GetPlainString());
-
-    if (instrInfos.parameters.size() >= 2) {
-      std::vector<gd::String> realObjects =
-          ExpandObjectsName(objectName, context);
-      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]);
-
-        // Prepare arguments and generate the whole action code
-        vector<gd::String> arguments = GenerateParametersCodes(
-            action.GetParameters(), instrInfos.parameters, context);
-        actionCode +=
-            GenerateBehaviorAction(realObjects[i],
-                                   action.GetParameter(1).GetPlainString(),
-                                   autoInfo,
-                                   arguments,
-                                   instrInfos,
-                                   context);
-
-        context.SetNoCurrentObject();
-      }
-    }
-  } else {
+  if (MetadataProvider::HasAction(platform, action.GetType())) {
     vector<gd::String> arguments = GenerateParametersCodes(
         action.GetParameters(), instrInfos.parameters, context);
     actionCode += GenerateFreeAction(arguments, instrInfos, context);
   }
 
+  // Call object function if available
+  gd::String objectName = action.GetParameters().empty()
+                              ? ""
+                              : action.GetParameter(0).GetPlainString();
+  gd::String objectType = gd::GetTypeOfObject(
+      GetGlobalObjectsAndGroups(), GetObjectsAndGroups(), objectName);
+  if (MetadataProvider::HasObjectAction(
+          platform, objectType, action.GetType()) &&
+      !instrInfos.parameters.empty()) {
+    std::vector<gd::String> realObjects =
+        ExpandObjectsName(objectName, context);
+    for (std::size_t i = 0; i < realObjects.size(); ++i) {
+      // Setup context
+      const ObjectMetadata& objInfo =
+          MetadataProvider::GetObjectMetadata(platform, objectType);
+      AddIncludeFiles(objInfo.includeFiles);
+      context.SetCurrentObject(realObjects[i]);
+      context.ObjectsListNeeded(realObjects[i]);
+
+      // Prepare arguments and generate the whole action code
+      vector<gd::String> arguments = GenerateParametersCodes(
+          action.GetParameters(), instrInfos.parameters, context);
+      actionCode += GenerateObjectAction(
+          realObjects[i], objInfo, arguments, instrInfos, context);
+
+      context.SetNoCurrentObject();
+    }
+  }
+
+  // Assign to a behavior member function if found
+  gd::String behaviorType =
+      gd::GetTypeOfBehavior(GetGlobalObjectsAndGroups(),
+                            GetObjectsAndGroups(),
+                            action.GetParameters().size() < 2
+                                ? ""
+                                : action.GetParameter(1).GetPlainString());
+
+  if (MetadataProvider::HasBehaviorAction(
+          platform, behaviorType, action.GetType()) &&
+      instrInfos.parameters.size() >= 2) {
+    std::vector<gd::String> realObjects =
+        ExpandObjectsName(objectName, context);
+    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]);
+
+      // Prepare arguments and generate the whole action code
+      vector<gd::String> arguments = GenerateParametersCodes(
+          action.GetParameters(), instrInfos.parameters, context);
+      actionCode +=
+          GenerateBehaviorAction(realObjects[i],
+                                 action.GetParameter(1).GetPlainString(),
+                                 autoInfo,
+                                 arguments,
+                                 instrInfos,
+                                 context);
+
+      context.SetNoCurrentObject();
+    }
+  }
+
   return actionCode;
 }
 
@@ -553,6 +576,9 @@ gd::String EventsCodeGenerator::GenerateActionsListCode(
     gd::InstructionsList& actions, EventsCodeGenerationContext& context) {
   gd::String outputCode;
   for (std::size_t aId = 0; aId < actions.size(); ++aId) {
+    gd::InstructionMetadata instrInfos =
+        MetadataProvider::GetActionMetadata(platform, actions[aId].GetType());
+
     gd::String actionCode = GenerateActionCode(actions[aId], context);
 
     outputCode += "{";
@@ -604,7 +630,7 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
 
     argOutput = "\"" + argOutput + "\"";
   } else if (ParameterMetadata::IsBehavior(metadata.type)) {
-    argOutput = GenerateGetBehaviorNameCode(parameter);
+    argOutput = "\"" + ConvertToString(parameter) + "\"";
   } else if (metadata.type == "key") {
     argOutput = "\"" + ConvertToString(parameter) + "\"";
   } else if (metadata.type == "password" || metadata.type == "musicfile" ||
@@ -636,7 +662,7 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
     if (argOutput.empty()) {
       if (!metadata.type.empty())
         cout << "Warning: Unknown type of parameter \"" << metadata.type
-             << "\"." << std::endl;
+             << "\".";
       argOutput += "\"" + ConvertToString(parameter) + "\"";
     }
   }
@@ -1085,34 +1111,6 @@ gd::String EventsCodeGenerator::GenerateBehaviorAction(
   }
 }
 
-size_t EventsCodeGenerator::GenerateSingleUsageUniqueIdForEventsList() {
-  return eventsListNextUniqueId++;
-}
-
-size_t EventsCodeGenerator::GenerateSingleUsageUniqueIdFor(
-    const Instruction* instruction) {
-  if (!instruction) {
-    std::cout << "ERROR: During code generation, a null pointer was passed to "
-                 "GenerateSingleUsageUniqueIdFor."
-              << std::endl;
-  }
-
-  // Base the unique id on the adress in memory so that the same instruction
-  // in memory will get the same id across different code generations.
-  size_t uniqueId = (size_t)instruction;
-
-  // While in most case this function is called a single time for each
-  // instruction, it's possible for an instruction to be appearing more than
-  // once in the events, if we used links. In this case, simply increment the
-  // unique id to be sure that ids are effectively uniques, and stay stable
-  // (given the same order of links).
-  while (instructionUniqueIds.find(uniqueId) != instructionUniqueIds.end()) {
-    uniqueId++;
-  }
-  instructionUniqueIds.insert(uniqueId);
-  return uniqueId;
-}
-
 gd::String EventsCodeGenerator::GetObjectListName(
     const gd::String& name, const gd::EventsCodeGenerationContext& context) {
   return ManObjListName(name);
@@ -1141,8 +1139,7 @@ EventsCodeGenerator::EventsCodeGenerator(gd::Project& project_,
       errorOccurred(false),
       compilationForRuntime(false),
       maxCustomConditionsDepth(0),
-      maxConditionsListsSize(0),
-      eventsListNextUniqueId(0){};
+      maxConditionsListsSize(0){};
 
 EventsCodeGenerator::EventsCodeGenerator(
     const gd::Platform& platform_,
@@ -1157,7 +1154,6 @@ EventsCodeGenerator::EventsCodeGenerator(
       errorOccurred(false),
       compilationForRuntime(false),
       maxCustomConditionsDepth(0),
-      maxConditionsListsSize(0),
-      eventsListNextUniqueId(0){};
+      maxConditionsListsSize(0){};
 
 }  // namespace gd

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h

@@ -9,7 +9,6 @@
 #include <set>
 #include <utility>
 #include <vector>
-
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/String.h"
@@ -36,6 +35,10 @@ namespace gd {
  * \brief Internal class used to generate code from events
  */
 class GD_CORE_API EventsCodeGenerator {
+  // Compatiblity with old ExpressionParser
+  friend class CallbacksForGeneratingExpressionCode;
+  friend class VariableCodeGenerationCallbacks;
+  // end of compatibility code
   friend class ExpressionCodeGenerator;
 
  public:
@@ -124,7 +127,7 @@ class GD_CORE_API EventsCodeGenerator {
    *
    */
   std::vector<gd::String> GenerateParametersCodes(
-      const std::vector<gd::Expression>& parameters,
+      const std::vector<gd::Expression> & parameters,
       const std::vector<gd::ParameterMetadata>& parametersInfo,
       EventsCodeGenerationContext& context,
       std::vector<std::pair<gd::String, gd::String> >*
@@ -322,7 +325,7 @@ class GD_CORE_API EventsCodeGenerator {
    * group.
    *
    * Get a list containing the "real" objects name when the events refers to \a
-   * objectName :<br> If \a objectName is really an object, the list will only
+   * objectName :<br> If \a objectName if really an object, the list will only
    * contains \a objectName unchanged.<br> If \a objectName is a group, the list
    * will contains all the objects of the group.<br> If \a objectName is the
    * "current" object in the context ( i.e: The object being used for launching
@@ -412,29 +415,6 @@ class GD_CORE_API EventsCodeGenerator {
 
   enum VariableScope { LAYOUT_VARIABLE = 0, PROJECT_VARIABLE, OBJECT_VARIABLE };
 
-  /**
-   * Generate a single unique number for the specified instruction.
-   *
-   * This is useful for instructions that need to identify themselves in the
-   * generated code like the "Trigger Once" conditions. The id is stable across
-   * code generations if the instructions are the same objects in memory.
-   *
-   * Note that if this function is called multiple times with the same
-   * instruction, the unique number returned will be *different*. This is
-   * because a single instruction might appear at multiple places in events due
-   * to the usage of links.
-   */
-  size_t GenerateSingleUsageUniqueIdFor(const gd::Instruction* instruction);
-
-  /**
-   * Generate a single unique number for an events list.
-   *
-   * This is useful to create unique function names for events list, that are
-   * stable across code generation given the exact same list of events. They are
-   * *not* stable if events are moved/reorganized.
-   */
-  size_t GenerateSingleUsageUniqueIdForEventsList();
-
  protected:
   /**
    * \brief Generate the code for a single parameter.
@@ -728,8 +708,7 @@ class GD_CORE_API EventsCodeGenerator {
   /**
    * Generate the getter to get the name of the specified behavior.
    */
-  virtual gd::String GenerateGetBehaviorNameCode(
-      const gd::String& behaviorName);
+  virtual gd::String GenerateGetBehaviorNameCode(const gd::String& behaviorName);
 
   const gd::Platform& platform;  ///< The platform being used.
 
@@ -757,11 +736,6 @@ class GD_CORE_API EventsCodeGenerator {
   size_t maxCustomConditionsDepth;  ///< The maximum depth value for all the
                                     ///< custom conditions created.
   size_t maxConditionsListsSize;  ///< The maximum size of a list of conditions.
-
-  std::set<size_t>
-      instructionUniqueIds;  ///< The unique ids generated for instructions.
-  size_t eventsListNextUniqueId;  ///< The next identifier to use for an events
-                                  ///< list function name.
 };
 
 }  // namespace gd

Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.cpp

@@ -4,10 +4,8 @@
  * reserved. This project is released under the MIT License.
  */
 #include "ExpressionCodeGenerator.h"
-
 #include <memory>
 #include <vector>
-
 #include "GDCore/CommonTools.h"
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
@@ -26,29 +24,125 @@
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Project.h"
 
+// Compatibility with old ExpressionParser
+#include "GDCore/Events/CodeGeneration/ExpressionsCodeGeneration.h"
+#include "GDCore/Events/CodeGeneration/VariableParserCallbacks.h"
+#include "GDCore/Events/Parsers/ExpressionParser.h"
+#include "GDCore/Events/Parsers/VariableParser.h"
+// end of compatibility code
+
 namespace gd {
 
+bool ExpressionCodeGenerator::useOldExpressionParser = false;
+
 gd::String ExpressionCodeGenerator::GenerateExpressionCode(
     EventsCodeGenerator& codeGenerator,
     EventsCodeGenerationContext& context,
     const gd::String& type,
     const gd::String& expression,
     const gd::String& objectName) {
+  // Compatibility with old ExpressionParser
+  if (useOldExpressionParser) {
+    if (type == "number") {
+      gd::String code = "";
+      gd::CallbacksForGeneratingExpressionCode callbacks(
+          code, codeGenerator, context);
+      gd::ExpressionParser parser(expression);
+      if (!parser.ParseMathExpression(codeGenerator.GetPlatform(),
+                                      codeGenerator.GetGlobalObjectsAndGroups(),
+                                      codeGenerator.GetObjectsAndGroups(),
+                                      callbacks) ||
+          code.empty()) {
+        std::cout << "Error (old ExpressionParser): \""
+                  << parser.GetFirstError() << "\" in: \"" << expression
+                  << "\" (number)" << std::endl;
+        code = "0";
+      }
+
+      return code;
+    } else if (type == "string") {
+      gd::String code = "";
+      gd::CallbacksForGeneratingExpressionCode callbacks(
+          code, codeGenerator, context);
+      gd::ExpressionParser parser(expression);
+      if (!parser.ParseStringExpression(
+              codeGenerator.GetPlatform(),
+              codeGenerator.GetGlobalObjectsAndGroups(),
+              codeGenerator.GetObjectsAndGroups(),
+              callbacks) ||
+          code.empty()) {
+        std::cout << "Error (old ExpressionParser): \""
+                  << parser.GetFirstError() << "\" in: \"" << expression
+                  << "\" (string)" << std::endl;
+        code = "\"\"";
+      }
+
+      return code;
+    } else if (type == "scenevar") {
+      gd::String code = "";
+      gd::VariableCodeGenerationCallbacks callbacks(
+          code,
+          codeGenerator,
+          context,
+          gd::EventsCodeGenerator::LAYOUT_VARIABLE);
+
+      gd::VariableParser parser(expression);
+      if (!parser.Parse(callbacks)) {
+        std::cout << "Error (old VariableParser) :" << parser.GetFirstError()
+                  << " in: " << expression << std::endl;
+        code = codeGenerator.GenerateBadVariable();
+      }
+      return code;
+    } else if (type == "globalvar") {
+      gd::String code = "";
+      gd::VariableCodeGenerationCallbacks callbacks(
+          code,
+          codeGenerator,
+          context,
+          gd::EventsCodeGenerator::PROJECT_VARIABLE);
+
+      gd::VariableParser parser(expression);
+      if (!parser.Parse(callbacks)) {
+        std::cout << "Error (old VariableParser) :" << parser.GetFirstError()
+                  << " in: " << expression << std::endl;
+        code = codeGenerator.GenerateBadVariable();
+      }
+      return code;
+    } else if (type == "objectvar") {
+      gd::String code = "";
+
+      // Object is either the object of the previous parameter or, if it is
+      // empty, the object being picked by the instruction.
+      gd::String object =
+          objectName.empty() ? context.GetCurrentObject() : objectName;
+
+      gd::VariableCodeGenerationCallbacks callbacks(
+          code, codeGenerator, context, object);
+
+      gd::VariableParser parser(expression);
+      if (!parser.Parse(callbacks)) {
+        std::cout << "Error (old VariableParser) :" << parser.GetFirstError()
+                  << " in: " << expression << std::endl;
+        code = codeGenerator.GenerateBadVariable();
+      }
+      return code;
+    }
+
+    std::cout << "Type error (old ExpressionParser): type \"" << type
+              << "\" is not supported" << std::endl;
+    return "/* Error during code generation: type " + type +
+           " is not supported for old ExpressionParser. */ 0";
+  }
+  // end of compatibility code
+
   gd::ExpressionParser2 parser(codeGenerator.GetPlatform(),
                                codeGenerator.GetGlobalObjectsAndGroups(),
                                codeGenerator.GetObjectsAndGroups());
-  ExpressionCodeGenerator generator(codeGenerator, context);
-
   auto node = parser.ParseExpression(type, expression, objectName);
-  if (!node) {
-    std::cout << "Error: error while parsing: \"" << expression << "\" ("
-              << type << ")" << std::endl;
-
-    return generator.GenerateDefaultValue(type);
-  }
-
   gd::ExpressionValidator validator;
   node->Visit(validator);
+
+  ExpressionCodeGenerator generator(codeGenerator, context);
   if (!validator.GetErrors().empty()) {
     std::cout << "Error: \"" << validator.GetErrors()[0]->GetMessage()
               << "\" in: \"" << expression << "\" (" << type << ")"
@@ -136,11 +230,11 @@ void ExpressionCodeGenerator::OnVisitIdentifierNode(IdentifierNode& node) {
   }
 }
 
-void ExpressionCodeGenerator::OnVisitFunctionCallNode(FunctionCallNode& node) {
+void ExpressionCodeGenerator::OnVisitFunctionNode(FunctionNode& node) {
   if (gd::MetadataProvider::IsBadExpressionMetadata(node.expressionMetadata)) {
     output += "/* Error during generation, function not found: " +
-              codeGenerator.ConvertToString(node.functionName) + " */ " +
-              GenerateDefaultValue(node.type);
+              codeGenerator.ConvertToString(node.functionName) + " for type " +
+              node.type + " */ " + GenerateDefaultValue(node.type);
     return;
   }
 
@@ -360,20 +454,12 @@ gd::String ExpressionCodeGenerator::GenerateDefaultValue(
   if (gd::ParameterMetadata::IsObject(type)) {
     return codeGenerator.GenerateBadObject();
   }
-  if (gd::ParameterMetadata::IsExpression("string", type)) {
-    return "\"\"";
-  }
 
-  return "0";
+  return (type == "string") ? "\"\"" : "0";
 }
 
 void ExpressionCodeGenerator::OnVisitEmptyNode(EmptyNode& node) {
   output += GenerateDefaultValue(node.type);
 }
 
-void ExpressionCodeGenerator::OnVisitObjectFunctionNameNode(
-    ObjectFunctionNameNode& node) {
-  output += GenerateDefaultValue(node.type);
-}
-
 }  // namespace gd

Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.h

@@ -60,6 +60,11 @@ class GD_CORE_API ExpressionCodeGenerator : public ExpressionParser2NodeWorker {
                                            const gd::String& expression,
                                            const gd::String& objectName = "");
 
+  static void UseOldExpressionParser(bool enable) {
+    useOldExpressionParser = enable;
+  };
+  static bool IsUsingOldExpressionParser() { return useOldExpressionParser; };
+
   const gd::String& GetOutput() { return output; };
 
  protected:
@@ -73,8 +78,7 @@ class GD_CORE_API ExpressionCodeGenerator : public ExpressionParser2NodeWorker {
   void OnVisitVariableBracketAccessorNode(
       VariableBracketAccessorNode& node) override;
   void OnVisitIdentifierNode(IdentifierNode& node) override;
-  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override;
-  void OnVisitFunctionCallNode(FunctionCallNode& node) override;
+  void OnVisitFunctionNode(FunctionNode& node) override;
   void OnVisitEmptyNode(EmptyNode& node) override;
 
  private:
@@ -103,9 +107,11 @@ class GD_CORE_API ExpressionCodeGenerator : public ExpressionParser2NodeWorker {
   gd::String output;
   EventsCodeGenerator& codeGenerator;
   EventsCodeGenerationContext& context;
+
+  static bool useOldExpressionParser;
 };
 
 }  // namespace gd
 
 #endif  // GDCORE_ExpressionCodeGenerator_H
-#endif
+#endif

Core/GDCore/Events/CodeGeneration/ExpressionsCodeGeneration.cpp

@@ -0,0 +1,229 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "ExpressionsCodeGeneration.h"
+#include "GDCore/CommonTools.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
+#include "GDCore/Events/Parsers/ExpressionParser.h"
+#include "GDCore/Events/Tools/EventsCodeNameMangler.h"
+#include "GDCore/Extensions/Metadata/BehaviorMetadata.h"
+#include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/Metadata/ObjectMetadata.h"
+#include "GDCore/Extensions/Platform.h"
+#include "GDCore/Extensions/PlatformExtension.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
+
+using namespace std;
+
+namespace gd {
+
+CallbacksForGeneratingExpressionCode::CallbacksForGeneratingExpressionCode(
+    gd::String& plainExpression_,
+    EventsCodeGenerator& codeGenerator_,
+    EventsCodeGenerationContext& context_)
+    : plainExpression(plainExpression_),
+      codeGenerator(codeGenerator_),
+      context(context_) {}
+
+void CallbacksForGeneratingExpressionCode::OnConstantToken(gd::String text) {
+  plainExpression += text;
+};
+
+void CallbacksForGeneratingExpressionCode::OnStaticFunction(
+    gd::String functionName,
+    const std::vector<gd::Expression>& parameters,
+    const gd::ExpressionMetadata& expressionInfo) {
+  codeGenerator.AddIncludeFiles(
+      expressionInfo.codeExtraInformation.GetIncludeFiles());
+
+  // Launch custom code generator if needed
+  if (expressionInfo.codeExtraInformation.HasCustomCodeGenerator()) {
+    plainExpression += expressionInfo.codeExtraInformation.customCodeGenerator(
+        parameters, codeGenerator, context);
+    return;
+  }
+
+  // Special case: For strings expressions, function without name is a string.
+  if (GetReturnType() == "string" && functionName.empty()) {
+    if (parameters.empty()) return;
+    plainExpression +=
+        codeGenerator.ConvertToStringExplicit(parameters[0].GetPlainString());
+
+    return;
+  }
+
+  // Prepare parameters
+  std::vector<gd::String> parametersCode =
+      codeGenerator.GenerateParametersCodes(
+          parameters, expressionInfo.parameters, context);
+  gd::String parametersStr;
+  for (std::size_t i = 0; i < parametersCode.size(); ++i) {
+    if (i != 0) parametersStr += ", ";
+    parametersStr += parametersCode[i];
+  }
+
+  plainExpression += expressionInfo.codeExtraInformation.functionCallName +
+                     "(" + parametersStr + ")";
+};
+
+void CallbacksForGeneratingExpressionCode::OnObjectFunction(
+    gd::String functionName,
+    const std::vector<gd::Expression>& parameters,
+    const gd::ExpressionMetadata& expressionInfo) {
+  const gd::ObjectsContainer& globalObjectsAndGroups = codeGenerator.GetGlobalObjectsAndGroups();
+  const gd::ObjectsContainer& objectsAndGroups = codeGenerator.GetObjectsAndGroups();
+
+  codeGenerator.AddIncludeFiles(
+      expressionInfo.codeExtraInformation.GetIncludeFiles());
+  if (parameters.empty()) return;
+
+  // Launch custom code generator if needed
+  if (expressionInfo.codeExtraInformation.HasCustomCodeGenerator()) {
+    plainExpression += expressionInfo.codeExtraInformation.customCodeGenerator(
+        parameters, codeGenerator, context);
+    return;
+  }
+
+  // Prepare parameters
+  std::vector<gd::String> parametersCode =
+      codeGenerator.GenerateParametersCodes(
+          parameters, expressionInfo.parameters, context);
+  gd::String parametersStr;
+  for (std::size_t i = 1; i < parametersCode.size(); ++i) {
+    if (i != 1) parametersStr += ", ";
+    parametersStr += parametersCode[i];
+  }
+
+  gd::String output = GetReturnType() == "string" ? "\"\"" : "0";
+
+  // Get object(s) concerned by function call
+  std::vector<gd::String> realObjects =
+      codeGenerator.ExpandObjectsName(parameters[0].GetPlainString(), context);
+  for (std::size_t i = 0; i < realObjects.size(); ++i) {
+    context.ObjectsListNeeded(realObjects[i]);
+
+    gd::String objectType = gd::GetTypeOfObject(globalObjectsAndGroups, objectsAndGroups, realObjects[i]);
+    const ObjectMetadata& objInfo = MetadataProvider::GetObjectMetadata(
+        codeGenerator.GetPlatform(), objectType);
+
+    // Build gd::String to access the object
+    codeGenerator.AddIncludeFiles(objInfo.includeFiles);
+    output = codeGenerator.GenerateObjectFunctionCall(
+        realObjects[i],
+        objInfo,
+        expressionInfo.codeExtraInformation,
+        parametersStr,
+        output,
+        context);
+  }
+
+  plainExpression += output;
+};
+
+void CallbacksForGeneratingExpressionCode::OnObjectBehaviorFunction(
+    gd::String functionName,
+    const std::vector<gd::Expression>& parameters,
+    const gd::ExpressionMetadata& expressionInfo) {
+  const gd::ObjectsContainer& globalObjectsAndGroups = codeGenerator.GetGlobalObjectsAndGroups();
+  const gd::ObjectsContainer& objectsAndGroups = codeGenerator.GetObjectsAndGroups();
+
+  codeGenerator.AddIncludeFiles(
+      expressionInfo.codeExtraInformation.GetIncludeFiles());
+  if (parameters.size() < 2) return;
+
+  // Launch custom code generator if needed
+  if (expressionInfo.codeExtraInformation.HasCustomCodeGenerator()) {
+    plainExpression += expressionInfo.codeExtraInformation.customCodeGenerator(
+        parameters, codeGenerator, context);
+    return;
+  }
+
+  // Prepare parameters
+  std::vector<gd::String> parametersCode =
+      codeGenerator.GenerateParametersCodes(
+          parameters, expressionInfo.parameters, context);
+  gd::String parametersStr;
+  for (std::size_t i = 2; i < parametersCode.size(); ++i) {
+    if (i != 2) parametersStr += ", ";
+    parametersStr += parametersCode[i];
+  }
+
+  // Get object(s) concerned by function call
+  std::vector<gd::String> realObjects =
+      codeGenerator.ExpandObjectsName(parameters[0].GetPlainString(), context);
+
+  gd::String output = GetReturnType() == "string" ? "\"\"" : "0";
+  for (std::size_t i = 0; i < realObjects.size(); ++i) {
+    context.ObjectsListNeeded(realObjects[i]);
+
+    // Cast the object if needed
+    gd::String behaviorType =
+        gd::GetTypeOfBehavior(globalObjectsAndGroups, objectsAndGroups, parameters[1].GetPlainString());
+    const BehaviorMetadata& autoInfo = MetadataProvider::GetBehaviorMetadata(
+        codeGenerator.GetPlatform(), behaviorType);
+
+    // Build gd::String to access the behavior
+    codeGenerator.AddIncludeFiles(autoInfo.includeFiles);
+    output = codeGenerator.GenerateObjectBehaviorFunctionCall(
+        realObjects[i],
+        parameters[1].GetPlainString(),
+        autoInfo,
+        expressionInfo.codeExtraInformation,
+        parametersStr,
+        output,
+        context);
+  }
+
+  plainExpression += output;
+};
+
+bool CallbacksForGeneratingExpressionCode::OnSubMathExpression(
+    const gd::Platform& platform,
+    const gd::ObjectsContainer& globalObjectsAndGroups,
+    const gd::ObjectsContainer& objectsAndGroups,
+    gd::Expression& expression) {
+  gd::String newExpression;
+
+  CallbacksForGeneratingExpressionCode callbacks(
+      newExpression, codeGenerator, context);
+
+  gd::ExpressionParser parser(expression.GetPlainString());
+  if (!parser.ParseMathExpression(platform, globalObjectsAndGroups, objectsAndGroups, callbacks)) {
+#if defined(GD_IDE_ONLY)
+    firstErrorStr = callbacks.GetFirstError();
+    firstErrorPos = callbacks.GetFirstErrorPosition();
+#endif
+    return false;
+  }
+
+  return true;
+}
+
+bool CallbacksForGeneratingExpressionCode::OnSubTextExpression(
+    const gd::Platform& platform,
+    const gd::ObjectsContainer& globalObjectsAndGroups,
+    const gd::ObjectsContainer& objectsAndGroups,
+    gd::Expression& expression) {
+  gd::String newExpression;
+
+  CallbacksForGeneratingExpressionCode callbacks(
+      newExpression, codeGenerator, context);
+
+  gd::ExpressionParser parser(expression.GetPlainString());
+  if (!parser.ParseStringExpression(platform, globalObjectsAndGroups, objectsAndGroups, callbacks)) {
+#if defined(GD_IDE_ONLY)
+    firstErrorStr = callbacks.GetFirstError();
+    firstErrorPos = callbacks.GetFirstErrorPosition();
+#endif
+    return false;
+  }
+
+  return true;
+}
+
+}  // namespace gd

Core/GDCore/Events/CodeGeneration/ExpressionsCodeGeneration.h

@@ -0,0 +1,77 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef EXPRESSIONSCODEGENERATION_H
+#define EXPRESSIONSCODEGENERATION_H
+
+#include <vector>
+#include "GDCore/Events/Parsers/ExpressionParser.h"
+#include "GDCore/String.h"
+namespace gd {
+class ExpressionMetadata;
+class Expression;
+class Project;
+class Layout;
+class Layout;
+class EventsCodeGenerationContext;
+class EventsCodeGenerator;
+}
+
+namespace gd {
+
+// TODO: Replace and remove (ExpressionCodeGenerator)
+
+/**
+ * \brief Used to generate code from expressions.
+ *
+ * Usage example :
+ * \code
+ *   gd::String expressionOutputCppCode;
+ *
+ *   CallbacksForGeneratingExpressionCode callbacks(expressionOutputCppCode,
+ * codeGenerator, context); gd::ExpressionParser
+ * parser(theOriginalGameDevelopExpression);
+ *   parser.ParseStringExpression(platform, project, scene, callbacks);
+ *
+ *   if (expressionOutputCppCode.empty()) expressionOutputCppCode = "\"\""; //If
+ * generation failed, we make sure output code is not empty. \endcode \see
+ * EventsCodeGenerator
+ */
+class GD_CORE_API CallbacksForGeneratingExpressionCode
+    : public gd::ParserCallbacks {
+ public:
+  CallbacksForGeneratingExpressionCode(gd::String& output,
+                                       EventsCodeGenerator& codeGenerator_,
+                                       EventsCodeGenerationContext& context_);
+  virtual ~CallbacksForGeneratingExpressionCode(){};
+
+  void OnConstantToken(gd::String text);
+  void OnStaticFunction(gd::String functionName,
+                        const std::vector<gd::Expression>& parameters,
+                        const gd::ExpressionMetadata& expressionInfo);
+  void OnObjectFunction(gd::String functionName,
+                        const std::vector<gd::Expression>& parameters,
+                        const gd::ExpressionMetadata& expressionInfo);
+  void OnObjectBehaviorFunction(gd::String functionName,
+                                const std::vector<gd::Expression>& parameters,
+                                const gd::ExpressionMetadata& expressionInfo);
+  bool OnSubMathExpression(const gd::Platform& platform,
+                           const gd::ObjectsContainer& project,
+                           const gd::ObjectsContainer& layout,
+                           gd::Expression& expression);
+  bool OnSubTextExpression(const gd::Platform& platform,
+                           const gd::ObjectsContainer& project,
+                           const gd::ObjectsContainer& layout,
+                           gd::Expression& expression);
+
+ private:
+  gd::String& plainExpression;
+  EventsCodeGenerator& codeGenerator;
+  EventsCodeGenerationContext& context;
+};
+
+}  // namespace gd
+
+#endif  // EXPRESSIONSCODEGENERATION_H

Core/GDCore/Events/CodeGeneration/VariableParserCallbacks.cpp

@@ -0,0 +1,68 @@
+/*
+ * GDevelop C++ Platform
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#if defined(GD_IDE_ONLY)
+#include "VariableParserCallbacks.h"
+#include <string>
+#include <vector>
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
+#include "GDCore/Events/CodeGeneration/ExpressionCodeGenerator.h"
+#include "GDCore/Events/Parsers/VariableParser.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/Metadata/ObjectMetadata.h"
+#include "GDCore/Extensions/Platform.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/Project.h"
+
+using namespace std;
+
+namespace gd {
+
+VariableCodeGenerationCallbacks::VariableCodeGenerationCallbacks(
+    gd::String& output_,
+    gd::EventsCodeGenerator& codeGenerator_,
+    gd::EventsCodeGenerationContext& context_,
+    const gd::EventsCodeGenerator::VariableScope& scope_)
+    : output(output_),
+      codeGenerator(codeGenerator_),
+      context(context_),
+      scope(scope_) {
+  if (scope == gd::EventsCodeGenerator::OBJECT_VARIABLE) {
+    std::cout << "ERROR: Initializing VariableCodeGenerationCallbacks with "
+                 "OBJECT_VARIABLE without object.";
+  }
+}
+
+VariableCodeGenerationCallbacks::VariableCodeGenerationCallbacks(
+    gd::String& output_,
+    gd::EventsCodeGenerator& codeGenerator_,
+    gd::EventsCodeGenerationContext& context_,
+    const gd::String& object_)
+    : output(output_),
+      codeGenerator(codeGenerator_),
+      context(context_),
+      scope(gd::EventsCodeGenerator::OBJECT_VARIABLE),
+      object(object_) {}
+
+void VariableCodeGenerationCallbacks::OnRootVariable(gd::String variableName) {
+  output += codeGenerator.GenerateGetVariable(variableName, scope, context, object);
+}
+
+void VariableCodeGenerationCallbacks::OnChildVariable(gd::String variableName) {
+  output += codeGenerator.GenerateVariableAccessor(variableName);
+}
+
+void VariableCodeGenerationCallbacks::OnChildSubscript(
+    gd::String stringExpression) {
+  gd::String argumentCode = gd::ExpressionCodeGenerator::GenerateExpressionCode(
+      codeGenerator, context, "string", stringExpression);
+
+  output += codeGenerator.GenerateVariableBracketAccessor(argumentCode);
+}
+
+}
+#endif

Core/GDCore/Events/CodeGeneration/VariableParserCallbacks.h

@@ -0,0 +1,97 @@
+/*
+ * GDevelop C++ Platform
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#if defined(GD_IDE_ONLY)
+#ifndef VARIABLEPARSERCALLBACKS_H
+#define VARIABLEPARSERCALLBACKS_H
+
+#include <string>
+#include <vector>
+#include "GDCore/Events/Parsers/VariableParser.h"
+#include "GDCore/String.h"
+#include "EventsCodeGenerator.h"
+namespace gd {
+class EventsCodeGenerationContext;
+}  // namespace gd
+
+// TODO: Replace and remove (ExpressionCodeGenerator)
+namespace gd {
+
+/**
+ * \brief Callbacks called to generate the code for getting a variable.
+ *
+ * Usage example:
+ \code
+    VariableCodeGenerationCallbacks callbacks(output, eventsCodeGenerator,
+ context, VariableCodeGenerationCallbacks::LAYOUT_VARIABLE);
+
+    gd::VariableParser parser(parameter);
+    if ( !parser.Parse(callbacks) )
+    {
+        //Error during parsing the variable name:
+        output = "runtimeContext->GetSceneVariables().GetBadVariable()";
+    }
+
+    //"output" now contains the C++ code to return the variable.
+ \endcode
+ */
+class VariableCodeGenerationCallbacks : public gd::VariableParserCallbacks {
+ public:
+  /**
+   * \brief Default constructor for generating code for a layout/global
+   * variable. \param output The string in which the code will be generated.
+   * \param codeGenerator The code generator being used.
+   * \param context The current code generation context.
+   * \param scope The scope of the variable being accessed: LAYOUT_VARIABLE,
+   * PROJECT_VARIABLE.
+   */
+  VariableCodeGenerationCallbacks(gd::String& output,
+                                  gd::EventsCodeGenerator& codeGenerator_,
+                                  gd::EventsCodeGenerationContext& context_,
+                                  const gd::EventsCodeGenerator::VariableScope& scope_);
+  /**
+
+   * \brief Default constructor for generating code for an object variable.
+   * \param output The string in which the code will be generated.
+   * \param codeGenerator The code generator being used.
+   * \param context The current code generation context.
+   * \param object The name of the object
+   */
+  VariableCodeGenerationCallbacks(gd::String& output,
+                                  gd::EventsCodeGenerator& codeGenerator_,
+                                  gd::EventsCodeGenerationContext& context_,
+                                  const gd::String& object);
+
+  /**
+   * \brief Called when the first variable has been parsed.
+   * \param variableName The variable name.
+   */
+  virtual void OnRootVariable(gd::String variableName);
+
+  /**
+   * \brief Called when accessing the child of a structure variable.
+   * \param variableName The child variable name.
+   */
+  virtual void OnChildVariable(gd::String variableName);
+
+  /**
+   * \brief Called when accessing the child of a structure variable using a
+   * string expression in square brackets. \param variableName The expression
+   * used to access the child variable.
+   */
+  virtual void OnChildSubscript(gd::String stringExpression);
+
+ private:
+  gd::String& output;
+  gd::EventsCodeGenerator& codeGenerator;
+  gd::EventsCodeGenerationContext& context;
+  gd::EventsCodeGenerator::VariableScope scope;
+  const gd::String object;  ///< The object name, when scope == OBJECT_VARIABLE.
+};
+
+}
+
+#endif  // VARIABLEPARSERCALLBACKS_H
+#endif

Core/GDCore/Events/Event.h

@@ -12,7 +12,6 @@
 #include <vector>
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/Events/InstructionsList.h"
-#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/String.h"
 namespace gd {
 class EventsList;
@@ -91,8 +90,8 @@ class GD_CORE_API BaseEvent {
   bool HasSubEvents() const;
 
   /**
-   * \brief Return a list of all conditions of the event.
-   * \note Used to preprocess or search in the conditions.
+   * Event must be able to return all conditions std::vector they have.
+   * Used to preprocess the conditions.
    */
   virtual std::vector<gd::InstructionsList*> GetAllConditionsVectors() {
     std::vector<gd::InstructionsList*> noConditions;
@@ -105,8 +104,8 @@ class GD_CORE_API BaseEvent {
   };
 
   /**
-   * \brief Return a list of all actions of the event.
-   * \note Used to preprocess or search in the actions.
+   * Event must be able to return all actions std::vector they have.
+   * Used to preprocess the actions.
    */
   virtual std::vector<gd::InstructionsList*> GetAllActionsVectors() {
     std::vector<gd::InstructionsList*> noActions;
@@ -119,26 +118,15 @@ class GD_CORE_API BaseEvent {
   };
 
   /**
-   * \brief Return a list of all strings of the event.
-   * \note Used to preprocess or search in the event strings.
+   * Event must be able to return all expressions they have.
+   * Used to preprocess the expressions.
    */
-  virtual std::vector<gd::String> GetAllSearchableStrings() const {
-    std::vector<gd::String> noSearchableStrings;
-    return noSearchableStrings;
-  };
-
-  /**
-   * \brief Return a list of all expressions of the event, each with their associated metadata.
-   * \note Used to preprocess or search in the expressions of the event.
-   */
-  virtual std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> >
-      GetAllExpressionsWithMetadata() {
-    std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> > noExpr;
+  virtual std::vector<gd::Expression*> GetAllExpressions() {
+    std::vector<gd::Expression*> noExpr;
     return noExpr;
   };
-  virtual std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> >
-      GetAllExpressionsWithMetadata() const {
-    std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> > noExpr;
+  virtual std::vector<const gd::Expression*> GetAllExpressions() const {
+    std::vector<const gd::Expression*> noExpr;
     return noExpr;
   };
 

Core/GDCore/Events/EventsList.cpp

@@ -99,23 +99,6 @@ bool EventsList::Contains(const gd::BaseEvent& eventToSearch,
   return false;
 }
 
-bool EventsList::MoveEventToAnotherEventsList(const gd::BaseEvent& eventToMove,
-                                  gd::EventsList& newEventsList,
-                                  std::size_t newPosition) {
-
-  for (std::size_t i = 0; i < GetEventsCount(); ++i) {
-    if (events[i].get() == &eventToMove) {
-      std::shared_ptr<BaseEvent> event = events[i];
-      events.erase(events.begin() + i);
-
-      newEventsList.InsertEvent(event, newPosition);
-      return true;
-    }
-  }
-
-  return false;
-}
-
 EventsList::EventsList(const EventsList& other) { Init(other); }
 
 EventsList& EventsList::operator=(const EventsList& other) {

Core/GDCore/Events/EventsList.h

@@ -52,8 +52,7 @@ class GD_CORE_API EventsList {
    * \brief Insert the specified event to the list.
    * \note The event passed by parameter is not copied.
    * \param event The smart pointer to the event that must be inserted into the
-   * list
-   * \param position Insertion position. If the position is invalid, the
+   * list \param position Insertion position. If the position is invalid, the
    * object is inserted at the end of the objects list.
    */
   void InsertEvent(std::shared_ptr<gd::BaseEvent> event,
@@ -143,25 +142,6 @@ class GD_CORE_API EventsList {
    */
   bool Contains(const gd::BaseEvent& eventToSearch,
                 bool recursive = true) const;
-
-  /**
-   * Move the specified event, that must be in the events list, to another
-   * events list *without* invalidating the event (i.e: without
-   * destroying/cloning it) in memory.
-   *
-   * \warning newEventsList is supposed not to be contained inside the event
-   * (you should not try
-   * to move an event inside one of its children/grand children events).
-   *
-   * \param eventToMove The event to be moved
-   * \param newEventsList The new events list
-   * \param newPosition The position in the new events list
-   * \return true if the move was made, false otherwise (for example, if
-   * eventToMove is not found in the list)
-   */
-  bool MoveEventToAnotherEventsList(const gd::BaseEvent& eventToMove,
-                                    gd::EventsList& newEventsList,
-                                    std::size_t newPosition);
   ///@}
 
   /** \name std::vector API compatibility

Core/GDCore/Events/Instruction.cpp

@@ -4,12 +4,9 @@
  * reserved. This project is released under the MIT License.
  */
 #include "GDCore/Events/Instruction.h"
-
 #include <assert.h>
-
 #include <iostream>
 #include <vector>
-
 #include "GDCore/Events/Expression.h"
 #include "GDCore/Events/InstructionsList.h"
 #include "GDCore/String.h"
@@ -18,14 +15,18 @@ namespace gd {
 
 gd::Expression Instruction::badExpression("");
 
-Instruction::Instruction(gd::String type_) : type(type_), inverted(false) {
+Instruction::Instruction(gd::String type_)
+    : type(type_),
+      inverted(false) {
   parameters.reserve(8);
 }
 
 Instruction::Instruction(gd::String type_,
                          const std::vector<gd::Expression>& parameters_,
                          bool inverted_)
-    : type(type_), inverted(inverted_), parameters(parameters_) {
+    : type(type_),
+      inverted(inverted_),
+      parameters(parameters_) {
   parameters.reserve(8);
 }
 
@@ -55,17 +56,4 @@ void Instruction::SetParameter(std::size_t nb, const gd::Expression& val) {
   parameters[nb] = val;
 }
 
-std::shared_ptr<Instruction> GD_CORE_API
-CloneRememberingOriginalElement(std::shared_ptr<Instruction> instruction) {
-  std::shared_ptr<Instruction> copy =
-      std::make_shared<Instruction>(*instruction);
-  // Original instruction is either the original instruction of the copied
-  // instruction, or the instruction copied.
-  copy->originalInstruction = instruction->originalInstruction.expired()
-                                  ? instruction
-                                  : instruction->originalInstruction;
-
-  return copy;
-}
-
 }  // namespace gd

Core/GDCore/Events/Instruction.h

@@ -5,9 +5,7 @@
  */
 #ifndef INSTRUCTION_H
 #define INSTRUCTION_H
-#include <memory>
 #include <vector>
-
 #include "GDCore/Events/Expression.h"
 #include "GDCore/Events/InstructionsList.h"
 #include "GDCore/String.h"
@@ -133,17 +131,6 @@ class GD_CORE_API Instruction {
    */
   inline gd::InstructionsList& GetSubInstructions() { return subInstructions; };
 
-  /**
-   * \brief Return the original instruction this instruction was copied from.
-   *
-   * Useful to get reference to the original instruction in memory during code
-   * generation, to ensure stable unique identifiers.
-   */
-  std::weak_ptr<Instruction> GetOriginalInstruction() { return originalInstruction; };
-
-  friend std::shared_ptr<Instruction> CloneRememberingOriginalElement(
-      std::shared_ptr<Instruction> instruction);
-
  private:
   gd::String type;  ///< Instruction type
   bool inverted;  ///< True if the instruction if inverted. Only applicable for
@@ -152,23 +139,9 @@ class GD_CORE_API Instruction {
       parameters;                        ///< Vector containing the parameters
   gd::InstructionsList subInstructions;  ///< Sub instructions, if applicable.
 
-  std::weak_ptr<Instruction>
-      originalInstruction;  ///< Pointer used to remember which gd::Instruction
-                            ///< this instruction was copied from. Useful to
-                            ///< ensure the stability of code generation (as
-                            ///< some part of code generation uses the pointer
-                            ///< to the instruction as a unique identifier).
-
   static gd::Expression badExpression;
 };
 
-/**
- * Clone the given instruction, returning an instruction for which
- * `GetOriginalInstruction()` returns the originally copied instruction.
- */
-std::shared_ptr<Instruction> GD_CORE_API
-CloneRememberingOriginalElement(std::shared_ptr<Instruction> instruction);
-
 }  // namespace gd
 
 #endif  // INSTRUCTION_H

Core/GDCore/Events/Parsers/ExpressionParser.cpp

@@ -0,0 +1,897 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "GDCore/Events/Parsers/ExpressionParser.h"
+#include <algorithm>
+#include <iostream>
+#include "GDCore/CommonTools.h"
+#include "GDCore/Events/Expression.h"
+#include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
+#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/Platform.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Tools/Localization.h"
+
+using namespace std;
+
+namespace gd {
+
+gd::String ExpressionParser::parserSeparators = " ,+-*/%.<>=&|;()#^![]{}";
+
+size_t ExpressionParser::GetMinimalParametersNumber(
+    const std::vector<gd::ParameterMetadata>& parametersInfos) {
+  size_t nb = 0;
+  for (std::size_t i = 0; i < parametersInfos.size(); ++i) {
+    if (!parametersInfos[i].optional && !parametersInfos[i].codeOnly) nb++;
+  }
+
+  return nb;
+}
+
+size_t ExpressionParser::GetMaximalParametersNumber(
+    const std::vector<gd::ParameterMetadata>& parametersInfos) {
+  size_t nb = 0;
+  for (std::size_t i = 0; i < parametersInfos.size(); ++i) {
+    if (!parametersInfos[i].codeOnly) nb++;
+  }
+
+  return nb;
+}
+
+/**
+ * Add blank parameters when code-only parameters are expected.
+ * \param Parameters information
+ * \param vector of parameters without code only parameters.
+ */
+std::vector<gd::Expression> CompleteParameters(
+    const std::vector<gd::ParameterMetadata>& parametersInfo,
+    const std::vector<gd::Expression>& parameters) {
+  std::vector<gd::Expression> completeParameters = parameters;
+  for (std::size_t i = 0; i < parametersInfo.size();
+       ++i)  // Code only parameters are not included in expressions parameters.
+  {
+    if (parametersInfo[i].codeOnly) {
+      if (i > completeParameters.size()) {
+        cout << "Bad parameter count in expression.";
+      }
+
+      if (i >= completeParameters.size())
+        completeParameters.push_back(gd::Expression(""));
+      else
+        completeParameters.insert(completeParameters.begin() + i,
+                                  gd::Expression(""));
+    } else {
+      if (i >= completeParameters.size()) {
+        completeParameters.push_back(gd::Expression(""));
+      }
+    }
+  }
+  return completeParameters;
+}
+
+bool ExpressionParser::ValidSyntax(const gd::String& str) {
+  static const gd::String numerics = "0123456789.e";
+  static const gd::String operators = "+/*-%";
+
+  size_t parenthesisLevel = 0;
+  gd::String lastOperator;
+
+  bool parsingNumber = false;
+  bool parsingScientificNotationNumber = false;
+  bool parsingDecimalNumber = false;
+  bool requestNumber = false;
+  gd::String lastNumber;
+  bool numberWasParsedLast = false;
+
+  for (auto it = str.begin(); it != str.end(); ++it) {
+    char32_t currentChar = *it;
+    if (currentChar == U' ' || currentChar == U'\n') {
+      if (requestNumber) {
+        firstErrorStr = _("Number expected");
+
+        return false;
+      }
+
+      if (parsingNumber) {
+        parsingNumber = false;
+        parsingScientificNotationNumber = false;
+        parsingDecimalNumber = false;
+        requestNumber = false;
+        lastNumber.clear();
+        numberWasParsedLast = true;
+      }
+    } else if (numerics.find(currentChar) != gd::String::npos) {
+      requestNumber = false;
+
+      if (currentChar == U'.') {
+        if (!parsingNumber) {
+          firstErrorStr = _("Syntax error");
+
+          return false;
+        }
+
+        if (parsingDecimalNumber) {
+          firstErrorStr = _("Syntax error in a number.");
+
+          return false;
+        }
+
+        parsingDecimalNumber = true;
+      }
+
+      if (currentChar == U'e') {
+        if (parsingScientificNotationNumber) {
+          firstErrorStr = _("Syntax error in a number.");
+
+          return false;
+        }
+
+        parsingScientificNotationNumber = true;
+        requestNumber = true;
+      }
+
+      if (numberWasParsedLast) {
+        firstErrorStr = _("Operator missing before a number");
+
+        return false;
+      }
+
+      parsingNumber = true;
+      lastNumber += currentChar;
+    } else if (currentChar == U')') {
+      if (requestNumber) {
+        firstErrorStr = _("Number expected");
+
+        return false;
+      }
+
+      if (parsingNumber) {
+        parsingNumber = false;
+        parsingScientificNotationNumber = false;
+        parsingDecimalNumber = false;
+        lastNumber.clear();
+        numberWasParsedLast = true;
+      }
+
+      if (!numberWasParsedLast) {
+        firstErrorStr = _("Superfluous operator before a paranthesis");
+
+        return false;
+      }
+
+      if (parenthesisLevel > 0)
+        parenthesisLevel--;
+      else {
+        firstErrorStr = _("Bad closing paranthesis");
+
+        return false;
+      }
+
+      auto previousIt = it;
+      --previousIt;
+      if (*previousIt == U'(') {
+        firstErrorStr = _("Empty paranthesis");
+
+        return false;
+      }
+    } else if (currentChar == U'(') {
+      if (requestNumber) {
+        firstErrorStr = _("Number expected");
+
+        return false;
+      }
+
+      if (parsingNumber) {
+        parsingNumber = false;
+        parsingScientificNotationNumber = false;
+        parsingDecimalNumber = false;
+        lastNumber.clear();
+        numberWasParsedLast = true;
+      }
+
+      if (numberWasParsedLast) {
+        firstErrorStr = _("Operator missing before a paranthesis");
+
+        return false;
+      }
+
+      parenthesisLevel++;
+      numberWasParsedLast = false;
+    } else if (operators.find(currentChar) != gd::String::npos) {
+      if (currentChar == U'-' && parsingNumber &&
+          parsingScientificNotationNumber) {
+        lastNumber += currentChar;
+        requestNumber = true;
+      } else {
+        if (requestNumber) {
+          firstErrorStr = _("Number expected");
+
+          return false;
+        }
+
+        if (parsingNumber) {
+          parsingNumber = false;
+          parsingScientificNotationNumber = false;
+          parsingDecimalNumber = false;
+          lastNumber.clear();
+          numberWasParsedLast = true;
+        }
+
+        if (currentChar != U'-' && currentChar != U'+' &&
+            !numberWasParsedLast) {
+          firstErrorStr = _("Operators without any number between them");
+
+          return false;
+        }
+
+        numberWasParsedLast = false;
+      }
+    } else {
+      firstErrorStr = _("Syntax error");
+
+      return false;
+    }
+  }
+
+  if (parsingNumber) {
+    parsingNumber = false;
+    parsingScientificNotationNumber = false;
+    parsingDecimalNumber = false;
+    lastNumber.clear();
+    numberWasParsedLast = true;
+  } else if (requestNumber) {
+    firstErrorStr = _("Number expected");
+
+    return false;
+  }
+
+  if (parenthesisLevel != 0) {
+    firstErrorStr = _("Paranthesis mismatch");
+
+    return false;
+  }
+
+  if (!numberWasParsedLast) {
+    firstErrorStr = _("Alone operator at the end of the expression");
+
+    return false;
+  }
+
+  return true;
+}
+
+bool ExpressionParser::ParseMathExpression(const gd::Platform& platform,
+                                           const gd::ObjectsContainer& project,
+                                           const gd::ObjectsContainer& layout,
+                                           gd::ParserCallbacks& callbacks) {
+  callbacks.SetReturnType("expression");
+  gd::String expression = expressionPlainString;
+
+  size_t parsePosition = 0;
+
+  size_t firstPointPos = expression.find(".");
+  size_t firstParPos = expression.find("(");
+
+  gd::String expressionWithoutFunctions;
+  gd::String nonFunctionToken;
+  size_t nonFunctionTokenStartPos = gd::String::npos;
+
+  while (firstPointPos != string::npos || firstParPos != string::npos) {
+    // Identify name
+    size_t nameEnd = firstPointPos < firstParPos ? firstPointPos : firstParPos;
+    size_t nameStart = expression.find_last_of(parserSeparators, nameEnd - 1);
+    nameStart++;
+
+    gd::String nameBefore = expression.substr(nameStart, nameEnd - nameStart);
+    gd::String objectName = nameBefore.FindAndReplace("~", " ");
+
+    // Identify function name
+    gd::String functionName = nameBefore;
+    size_t functionNameEnd = nameEnd;
+    vector<gd::Expression> parameters;
+
+    bool nameIsFunction = firstPointPos > firstParPos;
+    if (!nameIsFunction) {
+      parameters.push_back(gd::Expression(objectName));
+      functionNameEnd = expression.find_first_of(" (", nameEnd);
+      if (nameEnd + 1 < expression.length())
+        functionName =
+            expression.substr(nameEnd + 1, functionNameEnd - (nameEnd + 1));
+      if (functionNameEnd == string::npos) {
+        functionName = "";
+        functionNameEnd = expression.length() - 1;
+      }
+    }
+
+    // Now we're going to identify the expression
+    gd::ExpressionMetadata instructionInfos;
+
+    if (functionName.substr(0, functionName.length() - 1)
+            .find_first_of(parserSeparators) == string::npos) {
+      bool functionFound = false;
+      bool staticFunctionFound = false;
+      bool objectFunctionFound = false;
+      bool behaviorFunctionFound = false;
+
+      // First try to bind to a static expression
+      if (nameIsFunction &&
+          MetadataProvider::HasExpression(platform, functionName)) {
+        functionFound = true;
+        staticFunctionFound = true;
+        instructionInfos =
+            MetadataProvider::GetExpressionMetadata(platform, functionName);
+      }
+      // Then search in object expression
+      else if (!nameIsFunction &&
+               MetadataProvider::HasObjectExpression(
+                   platform,
+                   gd::GetTypeOfObject(project, layout, objectName),
+                   functionName)) {
+        functionFound = true;
+        objectFunctionFound = true;
+        instructionInfos = MetadataProvider::GetObjectExpressionMetadata(
+            platform,
+            gd::GetTypeOfObject(project, layout, objectName),
+            functionName);
+      }
+      // And in behaviors expressions
+      else if (!nameIsFunction) {
+        size_t firstDoublePoints = functionName.find("::");
+        if (firstDoublePoints != string::npos) {
+          gd::String autoName = functionName.substr(0, firstDoublePoints);
+          if (firstDoublePoints + 2 < functionName.length())
+            functionName = functionName.substr(firstDoublePoints + 2,
+                                               functionName.length());
+          else
+            functionName = "";
+
+          if (MetadataProvider::HasBehaviorExpression(
+                  platform,
+                  gd::GetTypeOfBehavior(project, layout, autoName),
+                  functionName)) {
+            parameters.push_back(gd::Expression(autoName));
+            functionFound = true;
+            behaviorFunctionFound = true;
+
+            instructionInfos = MetadataProvider::GetBehaviorExpressionMetadata(
+                platform,
+                gd::GetTypeOfBehavior(project, layout, autoName),
+                functionName);
+
+            // Verify that object has behavior.
+            vector<gd::String> behaviors =
+                gd::GetBehaviorsOfObject(project, layout, objectName);
+            if (find(behaviors.begin(), behaviors.end(), autoName) ==
+                behaviors.end()) {
+              cout << "Bad behavior requested" << endl;
+              functionFound = false;
+            }
+          }
+        }
+      }
+
+      if (functionFound)  // Add the function
+      {
+        // Identify parameters
+        size_t parametersEnd = expression.find_first_of("(", functionNameEnd);
+        gd::String currentParameterStr;
+        char32_t previousChar = '(';
+        bool takeSymbolsInAccount = true;
+        if (parametersEnd != string::npos) {
+          size_t level = 0;
+          parametersEnd++;
+
+          while (parametersEnd < expression.length() &&
+                 !(expression[parametersEnd] == ')' && level == 0)) {
+            // Be sure we are not in quotes
+            if (expression[parametersEnd] == U'\"' && previousChar != U'\\')
+              takeSymbolsInAccount = !takeSymbolsInAccount;
+
+            // So as to be sure paranthesis don't belong to a parameter
+            if (expression[parametersEnd] == U'(' && takeSymbolsInAccount)
+              level++;
+            if (expression[parametersEnd] == U')' && takeSymbolsInAccount)
+              level--;
+
+            // Add the character to the current parameter or terminate the
+            // latter
+            if ((expression[parametersEnd] == U',' && level == 0) &&
+                takeSymbolsInAccount) {
+              parameters.push_back(currentParameterStr);
+              currentParameterStr.clear();
+            } else
+              currentParameterStr += expression[parametersEnd];
+
+            previousChar = expression[parametersEnd];
+            parametersEnd++;
+          }
+          if (currentParameterStr.find_first_not_of(" ") !=
+              string::npos)  // Add last parameter if needed
+          {
+            parameters.push_back(currentParameterStr);
+          }
+
+          // Testing function call is properly closed
+          if (parametersEnd == expression.length() ||
+              expression[parametersEnd] != U')') {
+            firstErrorStr = _("Paranthesis not closed");
+            firstErrorPos = parametersEnd - 1;
+
+            return false;
+          }
+
+          // Testing the number of parameters
+          if (parameters.size() >
+                  GetMaximalParametersNumber(instructionInfos.parameters) ||
+              parameters.size() <
+                  GetMinimalParametersNumber(instructionInfos.parameters)) {
+            firstErrorPos = functionNameEnd;
+            firstErrorStr = _("Incorrect number of parameters");
+            firstErrorStr += " ";
+            firstErrorStr += _("Expected (maximum) :");
+            firstErrorStr += gd::String::From(
+                GetMaximalParametersNumber(instructionInfos.parameters));
+
+            return false;
+          }
+
+          // Preparing parameters
+          parameters =
+              CompleteParameters(instructionInfos.parameters, parameters);
+          for (std::size_t i = 0; i < instructionInfos.parameters.size(); ++i) {
+            if (!PrepareParameter(platform,
+                                  project,
+                                  layout,
+                                  callbacks,
+                                  parameters[i],
+                                  instructionInfos.parameters[i],
+                                  functionNameEnd))
+              return false;
+          }
+        } else {
+          firstErrorPos = functionNameEnd;
+          firstErrorStr = _("Parameters' parenthesis missing");
+
+          return false;
+        }
+
+        callbacks.OnConstantToken(
+            nonFunctionToken +
+            expression.substr(parsePosition, nameStart - parsePosition));
+        expressionWithoutFunctions +=
+            expression.substr(parsePosition, nameStart - parsePosition);
+        nonFunctionToken.clear();
+        nonFunctionTokenStartPos = gd::String::npos;
+
+        if (objectFunctionFound)
+          callbacks.OnObjectFunction(
+              functionName, parameters, instructionInfos);
+        else if (behaviorFunctionFound)
+          callbacks.OnObjectBehaviorFunction(
+              functionName, parameters, instructionInfos);
+        else if (staticFunctionFound)
+          callbacks.OnStaticFunction(
+              functionName, parameters, instructionInfos);
+
+        if (objectFunctionFound || behaviorFunctionFound || staticFunctionFound)
+          expressionWithoutFunctions += "0";
+
+        parsePosition = parametersEnd + 1;
+        firstPointPos = expression.find(".", parametersEnd + 1);
+        firstParPos = expression.find("(", parametersEnd + 1);
+      } else  // Math function or math constant : Pass it.
+      {
+        nonFunctionToken += expression.substr(
+            parsePosition, functionNameEnd + 1 - parsePosition);
+        expressionWithoutFunctions += expression.substr(
+            parsePosition, functionNameEnd + 1 - parsePosition);
+        nonFunctionTokenStartPos = (nonFunctionTokenStartPos != gd::String::npos
+                                        ? nonFunctionTokenStartPos
+                                        : parsePosition);
+        parsePosition = functionNameEnd + 1;
+        firstPointPos = expression.find(".", functionNameEnd + 1);
+        firstParPos = expression.find("(", functionNameEnd + 1);
+      }
+    } else  // Not a function call : Pass it
+    {
+      nonFunctionToken +=
+          expression.substr(parsePosition, nameEnd + 1 - parsePosition);
+      expressionWithoutFunctions +=
+          expression.substr(parsePosition, nameEnd + 1 - parsePosition);
+      nonFunctionTokenStartPos = (nonFunctionTokenStartPos != gd::String::npos
+                                      ? nonFunctionTokenStartPos
+                                      : parsePosition);
+      parsePosition = nameEnd + 1;
+      firstPointPos = expression.find(".", nameEnd + 1);
+      firstParPos = expression.find("(", nameEnd + 1);
+    }
+  }
+
+  if (parsePosition < expression.length() || !nonFunctionToken.empty())
+    callbacks.OnConstantToken(
+        nonFunctionToken +
+        expression.substr(parsePosition, expression.length()));
+
+  expressionWithoutFunctions +=
+      expression.substr(parsePosition, expression.length());
+
+  return ValidSyntax(expressionWithoutFunctions);
+}
+
+bool ExpressionParser::ParseStringExpression(const gd::Platform& platform,
+                                             const gd::ObjectsContainer& project,
+                                             const gd::ObjectsContainer& layout,
+                                             gd::ParserCallbacks& callbacks) {
+  callbacks.SetReturnType("string");
+  gd::String expression = expressionPlainString;
+
+  size_t parsePosition = 0;
+
+  // Searching for first token.
+  size_t firstPointPos = expression.find(".");
+  size_t firstParPos = expression.find("(");
+  size_t firstQuotePos = expression.find("\"");
+
+  if (firstPointPos == string::npos && firstParPos == string::npos &&
+      firstQuotePos == string::npos) {
+    firstErrorPos = 0;
+    firstErrorStr =
+        _("The expression is invalid or empty. Enter a text ( surrounded by "
+          "quotes ) or a function.");
+
+    return false;
+  }
+
+  while (firstPointPos != string::npos || firstParPos != string::npos ||
+         firstQuotePos != string::npos) {
+    if (firstQuotePos < firstPointPos &&
+        firstQuotePos < firstParPos)  // Adding a constant text
+    {
+      callbacks.OnConstantToken(
+          expression.substr(parsePosition, firstQuotePos - parsePosition));
+
+      // Finding start and end of quotes
+      size_t finalQuotePosition = expression.find("\"", firstQuotePos + 1);
+      while (finalQuotePosition ==
+             expression.find("\\\"", finalQuotePosition - 1) + 1)
+        finalQuotePosition = expression.find("\"", finalQuotePosition + 1);
+
+      if (finalQuotePosition == string::npos) {
+        firstErrorPos = firstQuotePos;
+        firstErrorStr = _("Quotes not closed.");
+
+        return false;
+      }
+
+      // Generating final text, by replacing \" by quotes
+      gd::String finalText = expression.substr(
+          firstQuotePos + 1, finalQuotePosition - (firstQuotePos + 1));
+
+      size_t foundPos = finalText.find("\\\"");
+      while (foundPos != string::npos) {
+        if (foundPos != string::npos) finalText.replace(foundPos, 2, "\"");
+        foundPos = finalText.find("\\\"", foundPos);
+      }
+
+      // Adding constant text instruction
+      //(Function without name is considered as a constant text)
+      vector<gd::Expression> parameters;
+      parameters.push_back(finalText);
+      gd::ExpressionMetadata noParametersInfo;
+
+      callbacks.OnStaticFunction("", parameters, noParametersInfo);
+
+      parsePosition = finalQuotePosition + 1;
+    } else  // Adding a function
+    {
+      // Identify name
+      size_t nameEnd =
+          firstPointPos < firstParPos ? firstPointPos : firstParPos;
+      size_t nameStart = expression.find_last_of(parserSeparators, nameEnd - 1);
+      nameStart++;
+
+      callbacks.OnConstantToken(
+          expression.substr(parsePosition, nameStart - parsePosition));
+
+      gd::String nameBefore = expression.substr(nameStart, nameEnd - nameStart);
+      gd::String objectName = nameBefore.FindAndReplace("~", " ");
+
+      // Identify function name
+      gd::String functionName = nameBefore;
+      size_t functionNameEnd = nameEnd;
+      vector<gd::Expression> parameters;
+
+      bool nameIsFunction = firstPointPos > firstParPos;
+      if (!nameIsFunction) {
+        parameters.push_back(gd::Expression(objectName));
+        functionNameEnd = expression.find_first_of("( ", nameEnd);
+        if (nameEnd + 1 < expression.length())
+          functionName =
+              expression.substr(nameEnd + 1, functionNameEnd - (nameEnd + 1));
+      }
+
+      // Identify parameters
+      size_t parametersEnd = expression.find_first_of("(", functionNameEnd) + 1;
+      char32_t previousChar = U'(';
+      bool takeSymbolsInAccount = true;
+      size_t level = 0;
+      gd::String currentParameterStr;
+      while (parametersEnd < expression.length() &&
+             !(expression[parametersEnd] == U')' && level == 0)) {
+        // Be sure we are not in quotes
+        if (expression[parametersEnd] == U'\"' && previousChar != U'\\')
+          takeSymbolsInAccount = !takeSymbolsInAccount;
+
+        // So as to be sure paranthesis don't belong to a parameter
+        if (expression[parametersEnd] == U'(' && takeSymbolsInAccount) level++;
+        if (expression[parametersEnd] == U')' && takeSymbolsInAccount) level--;
+
+        // Add the character to the current parameter or terminate the latter
+        if ((expression[parametersEnd] == ',' && level == 0) &&
+            takeSymbolsInAccount) {
+          gd::Expression currentParameter(currentParameterStr);
+          parameters.push_back(currentParameter);
+
+          currentParameterStr.clear();
+        } else
+          currentParameterStr += expression[parametersEnd];
+
+        previousChar = expression[parametersEnd];
+        parametersEnd++;
+      }
+
+      if (parametersEnd == expression.length() ||
+          expression[parametersEnd] != U')') {
+        firstErrorPos = parametersEnd - 1;
+        firstErrorStr = _("Paranthesis not closed");
+
+        return false;
+      }
+
+      if (currentParameterStr.find_first_not_of(" ") !=
+          string::npos)  // Add last parameter if needed
+      {
+        gd::Expression lastParameter(currentParameterStr);
+        parameters.push_back(lastParameter);
+      }
+
+      bool functionFound = false;
+
+      // First try to bind to a static str expression
+      if (nameIsFunction &&
+          MetadataProvider::HasStrExpression(platform, functionName)) {
+        functionFound = true;
+        const gd::ExpressionMetadata& expressionInfo =
+            MetadataProvider::GetStrExpressionMetadata(platform, functionName);
+
+        // Testing the number of parameters
+        if (parameters.size() >
+                GetMaximalParametersNumber(expressionInfo.parameters) ||
+            parameters.size() <
+                GetMinimalParametersNumber(expressionInfo.parameters)) {
+          firstErrorPos = functionNameEnd;
+          firstErrorStr = _("Incorrect number of parameters");
+
+          return false;
+        }
+
+        // Preparing parameters
+        parameters = CompleteParameters(expressionInfo.parameters, parameters);
+        for (std::size_t i = 0;
+             i < parameters.size() && i < expressionInfo.parameters.size();
+             ++i) {
+          if (!PrepareParameter(platform,
+                                project,
+                                layout,
+                                callbacks,
+                                parameters[i],
+                                expressionInfo.parameters[i],
+                                functionNameEnd))
+            return false;
+        }
+
+        callbacks.OnStaticFunction(functionName, parameters, expressionInfo);
+      }
+      // Then an object member expression
+      else if (!nameIsFunction &&
+               MetadataProvider::HasObjectStrExpression(
+                   platform,
+                   gd::GetTypeOfObject(project, layout, objectName),
+                   functionName)) {
+        functionFound = true;
+        const gd::ExpressionMetadata& expressionInfo =
+            MetadataProvider::GetObjectStrExpressionMetadata(
+                platform,
+                gd::GetTypeOfObject(project, layout, nameBefore),
+                functionName);
+
+        // Testing the number of parameters
+        if (parameters.size() >
+                GetMaximalParametersNumber(expressionInfo.parameters) ||
+            parameters.size() <
+                GetMinimalParametersNumber(expressionInfo.parameters)) {
+          firstErrorPos = functionNameEnd;
+          firstErrorStr = _("Incorrect number of parameters");
+
+          return false;
+        }
+
+        // Preparing parameters
+        parameters = CompleteParameters(expressionInfo.parameters, parameters);
+        for (std::size_t i = 0;
+             i < parameters.size() && i < expressionInfo.parameters.size();
+             ++i) {
+          if (!PrepareParameter(platform,
+                                project,
+                                layout,
+                                callbacks,
+                                parameters[i],
+                                expressionInfo.parameters[i],
+                                functionNameEnd))
+            return false;
+        }
+
+        callbacks.OnObjectFunction(functionName, parameters, expressionInfo);
+      }
+      // And search behaviors expressions
+      else {
+        size_t firstDoublePoints = functionName.find("::");
+        if (firstDoublePoints != string::npos) {
+          gd::String autoName = functionName.substr(0, firstDoublePoints);
+          if (firstDoublePoints + 2 < functionName.length())
+            functionName = functionName.substr(firstDoublePoints + 2,
+                                               functionName.length());
+          else
+            functionName = "";
+
+          if (MetadataProvider::HasBehaviorStrExpression(
+                  platform,
+                  gd::GetTypeOfBehavior(project, layout, autoName),
+                  functionName)) {
+            parameters.push_back(gd::Expression(autoName));
+            functionFound = true;
+
+            const gd::ExpressionMetadata& expressionInfo =
+                MetadataProvider::GetBehaviorStrExpressionMetadata(
+                    platform,
+                    gd::GetTypeOfBehavior(project, layout, autoName),
+                    functionName);
+
+            // Verify that object has behavior.
+            vector<gd::String> behaviors =
+                gd::GetBehaviorsOfObject(project, layout, objectName);
+            if (find(behaviors.begin(), behaviors.end(), autoName) ==
+                behaviors.end()) {
+              cout << "Bad behavior requested" << endl;
+              functionFound = false;
+            } else {
+              // Testing the number of parameters
+              if (parameters.size() >
+                      GetMaximalParametersNumber(expressionInfo.parameters) ||
+                  parameters.size() <
+                      GetMinimalParametersNumber(expressionInfo.parameters)) {
+                firstErrorPos = functionNameEnd;
+                firstErrorStr = _("Incorrect number of parameters");
+
+                return false;
+              }
+
+              // Preparing parameters
+              parameters =
+                  CompleteParameters(expressionInfo.parameters, parameters);
+              for (std::size_t i = 0; i < parameters.size() &&
+                                      i < expressionInfo.parameters.size();
+                   ++i) {
+                if (!PrepareParameter(platform,
+                                      project,
+                                      layout,
+                                      callbacks,
+                                      parameters[i],
+                                      expressionInfo.parameters[i],
+                                      functionNameEnd))
+                  return false;
+              }
+
+              callbacks.OnObjectBehaviorFunction(
+                  functionName, parameters, expressionInfo);
+            }
+          }
+        }
+      }
+
+      // Note : _No_ support for implicit conversion from math result to string
+
+      if (!functionFound)  // Function was not found
+      {
+        firstErrorPos = nameStart;
+        firstErrorStr = _("Function not recognized.");
+
+        return false;
+      }
+
+      parsePosition = parametersEnd + 1;
+    }
+
+    // Searching for next token
+    size_t firstPlusPos = expression.find("+", parsePosition);
+    firstPointPos = expression.find(".", parsePosition);
+    firstParPos = expression.find("(", parsePosition);
+    firstQuotePos = expression.find("\"", parsePosition);
+
+    // Checking for a + between token
+    if ((firstPointPos != string::npos || firstParPos != string::npos ||
+         firstQuotePos != string::npos)) {
+      size_t nextTokenPos = firstPointPos;
+      if (firstParPos < nextTokenPos) nextTokenPos = firstParPos;
+      if (firstQuotePos < nextTokenPos) nextTokenPos = firstQuotePos;
+
+      if (nextTokenPos < firstPlusPos) {
+        firstErrorPos = nextTokenPos;
+        firstErrorStr = _("Symbol missing between two +.");
+
+        return false;
+      } else if (expression.find("+", firstPlusPos + 1) < nextTokenPos) {
+        firstErrorPos = firstPlusPos;
+        firstErrorStr = _("Symbol missing between two +.");
+
+        return false;
+      }
+    }
+  }
+
+  if (expression.substr(parsePosition, expression.length())
+          .find_first_not_of(" \n") != gd::String::npos) {
+    firstErrorPos = parsePosition;
+    firstErrorStr = _("Bad symbol at the end of the expression.");
+
+    return false;
+  }
+
+  return true;
+}
+
+bool ExpressionParser::PrepareParameter(
+    const gd::Platform& platform,
+    const gd::ObjectsContainer& project,
+    const gd::ObjectsContainer& layout,
+    ParserCallbacks& callbacks,
+    gd::Expression& parameter,
+    const gd::ParameterMetadata& parametersInfo,
+    const size_t positionInExpression) {
+  if (ParameterMetadata::IsExpression("number", parametersInfo.type)) {
+    if (parametersInfo.optional && parameter.GetPlainString().empty())
+      parameter = parametersInfo.defaultValue.empty()
+                      ? gd::Expression("0")
+                      : gd::Expression(parametersInfo.defaultValue);
+
+    if (!callbacks.OnSubMathExpression(platform, project, layout, parameter)) {
+      firstErrorStr = callbacks.firstErrorStr;
+      firstErrorPos = callbacks.firstErrorPos + positionInExpression;
+
+      return false;
+    }
+  } else if (ParameterMetadata::IsExpression("string", parametersInfo.type)) {
+    if (parametersInfo.optional && parameter.GetPlainString().empty())
+      parameter = parametersInfo.defaultValue.empty()
+                      ? gd::Expression("\"\"")
+                      : gd::Expression(parametersInfo.defaultValue);
+
+    if (!callbacks.OnSubTextExpression(platform, project, layout, parameter)) {
+      firstErrorStr = callbacks.firstErrorStr;
+      firstErrorPos = callbacks.firstErrorPos + positionInExpression;
+
+      return false;
+    }
+  }
+
+  return true;
+}
+
+ExpressionParser::ExpressionParser(const gd::String& expressionPlainString_)
+    : expressionPlainString(expressionPlainString_) {}
+
+}  // namespace gd

Core/GDCore/Events/Parsers/ExpressionParser.h

@@ -0,0 +1,179 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef GDCORE_EXPRESSIONPARSER_H
+#define GDCORE_EXPRESSIONPARSER_H
+
+#include <vector>
+#include "GDCore/String.h"
+namespace gd {
+class Expression;
+class ParserCallbacks;
+class ObjectsContainer;
+class Platform;
+class ParameterMetadata;
+class ExpressionMetadata;
+}
+
+namespace gd {
+
+/** \brief Parse an expression
+ *
+ * Parse an expression, calling callbacks when a token is reached
+ * \see gd::ParserCallbacks
+ */
+class GD_CORE_API ExpressionParser {
+ public:
+  ExpressionParser(const gd::String &expressionPlainString_);
+  virtual ~ExpressionParser(){};
+
+  /**
+   * \brief Parse the expression, calling each functor when necessary
+   * \return True if expression was correctly parsed.
+   */
+  bool ParseMathExpression(const gd::Platform &platform,
+                           const gd::ObjectsContainer &project,
+                           const gd::ObjectsContainer &layout,
+                           gd::ParserCallbacks &callbacks);
+
+  /**
+   * \brief Parse the expression, calling each functor when necessary
+   * \return True if expression was correctly parsed.
+   */
+  bool ParseStringExpression(const gd::Platform &platform,
+                             const gd::ObjectsContainer &project,
+                             const gd::ObjectsContainer &layout,
+                             gd::ParserCallbacks &callbacks);
+
+  /**
+   * \brief Return the description of the error that was found
+   */
+  const gd::String &GetFirstError() { return firstErrorStr; }
+
+  /**
+   * \brief Return the position of the error that was found
+   * \return The position, or gd::String::npos if no error is found
+   */
+  size_t GetFirstErrorPosition() { return firstErrorPos; }
+
+ private:
+  gd::String firstErrorStr;
+  size_t firstErrorPos;
+
+  /**
+   * Tool function to add a parameter
+   */
+  bool AddParameterToList(const gd::ObjectsContainer &project,
+                          const gd::ObjectsContainer &layout,
+                          ParserCallbacks &,
+                          std::vector<gd::Expression> &parameters,
+                          gd::String parameterStr,
+                          std::vector<gd::ParameterMetadata> parametersInfos,
+                          const size_t positionInExpression);
+
+  /**
+   * Tool function to prepare a parameter
+   */
+  bool PrepareParameter(const gd::Platform &platform,
+                        const gd::ObjectsContainer &project,
+                        const gd::ObjectsContainer &layout,
+                        ParserCallbacks &,
+                        gd::Expression &parameter,
+                        const gd::ParameterMetadata &parametersInfo,
+                        const size_t positionInExpression);
+
+  /**
+   * Return the minimal number of parameters which can be used when calling an
+   * expression ( i.e. ParametersCount-OptionalParameters-CodeOnlyParameters )
+   */
+  size_t GetMinimalParametersNumber(
+      const std::vector<gd::ParameterMetadata> &parametersInfos);
+
+  /**
+   * Return the maximal number of parameters which can be used when calling an
+   * expression ( i.e. ParametersCount-CodeOnlyParameters )
+   */
+  size_t GetMaximalParametersNumber(
+      const std::vector<gd::ParameterMetadata> &parametersInfos);
+
+  bool ValidSyntax(const gd::String &str);
+
+  gd::String expressionPlainString;
+  static gd::String parserSeparators;
+};
+
+/** \brief Callbacks called by parser during parsing
+ *
+ * Parser will call the appropriate functions during parsing, allowing to do
+ * special works. \see gd::ExpressionParser
+ */
+class GD_CORE_API ParserCallbacks {
+  friend class ExpressionParser;
+
+ public:
+  ParserCallbacks() : returnType("expression"){};
+  virtual ~ParserCallbacks(){};
+
+  /**
+   * \brief Get the type of the expression for which callbacks are used:
+   * "expression" or "string".
+   */
+  const gd::String &GetReturnType() { return returnType; }
+
+  virtual void OnConstantToken(gd::String text) = 0;
+
+  virtual void OnStaticFunction(
+      gd::String functionName,
+      const std::vector<gd::Expression> &parameters,
+      const gd::ExpressionMetadata &expressionInfo) = 0;
+
+  virtual void OnObjectFunction(
+      gd::String functionName,
+      const std::vector<gd::Expression> &parameters,
+      const gd::ExpressionMetadata &expressionInfo) = 0;
+
+  virtual void OnObjectBehaviorFunction(
+      gd::String functionName,
+      const std::vector<gd::Expression> &parameters,
+      const gd::ExpressionMetadata &expressionInfo) = 0;
+
+  virtual bool OnSubMathExpression(const gd::Platform &platform,
+                                   const gd::ObjectsContainer &project,
+                                   const gd::ObjectsContainer &layout,
+                                   gd::Expression &expression) = 0;
+  virtual bool OnSubTextExpression(const gd::Platform &platform,
+                                   const gd::ObjectsContainer &project,
+                                   const gd::ObjectsContainer &layout,
+                                   gd::Expression &expression) = 0;
+
+  /**
+   * \brief Return the description of the error that was found
+   */
+  const gd::String &GetFirstError() { return firstErrorStr; }
+
+  /**
+   * \brief Return the position of the error that was found
+   * \return The position, or gd::String::npos if no error is found
+   */
+  size_t GetFirstErrorPosition() { return firstErrorPos; }
+
+ protected:
+  gd::String firstErrorStr;
+  size_t firstErrorPos;
+
+ private:
+  /**
+   * \brief Set the return type of the expression: Done by ExpressionParser
+   * according to which Parse* method is called. \see gd::ExpressionParser
+   */
+  void SetReturnType(gd::String type) { returnType = type; }
+
+  gd::String returnType;  // The type of the expression ("expression" (default),
+                          // "string"...)
+};
+
+}  // namespace gd
+
+#endif  // GDEXPRESSIONPARSER_H

Core/GDCore/Events/Parsers/ExpressionParser2.cpp

@@ -4,11 +4,9 @@
  * reserved. This project is released under the MIT License.
  */
 #include "GDCore/Events/Parsers/ExpressionParser2.h"
-
 #include <algorithm>
 #include <memory>
 #include <vector>
-
 #include "GDCore/CommonTools.h"
 #include "GDCore/Events/Expression.h"
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
@@ -24,6 +22,15 @@ using namespace std;
 
 namespace gd {
 
+gd::String ExpressionParser2::NUMBER_FIRST_CHAR = ".0123456789";
+gd::String ExpressionParser2::DOT = ".";
+gd::String ExpressionParser2::PARAMETERS_SEPARATOR = ",";
+gd::String ExpressionParser2::QUOTE = "\"";
+gd::String ExpressionParser2::BRACKETS = "()[]{}";
+gd::String ExpressionParser2::EXPRESSION_OPERATORS = "+-<>?^=\\:!";
+gd::String ExpressionParser2::TERM_OPERATORS = "/*";
+gd::String ExpressionParser2::UNARY_OPERATORS = "+-";
+gd::String ExpressionParser2::WHITESPACES = " \n\r";
 gd::String ExpressionParser2::NAMESPACE_SEPARATOR = "::";
 
 ExpressionParser2::ExpressionParser2(
@@ -69,9 +76,7 @@ size_t GetMaximumParametersNumber(
 }  // namespace
 
 std::unique_ptr<ExpressionParserDiagnostic> ExpressionParser2::ValidateFunction(
-    const gd::String& type,
-    const gd::FunctionCallNode& function,
-    size_t functionStartPosition) {
+    const gd::FunctionNode& function, size_t functionStartPosition) {
   if (gd::MetadataProvider::IsBadExpressionMetadata(
           function.expressionMetadata)) {
     return gd::make_unique<ExpressionParserError>(
@@ -83,41 +88,6 @@ std::unique_ptr<ExpressionParserDiagnostic> ExpressionParser2::ValidateFunction(
         GetCurrentPosition());
   }
 
-  // Validate the type of the function
-  const gd::String& returnType = function.expressionMetadata.GetReturnType();
-  if (returnType == "number") {
-    if (type == "string")
-      return RaiseTypeError(
-          _("You tried to use an expression that returns a number, but a "
-            "string is expected. Use `ToString` if you need to convert a "
-            "number to a string."),
-          functionStartPosition);
-    else if (type != "number" && type != "number|string")
-      return RaiseTypeError(_("You tried to use an expression that returns a "
-                              "number, but another type is expected:") +
-                              " " + type,
-                            functionStartPosition);
-  } else if (returnType == "string") {
-    if (type == "number")
-      return RaiseTypeError(
-          _("You tried to use an expression that returns a string, but a "
-            "number is expected. Use `ToNumber` if you need to convert a "
-            "string to a number."),
-          functionStartPosition);
-    else if (type != "string" && type != "number|string")
-      return RaiseTypeError(_("You tried to use an expression that returns a "
-                              "string, but another type is expected:") +
-                              " " + type,
-                            functionStartPosition);
-  } else {
-    if (type != returnType)
-      return RaiseTypeError(
-          _("You tried to use an expression with the wrong return type:") + " " +
-            returnType,
-          functionStartPosition);
-  }
-
-  // Validate parameters count
   size_t minParametersCount = GetMinimumParametersNumber(
       function.expressionMetadata.parameters,
       WrittenParametersFirstIndex(function.objectName, function.behaviorName));
@@ -148,14 +118,11 @@ std::unique_ptr<ExpressionParserDiagnostic> ExpressionParser2::ValidateFunction(
 }
 
 std::unique_ptr<TextNode> ExpressionParser2::ReadText() {
-  size_t textStartPosition = GetCurrentPosition();
-  SkipAllWhitespaces();
-  if (!CheckIfChar(IsQuote)) {
+  SkipWhitespace();
+  if (!IsAnyChar("\"")) {
     auto text = gd::make_unique<TextNode>("");
     text->diagnostic =
         RaiseSyntaxError(_("A text must start with a double quote (\")."));
-    text->location =
-        ExpressionParserLocation(textStartPosition, GetCurrentPosition());
     return text;
   }
   SkipChar();
@@ -190,8 +157,6 @@ std::unique_ptr<TextNode> ExpressionParser2::ReadText() {
   }
 
   auto text = gd::make_unique<TextNode>(parsedText);
-  text->location =
-      ExpressionParserLocation(textStartPosition, GetCurrentPosition());
   if (!textParsingHasEnded) {
     text->diagnostic =
         RaiseSyntaxError(_("A text must end with a double quote (\"). Add a "
@@ -202,30 +167,28 @@ std::unique_ptr<TextNode> ExpressionParser2::ReadText() {
 }
 
 std::unique_ptr<NumberNode> ExpressionParser2::ReadNumber() {
-  size_t numberStartPosition = GetCurrentPosition();
-  SkipAllWhitespaces();
+  SkipWhitespace();
   gd::String parsedNumber;
 
   bool numberHasStarted = false;
   bool digitFound = false;
   bool dotFound = false;
   while (!IsEndReached()) {
-    if (CheckIfChar(IsZeroDigit)) {
+    if (IsAnyChar("0")) {
       numberHasStarted = true;
       digitFound = true;
-      if (!parsedNumber.empty()) {  // Ignore leading 0s.
+      if (!parsedNumber.empty()) { // Ignore leading 0s.
         parsedNumber += GetCurrentChar();
       }
-    } else if (CheckIfChar(IsNonZeroDigit)) {
+    } else if (IsAnyChar("123456789")) {
       numberHasStarted = true;
       digitFound = true;
       parsedNumber += GetCurrentChar();
-    } else if (CheckIfChar(IsDot) && !dotFound) {
+    } else if (IsAnyChar(".") && !dotFound) {
       numberHasStarted = true;
       dotFound = true;
       if (parsedNumber == "") {
-        parsedNumber +=
-            "0.";  // Normalize by adding a leading 0, only in this case.
+        parsedNumber += "0."; //Normalize by adding a leading 0, only in this case.
       } else {
         parsedNumber += ".";
       }
@@ -246,8 +209,6 @@ std::unique_ptr<NumberNode> ExpressionParser2::ReadNumber() {
   // valid in most languages so we allow this.
 
   auto number = gd::make_unique<NumberNode>(parsedNumber);
-  number->location =
-      ExpressionParserLocation(numberStartPosition, GetCurrentPosition());
   if (!numberHasStarted || !digitFound) {
     number->diagnostic = RaiseSyntaxError(
         _("A number was expected. You must enter a number here."));

Core/GDCore/Events/Parsers/ExpressionParser2Node.h

@@ -8,7 +8,6 @@
 
 #include <memory>
 #include <vector>
-
 #include "ExpressionParser2NodeWorker.h"
 #include "GDCore/String.h"
 namespace gd {
@@ -21,24 +20,6 @@ class ExpressionMetadata;
 
 namespace gd {
 
-struct ExpressionParserLocation {
-  ExpressionParserLocation() : isValid(false){};
-  ExpressionParserLocation(size_t position)
-      : isValid(true), startPosition(position), endPosition(position){};
-  ExpressionParserLocation(size_t startPosition_, size_t endPosition_)
-      : isValid(true),
-        startPosition(startPosition_),
-        endPosition(endPosition_){};
-  size_t GetStartPosition() const { return startPosition; }
-  size_t GetEndPosition() const { return endPosition; }
-  bool IsValid() const { return isValid; }
-
- private:
-  bool isValid;
-  size_t startPosition;
-  size_t endPosition;
-};
-
 /**
  * \brief A diagnostic that can be attached to a gd::ExpressionNode.
  */
@@ -59,25 +40,30 @@ struct ExpressionParserError : public ExpressionParserDiagnostic {
   ExpressionParserError(const gd::String &type_,
                         const gd::String &message_,
                         size_t position_)
-      : type(type_), message(message_), location(position_){};
+      : type(type_),
+        message(message_),
+        startPosition(position_),
+        endPosition(position_){};
   ExpressionParserError(const gd::String &type_,
                         const gd::String &message_,
                         size_t startPosition_,
                         size_t endPosition_)
       : type(type_),
         message(message_),
-        location(startPosition_, endPosition_){};
+        startPosition(startPosition_),
+        endPosition(endPosition_){};
   virtual ~ExpressionParserError(){};
 
   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(); }
+  size_t GetStartPosition() override { return startPosition; }
+  size_t GetEndPosition() override { return endPosition; }
 
  private:
   gd::String type;
   gd::String message;
-  ExpressionParserLocation location;
+  size_t startPosition;
+  size_t endPosition;
 };
 
 /**
@@ -85,28 +71,15 @@ struct ExpressionParserError : public ExpressionParserDiagnostic {
  * an expression inherits from.
  */
 struct ExpressionNode {
-  ExpressionNode(const gd::String &type_) : type(type_){};
   virtual ~ExpressionNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker){};
 
   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
-                                      /// function can store the position of the
-                                      /// object name, the dot, the function
-                                      /// name, etc...
-
-  gd::String type;  // Actual type of the node.
-                    // "string", "number", type supported by
-                    // gd::ParameterMetadata::IsObject, types supported by
-                    // gd::ParameterMetadata::IsExpression or "unknown".
 };
 
 struct SubExpressionNode : public ExpressionNode {
-  SubExpressionNode(const gd::String &type_,
-                    std::unique_ptr<ExpressionNode> expression_)
-      : ExpressionNode(type_), expression(std::move(expression_)){};
+  SubExpressionNode(std::unique_ptr<ExpressionNode> expression_)
+      : expression(std::move(expression_)){};
   virtual ~SubExpressionNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitSubExpressionNode(*this);
@@ -119,8 +92,6 @@ struct SubExpressionNode : public ExpressionNode {
  * \brief An operator node. For example: "lhs + rhs".
  */
 struct OperatorNode : public ExpressionNode {
-  OperatorNode(const gd::String &type_, gd::String::value_type op_)
-      : ExpressionNode(type_), op(op_){};
   virtual ~OperatorNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitOperatorNode(*this);
@@ -135,8 +106,7 @@ struct OperatorNode : public ExpressionNode {
  * \brief A unary operator node. For example: "-2".
  */
 struct UnaryOperatorNode : public ExpressionNode {
-  UnaryOperatorNode(const gd::String &type_, gd::String::value_type op_)
-      : ExpressionNode(type_), op(op_){};
+  UnaryOperatorNode(gd::String::value_type op_) : op(op_){};
   virtual ~UnaryOperatorNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitUnaryOperatorNode(*this);
@@ -148,26 +118,22 @@ struct UnaryOperatorNode : public ExpressionNode {
 
 /**
  * \brief A number node. For example: "123".
- * Its `type` is always "number".
  */
 struct NumberNode : public ExpressionNode {
-  NumberNode(const gd::String &number_)
-      : ExpressionNode("number"), number(number_){};
+  NumberNode(const gd::String &number_) : number(number_){};
   virtual ~NumberNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitNumberNode(*this);
   };
 
-  //
   gd::String number;
 };
 
 /**
  * \brief A text node. For example: "Hello World".
- * Its `type` is always "string".
  */
 struct TextNode : public ExpressionNode {
-  TextNode(const gd::String &text_) : ExpressionNode("string"), text(text_){};
+  TextNode(const gd::String &text_) : text(text_){};
   virtual ~TextNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitTextNode(*this);
@@ -177,8 +143,6 @@ struct TextNode : public ExpressionNode {
 };
 
 struct VariableAccessorOrVariableBracketAccessorNode : public ExpressionNode {
-  VariableAccessorOrVariableBracketAccessorNode() : ExpressionNode(""){};
-
   std::unique_ptr<VariableAccessorOrVariableBracketAccessorNode> child;
 };
 
@@ -194,19 +158,18 @@ struct VariableNode : public ExpressionNode {
   VariableNode(const gd::String &type_,
                const gd::String &name_,
                const gd::String &objectName_)
-      : ExpressionNode(type_), name(name_), objectName(objectName_){};
+      : type(type_), name(name_), objectName(objectName_){};
   virtual ~VariableNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitVariableNode(*this);
   };
 
+  gd::String type;
   gd::String name;
   gd::String objectName;
 
   std::unique_ptr<VariableAccessorOrVariableBracketAccessorNode>
       child;  // Can be nullptr if no accessor
-
-  ExpressionParserLocation nameLocation;
 };
 
 /**
@@ -222,8 +185,6 @@ struct VariableAccessorNode
   };
 
   gd::String name;
-  ExpressionParserLocation nameLocation;
-  ExpressionParserLocation dotLocation;
 };
 
 /**
@@ -242,174 +203,92 @@ struct VariableBracketAccessorNode
   std::unique_ptr<ExpressionNode> expression;
 };
 
-struct IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode
-    : public ExpressionNode {
-  IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode(
-      const gd::String &type)
-      : ExpressionNode(type){};
-};
+struct IdentifierOrFunctionOrEmptyNode : public ExpressionNode {};
 
 /**
- * \brief An identifier node, usually representing an object or a function name.
+ * \brief An identifier node, usually representing an object.
  */
-struct IdentifierNode
-    : public IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode {
+struct IdentifierNode : public IdentifierOrFunctionOrEmptyNode {
   IdentifierNode(const gd::String &identifierName_, const gd::String &type_)
-      : IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode(type_),
-        identifierName(identifierName_){};
+      : identifierName(identifierName_), type(type_){};
   virtual ~IdentifierNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitIdentifierNode(*this);
   };
 
   gd::String identifierName;
+  gd::String type;
 };
 
-struct FunctionCallOrObjectFunctionNameOrEmptyNode
-    : public IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode {
-  FunctionCallOrObjectFunctionNameOrEmptyNode(const gd::String &type)
-      : IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode(type){};
-  virtual ~FunctionCallOrObjectFunctionNameOrEmptyNode(){};
+struct FunctionOrEmptyNode : public IdentifierOrFunctionOrEmptyNode {
+  virtual ~FunctionOrEmptyNode(){};
   void Visit(ExpressionParser2NodeWorker &worker) override{};
 };
 
 /**
- * \brief The name of a function to call on an object or the behavior
- * For example: "MyObject.Function" or "MyObject.Physics" or
- * "MyObject.Physics::LinearVelocity".
+ * \brief A function node. For example: "MyExtension::MyFunction(1, 2)".
  */
-struct ObjectFunctionNameNode
-    : public FunctionCallOrObjectFunctionNameOrEmptyNode {
-  ObjectFunctionNameNode(const gd::String &type_,
-                         const gd::String &objectName_,
-                         const gd::String &objectFunctionOrBehaviorName_)
-      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_),
-        objectName(objectName_),
-        objectFunctionOrBehaviorName(objectFunctionOrBehaviorName_) {}
-  ObjectFunctionNameNode(const gd::String &type_,
-                         const gd::String &objectName_,
-                         const gd::String &behaviorName_,
-                         const gd::String &behaviorFunctionName_)
-      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_),
-        objectName(objectName_),
-        objectFunctionOrBehaviorName(behaviorName_),
-        behaviorFunctionName(behaviorFunctionName_) {}
-  virtual ~ObjectFunctionNameNode(){};
-  virtual void Visit(ExpressionParser2NodeWorker &worker) {
-    worker.OnVisitObjectFunctionNameNode(*this);
-  };
-
-  gd::String objectName;
-  gd::String objectFunctionOrBehaviorName;  ///< Behavior name if
-                                            ///`behaviorFunctionName` is not
-                                            /// empty.
-  gd::String behaviorFunctionName;          ///< If empty, then
-                                    /// objectFunctionOrBehaviorName is filled
-                                    /// with the behavior name.
-
-  ExpressionParserLocation
-      objectNameLocation;  ///< Location of the object name.
-  ExpressionParserLocation
-      objectNameDotLocation;  ///< Location of the "." after the object name.
-  ExpressionParserLocation objectFunctionOrBehaviorNameLocation;  ///< Location
-                                                                  /// of object
-                                                                  /// function
-                                                                  /// name or
-                                                                  /// behavior
-                                                                  /// name.
-  ExpressionParserLocation
-      behaviorNameNamespaceSeparatorLocation;  ///< Location of the "::"
-                                               /// separator, if any.
-  ExpressionParserLocation behaviorFunctionNameLocation;  ///< Location of the
-                                                          /// behavior function
-                                                          /// name, if any.
-};
-
-/**
- * \brief A function call node (either free function, object function or object
- * behavior function).
- * For example: "MyExtension::MyFunction(1, 2)", "MyObject.Function()" or
- * "MyObject.Physics::LinearVelocity()".
- */
-struct FunctionCallNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
-  /** \brief Construct a free function call node. */
-  FunctionCallNode(const gd::String &type_,
-                   std::vector<std::unique_ptr<ExpressionNode>> parameters_,
-                   const ExpressionMetadata &expressionMetadata_,
-                   const gd::String &functionName_)
-      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_),
+struct FunctionNode : public FunctionOrEmptyNode {
+  FunctionNode(const gd::String &type_,
+               std::vector<std::unique_ptr<ExpressionNode>> parameters_,
+               const ExpressionMetadata &expressionMetadata_,
+               const gd::String &functionName_)
+      : type(type_),
         parameters(std::move(parameters_)),
         expressionMetadata(expressionMetadata_),
         functionName(functionName_){};
-
-  /** \brief Construct an object function call node. */
-  FunctionCallNode(const gd::String &type_,
-                   const gd::String &objectName_,
-                   std::vector<std::unique_ptr<ExpressionNode>> parameters_,
-                   const ExpressionMetadata &expressionMetadata_,
-                   const gd::String &functionName_)
-      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_),
+  FunctionNode(const gd::String &type_,
+               const gd::String &objectName_,
+               std::vector<std::unique_ptr<ExpressionNode>> parameters_,
+               const ExpressionMetadata &expressionMetadata_,
+               const gd::String &functionName_)
+      : type(type_),
         objectName(objectName_),
         parameters(std::move(parameters_)),
         expressionMetadata(expressionMetadata_),
         functionName(functionName_){};
-
-  /** \brief Construct a behavior function call node. */
-  FunctionCallNode(const gd::String &type_,
-                   const gd::String &objectName_,
-                   const gd::String &behaviorName_,
-                   std::vector<std::unique_ptr<ExpressionNode>> parameters_,
-                   const ExpressionMetadata &expressionMetadata_,
-                   const gd::String &functionName_)
-      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_),
+  FunctionNode(const gd::String &type_,
+               const gd::String &objectName_,
+               const gd::String &behaviorName_,
+               std::vector<std::unique_ptr<ExpressionNode>> parameters_,
+               const ExpressionMetadata &expressionMetadata_,
+               const gd::String &functionName_)
+      : type(type_),
         objectName(objectName_),
         behaviorName(behaviorName_),
         parameters(std::move(parameters_)),
         expressionMetadata(expressionMetadata_),
         functionName(functionName_){};
-  virtual ~FunctionCallNode(){};
+  virtual ~FunctionNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
-    worker.OnVisitFunctionCallNode(*this);
+    worker.OnVisitFunctionNode(*this);
   };
 
+  gd::String type;  // This could be removed if the type ("string" or "number")
+                    // was stored in ExpressionMetadata.
   gd::String objectName;
   gd::String behaviorName;
   std::vector<std::unique_ptr<ExpressionNode>> parameters;
   const ExpressionMetadata &expressionMetadata;
   gd::String functionName;
-
-  ExpressionParserLocation
-      functionNameLocation;  ///< Location of the function name.
-  ExpressionParserLocation
-      objectNameLocation;  ///< Location of the object name, if any.
-  ExpressionParserLocation
-      objectNameDotLocation;  ///< Location of the "." after the object name.
-  ExpressionParserLocation
-      behaviorNameLocation;  ///< Location of the behavior name, if any.
-  ExpressionParserLocation
-      behaviorNameNamespaceSeparatorLocation;  ///< Location of the "::"
-                                               /// separator, if any.
-  ExpressionParserLocation
-      openingParenthesisLocation;  ///< Location of the "(".
-  ExpressionParserLocation
-      closingParenthesisLocation;  ///< Location of the ")".
 };
 
 /**
  * \brief An empty node, used when parsing failed/a syntax error was
  * encountered and any other node could not make sense.
  */
-struct EmptyNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
+struct EmptyNode : public FunctionOrEmptyNode {
   EmptyNode(const gd::String &type_, const gd::String &text_ = "")
-      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_), text(text_){};
+      : type(type_), text(text_){};
   virtual ~EmptyNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitEmptyNode(*this);
   };
 
+  gd::String type;
   gd::String text;
 };
 
 }  // namespace gd
 
-#endif
+#endif

Core/GDCore/Events/Parsers/ExpressionParser2NodePrinter.h

@@ -92,15 +92,7 @@ class GD_CORE_API ExpressionParser2NodePrinter
   void OnVisitIdentifierNode(IdentifierNode& node) override {
     output += node.identifierName;
   }
-  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {
-    if (!node.behaviorFunctionName.empty()) {
-      output +=
-          node.objectName + "." + node.objectFunctionOrBehaviorName + "::" + node.behaviorFunctionName;
-    } else {
-      output += node.objectName + "." + node.objectFunctionOrBehaviorName;
-    }
-  };
-  void OnVisitFunctionCallNode(FunctionCallNode& node) override {
+  void OnVisitFunctionNode(FunctionNode& node) override {
     if (!node.behaviorName.empty()) {
       output +=
           node.objectName + "." + node.behaviorName + "::" + node.functionName;

Core/GDCore/Events/Parsers/ExpressionParser2NodeWorker.h

@@ -16,11 +16,10 @@ class TextNode;
 class VariableNode;
 class VariableAccessorNode;
 class VariableBracketAccessorNode;
-class IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode;
+class IdentifierOrFunctionOrEmptyNode;
 class IdentifierNode;
-class FunctionCallOrObjectFunctionNameOrEmptyNode;
-class ObjectFunctionNameNode;
-class FunctionCallNode;
+class FunctionOrEmptyNode;
+class FunctionNode;
 class EmptyNode;
 }  // namespace gd
 
@@ -43,11 +42,10 @@ class GD_CORE_API ExpressionParser2NodeWorker {
   friend class VariableNode;
   friend class VariableAccessorNode;
   friend class VariableBracketAccessorNode;
-  friend class IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode;
+  friend class IdentifierOrFunctionOrEmptyNode;
   friend class IdentifierNode;
-  friend class FunctionCallOrObjectFunctionNameOrEmptyNode;
-  friend class ObjectFunctionNameNode;
-  friend class FunctionCallNode;
+  friend class FunctionOrEmptyNode;
+  friend class FunctionNode;
   friend class EmptyNode;
 
  public:
@@ -64,11 +62,10 @@ class GD_CORE_API ExpressionParser2NodeWorker {
   virtual void OnVisitVariableBracketAccessorNode(
       VariableBracketAccessorNode& node) = 0;
   virtual void OnVisitIdentifierNode(IdentifierNode& node) = 0;
-  virtual void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) = 0;
-  virtual void OnVisitFunctionCallNode(FunctionCallNode& node) = 0;
+  virtual void OnVisitFunctionNode(FunctionNode& node) = 0;
   virtual void OnVisitEmptyNode(EmptyNode& node) = 0;
 };
 
 }  // namespace gd
 
-#endif
+#endif

Core/GDCore/Events/Parsers/VariableParser.cpp

@@ -0,0 +1,141 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "GDCore/Events/Parsers/VariableParser.h"
+#include <vector>
+#include "GDCore/String.h"
+namespace gd {
+class Layout;
+}
+namespace gd {
+class Project;
+}
+namespace gd {
+class Platform;
+}
+#include "GDCore/Tools/Localization.h"
+
+namespace gd {
+
+VariableParser::~VariableParser() {}
+
+bool VariableParser::Parse(VariableParserCallbacks& callbacks_) {
+  callbacks = &callbacks_;
+  rootVariableParsed = false;
+  firstErrorStr.clear();
+  firstErrorPos = 0;
+  currentPositionIt = expression.begin();
+  currentTokenType = TS_INVALID;
+  currentToken.clear();
+  S();
+
+  return firstErrorStr == "";
+}
+
+void VariableParser::ReadToken() {
+  currentTokenType = TS_INVALID;
+  currentToken.clear();
+  while (currentPositionIt != expression.end()) {
+    char32_t currentChar = *currentPositionIt;
+    if (currentChar == U'[' || currentChar == U']' || currentChar == U'.') {
+      if (currentTokenType == TS_VARNAME)
+        return;  // We've parsed a variable name.
+    }
+
+    if (currentChar == U'[') {
+      currentTokenType = TS_OPENING_BRACKET;
+      currentToken.clear();
+      ++currentPositionIt;
+      return;
+    } else if (currentChar == U']') {
+      currentTokenType = TS_CLOSING_BRACKET;
+      currentToken.clear();
+      ++currentPositionIt;
+      return;
+    } else if (currentChar == U'.') {
+      currentTokenType = TS_PERIOD;
+      currentToken.clear();
+      ++currentPositionIt;
+      return;
+    }
+
+    currentTokenType = TS_VARNAME;  // We're parsing a variable name.
+    currentToken.push_back(currentChar);
+    ++currentPositionIt;
+  }
+
+  // Can be reached if we are at the end of the expression. In this case,
+  // currentTokenType will be either TS_VARNAME or TS_INVALID.
+}
+
+void VariableParser::S() {
+  ReadToken();
+  if (currentTokenType != TS_VARNAME) {
+    firstErrorStr = _("Expecting a variable name.");
+    firstErrorPos = std::distance<gd::String::const_iterator>(
+        expression.begin(), currentPositionIt);
+    return;
+  }
+
+  if (!rootVariableParsed) {
+    rootVariableParsed = true;
+    if (callbacks) callbacks->OnRootVariable(currentToken);
+  } else if (callbacks)
+    callbacks->OnChildVariable(currentToken);
+
+  X();
+}
+
+void VariableParser::X() {
+  ReadToken();
+  if (currentTokenType == TS_INVALID)
+    return;  // Ended parsing.
+  else if (currentTokenType == TS_PERIOD)
+    S();
+  else if (currentTokenType == TS_OPENING_BRACKET) {
+    gd::String strExpr = SkipStringExpression();
+
+    ReadToken();
+    if (currentTokenType != TS_CLOSING_BRACKET) {
+      firstErrorStr = _("Expecting ]");
+      firstErrorPos = std::distance<gd::String::const_iterator>(
+          expression.begin(), currentPositionIt);
+      return;
+    }
+    if (callbacks) callbacks->OnChildSubscript(strExpr);
+    X();
+  }
+}
+
+gd::String VariableParser::SkipStringExpression() {
+  gd::String stringExpression;
+  bool insideStringLiteral = false;
+  bool lastCharacterWasBackslash = false;
+  unsigned int nestedBracket = 0;
+  while (currentPositionIt != expression.end()) {
+    char32_t currentChar = *currentPositionIt;
+    if (currentChar == U'\"') {
+      if (!insideStringLiteral)
+        insideStringLiteral = true;
+      else if (!lastCharacterWasBackslash)
+        insideStringLiteral = false;
+    } else if (currentChar == U'[' && !insideStringLiteral) {
+      nestedBracket++;
+    } else if (currentChar == U']' && !insideStringLiteral) {
+      if (nestedBracket == 0)
+        return stringExpression;  // Found the end of the string litteral.
+      nestedBracket--;
+    }
+
+    lastCharacterWasBackslash = currentChar == U'\\';
+    stringExpression.push_back(currentChar);
+    ++currentPositionIt;
+  }
+
+  // End of the expression reached (so expression is invalid by the way)
+  return stringExpression;
+}
+
+}  // namespace gd

Core/GDCore/Events/Parsers/VariableParser.h

@@ -0,0 +1,148 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef GDCORE_VARIABLEPARSER_H
+#define GDCORE_VARIABLEPARSER_H
+
+#include <vector>
+#include "GDCore/String.h"
+namespace gd {
+class Layout;
+}
+namespace gd {
+class Project;
+}
+namespace gd {
+class Platform;
+}
+namespace gd {
+class VariableParserCallbacks;
+}
+
+namespace gd {
+
+/** \brief Parse a variable expression.
+ *
+ * Parse an variable expression ( like
+myVariable.child["subchild"+ToString(i)].subsubchild ),
+ * calling callbacks when a token is reached.
+ *
+ * Usage example:
+\code
+    //...
+
+    //VariableCodeGenerationCallbacks is a class inheriting from
+gd::VariableParserCallbacks VariableCodeGenerationCallbacks callbacks(output,
+*this, context, VariableCodeGenerationCallbacks::PROJECT_VARIABLE);
+
+    gd::VariableParser parser(parameter);
+    if ( !parser.Parse(callbacks) )
+        cout << "Error :" << parser.GetFirstError() << " in: "<< parameter <<
+endl;
+\endcode
+ *
+ * Here is the parsed grammar:   <br>
+ * S -> VarName X  <br>
+ * X -> e | . S | [StringExpression] X   <br>
+ *
+ * where e = nothing (end of expression), StringExpression = A valid string
+expression and
+ * S is the start.
+ *
+ * \see gd::VariableParserCallbacks
+ */
+class GD_CORE_API VariableParser {
+ public:
+  /**
+   * \brief Default constructor
+   * \param expressionPlainString The string representing the expression to be
+   * parsed.
+   */
+  VariableParser(const gd::String& expressionPlainString_)
+      : currentPositionIt(), expression(expressionPlainString_){};
+  virtual ~VariableParser();
+
+  /**
+   * Parse the expression, calling each callback when necessary.
+   * \param callbacks The callbacks to be called.
+   * \return true if expression was correctly parsed.
+   * \see gd::VariableParserCallbacks
+   */
+  bool Parse(VariableParserCallbacks& callbacks);
+
+  /**
+   * \brief Return the description of the error that was found
+   */
+  const gd::String& GetFirstError() { return firstErrorStr; }
+
+  /**
+   * \brief Return the position of the error that was found
+   * \return The position, or gd::String::npos if no error is found
+   */
+  size_t GetFirstErrorPosition() { return firstErrorPos; }
+
+  gd::String firstErrorStr;
+  size_t firstErrorPos;
+
+ private:
+  void S();
+  void X();
+
+  /**
+   * \brief Skip the string expression, starting from the current position.
+   * \return The string expression skipped. currentPosition is now put on the
+   * closing bracket.
+   */
+  gd::String SkipStringExpression();
+
+  void ReadToken();
+
+  enum TokenType {
+    TS_PERIOD,
+    TS_OPENING_BRACKET,
+    TS_CLOSING_BRACKET,
+    TS_VARNAME,
+    TS_INVALID
+  };
+
+  TokenType currentTokenType;
+  gd::String currentToken;
+  gd::String::const_iterator currentPositionIt;
+  gd::String expression;
+
+  VariableParserCallbacks* callbacks;
+  bool rootVariableParsed;
+};
+
+/**
+ * \brief Callbacks called by VariableParser when parsing a variable expression.
+ */
+class GD_CORE_API VariableParserCallbacks {
+ public:
+  /**
+   * \brief Called when the first variable has been parsed. ( varName1 in
+   * varName1.child for example. ) \param variableName The variable name.
+   */
+  virtual void OnRootVariable(gd::String variableName) = 0;
+
+  /**
+   * \brief Called when accessing the child of a structure variable. ( child in
+   * varName1.child for example. ) \param variableName The child variable name.
+   */
+  virtual void OnChildVariable(gd::String variableName) = 0;
+
+  /**
+   * \brief Called when accessing the child of a structure variable using a
+   * string expression in square brackets. ( "subscript" in
+   * varName1["subscript"] for example. )
+   *
+   * \param variableName The expression used to access the child variable.
+   */
+  virtual void OnChildSubscript(gd::String stringExpression) = 0;
+};
+
+}  // namespace gd
+
+#endif  // GDEXPRESSIONPARSER_H

Core/GDCore/Events/Tools/EventsCodeNameMangler.cpp

@@ -8,15 +8,10 @@
 #include "GDCore/CommonTools.h"
 #include "GDCore/String.h"
 
-EventsCodeNameMangler *EventsCodeNameMangler::_singleton = nullptr;
+EventsCodeNameMangler *EventsCodeNameMangler::_singleton = NULL;
 
-const gd::String& EventsCodeNameMangler::GetMangledObjectsListName(
+gd::String EventsCodeNameMangler::GetMangledObjectsListName(
     const gd::String &originalObjectName) {
-  auto it = mangledObjectNames.find(originalObjectName);
-  if (it != mangledObjectNames.end()) {
-    return it->second;
-  }
-
   gd::String partiallyMangledName = originalObjectName;
   static const gd::String allowedCharacters =
       "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
@@ -32,17 +27,11 @@ const gd::String& EventsCodeNameMangler::GetMangledObjectsListName(
     }
   }
 
-  mangledObjectNames[originalObjectName] = "GD" + partiallyMangledName + "Objects";
-  return mangledObjectNames[originalObjectName];
+  return "GD" + partiallyMangledName + "Objects";
 }
 
-const gd::String& EventsCodeNameMangler::GetExternalEventsFunctionMangledName(
+gd::String EventsCodeNameMangler::GetExternalEventsFunctionMangledName(
     const gd::String &externalEventsName) {
-  auto it = mangledExternalEventsNames.find(externalEventsName);
-  if (it != mangledExternalEventsNames.end()) {
-    return it->second;
-  }
-
   gd::String partiallyMangledName = externalEventsName;
   static const gd::String allowedCharacters =
       "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
@@ -58,24 +47,23 @@ const gd::String& EventsCodeNameMangler::GetExternalEventsFunctionMangledName(
     }
   }
 
-  mangledExternalEventsNames[externalEventsName] = "GDExternalEvents" + partiallyMangledName;
-  return mangledExternalEventsNames[externalEventsName];
+  return "GDExternalEvents" + partiallyMangledName;
 }
 
-const gd::String& ManObjListName(const gd::String &objectName) {
+gd::String ManObjListName(const gd::String &objectName) {
   return EventsCodeNameMangler::Get()->GetMangledObjectsListName(objectName);
 }
 
 EventsCodeNameMangler *EventsCodeNameMangler::Get() {
-  if (nullptr == _singleton) _singleton = new EventsCodeNameMangler;
+  if (NULL == _singleton) _singleton = new EventsCodeNameMangler;
 
   return (static_cast<EventsCodeNameMangler *>(_singleton));
 }
 
 void EventsCodeNameMangler::DestroySingleton() {
-  if (nullptr != _singleton) {
+  if (NULL != _singleton) {
     delete _singleton;
-    _singleton = nullptr;
+    _singleton = NULL;
   }
 }
 

Core/GDCore/Events/Tools/EventsCodeNameMangler.h

@@ -6,34 +6,26 @@
 #if defined(GD_IDE_ONLY)
 #ifndef EVENTSCODENAMEMANGLER_H
 #define EVENTSCODENAMEMANGLER_H
-#include <unordered_map>
 #include "GDCore/String.h"
 
 /**
- * \brief Mangle object names, so as to ensure all names used in code are valid.
+ * Manage name mangling, so as to ensure all names used in code are valid.
  *
  * \see ManObjListName
  */
 class GD_CORE_API EventsCodeNameMangler {
  public:
   /**
-   * Get the mangled name from a name: All characters that are not 0-9, a-z,
+   * Get the mangled name from a name : All characters that are not 0-9, a-z,
    * A-Z or _ are replaced by "_"+AsciiCodeOfTheCharacter.
-   *
-   * The mangled name is memoized as this is intensively used during project
-   * export and events code generation.
    */
-  const gd::String &GetMangledObjectsListName(
-      const gd::String &originalObjectName);
+  gd::String GetMangledObjectsListName(const gd::String &originalObjectName);
 
   /**
    * Get the mangled function name to be used to call external events named \a
    * externalEventsName.
-   *
-   * The mangled name is memoized as this is intensively used during project
-   * export and events code generation.
    */
-  const gd::String &GetExternalEventsFunctionMangledName(
+  gd::String GetExternalEventsFunctionMangledName(
       const gd::String &externalEventsName);
 
   static EventsCodeNameMangler *Get();
@@ -43,22 +35,14 @@ class GD_CORE_API EventsCodeNameMangler {
   EventsCodeNameMangler(){};
   virtual ~EventsCodeNameMangler(){};
   static EventsCodeNameMangler *_singleton;
-
-  std::unordered_map<gd::String, gd::String>
-      mangledObjectNames;  ///< Memoized results of mangling for objects
-  std::unordered_map<gd::String, gd::String>
-      mangledExternalEventsNames;  ///< Memoized results of mangling for
-                                   /// external events
 };
 
 /**
- * Shortcut for
- * `EventsCodeNameMangler::Get()->GetMangledObjectsListName(objectName)`.
- *
- * \see EventsCodeNameMangler
- * \return Mangled object name
+ * Shortcut to
+ * EventsCodeNameMangler::Get()->GetMangledObjectsListName(objectName). \see
+ * EventsCodeNameMangler \return Mangled object name
  */
-const gd::String &GD_CORE_API ManObjListName(const gd::String &objectName);
+gd::String GD_CORE_API ManObjListName(const gd::String &objectName);
 
 #endif  // EVENTSCODENAMEMANGLER_H
 #endif

Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp

@@ -14,7 +14,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
   extension.SetExtensionInformation(
       "BuiltinAdvanced",
       _("Advanced control features"),
-      _("Advanced control features to be used in events."),
+      _("Built-in extension providing advanced control features."),
       "Florian Rival",
       "Open source (MIT License)");
 
@@ -73,20 +73,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
       .AddParameter("trueorfalse", "Should the condition be true or false?")
       .MarkAsAdvanced();
 
-  extension
-      .AddCondition("GetArgumentAsBoolean",
-                    _("Check if a function parameter is set to true (or yes)"),
-                    _("Check if the specified function parameter (also called "
-                      "\"argument\") is set to True or Yes. If the argument is "
-                      "a string, an empty string is considered as \"false\". "
-                      "If it's a number, 0 is considered as \"false\"."),
-                    _("Parameter _PARAM0_ is true"),
-                    _("Functions"),
-                    "res/function24.png",
-                    "res/function16.png")
-      .AddParameter("string", "Parameter name")
-      .MarkAsAdvanced();
-
   extension
       .AddExpression(
           "GetArgumentAsNumber",

Core/GDCore/Extensions/Builtin/AudioExtension.cpp

@@ -12,13 +12,11 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation(
-          "BuiltinAudio",
-          _("Audio"),
-          _("GDevelop provides several conditions and actions to play audio "
-            "files. They can be either long musics or short sound effects."),
-          "Florian Rival",
-          "Open source (MIT License)")
+      .SetExtensionInformation("BuiltinAudio",
+                               _("Audio"),
+                               _("Builtin audio extension"),
+                               "Florian Rival",
+                               "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/audio");
 
 #if defined(GD_IDE_ONLY)
@@ -37,11 +35,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
       .AddParameter("expression", _("Channel identifier"))
       .AddParameter("yesorno", _("Repeat the sound"), "", true)
       .SetDefaultValue("no")
-      .AddParameter("expression", _("Volume"), "", true)
-      .SetParameterLongDescription(_("From 0 to 100, 100 by default."))
+      .AddParameter(
+          "expression", _("Volume (from 0 to 100, 100 by default)"), "", true)
       .SetDefaultValue("100")
-      .AddParameter("expression", _("Pitch (speed)"), "", true)
-      .SetParameterLongDescription(_("1 by default."))
+      .AddParameter("expression", _("Pitch (speed) (1 by default)"), "", true)
       .SetDefaultValue("1")
       .MarkAsAdvanced();
 
@@ -96,11 +93,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
       .AddParameter("expression", _("Channel identifier"))
       .AddParameter("yesorno", _("Repeat the sound"), "", true)
       .SetDefaultValue("no")
-      .AddParameter("expression", _("Volume"), "", true)
-      .SetParameterLongDescription(_("From 0 to 100, 100 by default."))
+      .AddParameter(
+          "expression", _("Volume (from 0 to 100, 100 by default)"), "", true)
       .SetDefaultValue("100")
-      .AddParameter("expression", _("Pitch (speed)"), "", true)
-      .SetParameterLongDescription(_("1 by default."))
+      .AddParameter("expression", _("Pitch (speed) (1 by default)"), "", true)
       .SetDefaultValue("1")
       .MarkAsAdvanced();
 
@@ -145,97 +141,117 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("Volume of the sound on a channel"),
                  _("This action modifies the volume of the sound on the "
                    "specified channel. The volume is between 0 and 100."),
-                 _("the volume of the sound on channel _PARAM1_"),
+                 _("Do _PARAM2__PARAM3_ to the volume of the sound on channel "
+                   "_PARAM1_"),
                  _("Audio/Sounds on channels"),
                  "res/actions/sonVolume24.png",
                  "res/actions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("Value"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   extension
       .AddAction("ModVolumeMusicCanal",
                  _("Volume of the music on a channel"),
                  _("This action modifies the volume of the music on the "
                    "specified channel. The volume is between 0 and 100."),
-                 _("the volume of the music on channel _PARAM1_"),
+                 _("Do _PARAM2__PARAM3_ to the volume of the music on channel "
+                   "_PARAM1_"),
                  _("Audio/Music on channels"),
                  "res/actions/musicVolume24.png",
                  "res/actions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("Value"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   extension
       .AddAction("ModGlobalVolume",
                  _("Game global volume"),
                  _("This action modifies the global volume of the game. The "
                    "volume is between 0 and 100."),
-                 _("the global sound level"),
+                 _("Do _PARAM1__PARAM2_ to global sound level"),
                  _("Audio"),
                  "res/actions/volume24.png",
                  "res/actions/volume.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardOperatorParameters("number")
-      .MarkAsSimple();
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("Value"))
+      .MarkAsSimple()
+      .SetManipulatedType("number");
 
   extension
       .AddAction("ModPitchSoundChannel",
                  _("Pitch of the sound of a channel"),
                  _("This action modifies the pitch (speed) of the sound on a "
                    "channel.\n1 is the default pitch."),
-                 _("the pitch of the sound on channel _PARAM1_"),
+                 _("Do _PARAM2__PARAM3_ to the pitch of the sound on channel "
+                   "_PARAM1_"),
                  _("Audio/Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("Value"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   extension
       .AddAction("ModPitchMusicChannel",
                  _("Pitch of the music on a channel"),
                  _("This action modifies the pitch of the music on the "
                    "specified channel. 1 is the default pitch"),
-                 _("the pitch of the music on channel _PARAM1_"),
+                 _("Do _PARAM2__PARAM3_ to the pitch of the music on channel "
+                   "_PARAM1_"),
                  _("Audio/Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("Value"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   extension
       .AddAction("ModPlayingOffsetSoundChannel",
                  _("Playing offset of the sound on a channel"),
                  _("This action modifies the playing offset of the sound on a "
                    "channel"),
-                 _("the playing offset of the sound on channel _PARAM1_"),
+                 _("Do _PARAM2__PARAM3_ to the playing offset of the sound on "
+                   "channel _PARAM1_"),
                  _("Audio/Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("Value"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   extension
       .AddAction("ModPlayingOffsetMusicChannel",
                  _("Playing offset of the music on a channel"),
                  _("This action modifies the playing offset of the music on "
                    "the specified channel"),
-                 _("the playing offset of the music on channel _PARAM1_"),
+                 _("Do _PARAM2__PARAM3_ to the playing offset of the music on "
+                   "channel _PARAM1_"),
                  _("Audio/Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("Value"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   extension
       .AddAction("PlaySound",
@@ -249,11 +265,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
       .AddParameter("soundfile", _("Audio file (or audio resource name)"))
       .AddParameter("yesorno", _("Repeat the sound"), "", true)
       .SetDefaultValue("no")
-      .AddParameter("expression", _("Volume"), "", true)
-      .SetParameterLongDescription(_("From 0 to 100, 100 by default."))
+      .AddParameter(
+          "expression", _("Volume (from 0 to 100, 100 by default)"), "", true)
       .SetDefaultValue("100")
-      .AddParameter("expression", _("Pitch (speed)"), "", true)
-      .SetParameterLongDescription(_("1 by default."))
+      .AddParameter("expression", _("Pitch (speed) (1 by default)"), "", true)
       .SetDefaultValue("1")
       .MarkAsSimple();
 
@@ -269,82 +284,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
       .AddParameter("musicfile", _("Audio file (or audio resource name)"))
       .AddParameter("yesorno", _("Repeat the sound"), "", true)
       .SetDefaultValue("no")
-      .AddParameter("expression", _("Volume"), "", true)
-      .SetParameterLongDescription(_("From 0 to 100, 100 by default."))
+      .AddParameter(
+          "expression", _("Volume (from 0 to 100, 100 by default)"), "", true)
       .SetDefaultValue("100")
-      .AddParameter("expression", _("Pitch (speed)"), "", true)
-      .SetParameterLongDescription(_("1 by default."))
+      .AddParameter("expression", _("Pitch (speed) (1 by default)"), "", true)
       .SetDefaultValue("1")
       .MarkAsSimple();
 
-  extension
-      .AddAction("PreloadMusic",
-                 _("Preload a music file"),
-                 _("Preload a music file in memory."),
-                 _("Preload the music file _PARAM1_"),
-                 _("Audio/Loading"),
-                 "res/actions/music24.png",
-                 "res/actions/music.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("musicfile", _("Audio file (or audio resource name)"))
-      .MarkAsComplex();
-
-  extension
-      .AddAction("PreloadSound",
-                 _("Preload a sound file"),
-                 _("Preload a sound file in memory."),
-                 _("Preload the sound file _PARAM1_"),
-                 _("Audio/Loading"),
-                 "res/actions/son24.png",
-                 "res/actions/son.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("soundfile", _("Sound file (or sound resource name)"))
-      .MarkAsComplex();
-
-  extension
-      .AddAction("UnloadMusic",
-                 _("Unload a music file"),
-                 _(
-                    "Unload a music file from memory. "
-                    "Unloading a music file will cause any music playing it to stop."
-                  ),
-                 _("Unload the music file _PARAM1_"),
-                 _("Audio/Loading"),
-                 "res/actions/music24.png",
-                 "res/actions/music.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("musicfile", _("Audio file (or audio resource name)"))
-      .MarkAsComplex();
-
-  extension
-      .AddAction("UnloadSound",
-                 _("Unload a sound file"),
-                 _(
-                    "Unload a sound file from memory. "
-                    "Unloading a sound file will cause any sounds playing it to stop."
-                  ),
-                 _("Unload the sound file _PARAM1_"),
-                 _("Audio/Loading"),
-                 "res/actions/son24.png",
-                 "res/actions/son.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("soundfile", _("Sound file (or sound resource name)"))
-      .MarkAsComplex();
-
-  extension
-      .AddAction("UnloadAllAudio",
-                 _("Unload all audio"),
-                 _(
-                   "Unload all the audio in memory. "
-                   "This will cause every sound and music of the game to stop."
-                  ),
-                 _("Unload all audio files"),
-                 _("Audio/Loading"),
-                 "res/actions/music24.png",
-                 "res/actions/music.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .MarkAsComplex();
-
   extension
       .AddCondition("MusicPlaying",
                     _("A music file is being played"),
@@ -423,14 +369,16 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           _("Volume of the sound on a channel"),
           _("Test the volume of the sound on the specified channel. The volume "
             "is between 0 and 100."),
-          _("the volume of the sound on channel _PARAM1_"),
+          _("The volume of the sound on channel _PARAM1_ is _PARAM2__PARAM3_"),
           _("Audio/Sounds on channels"),
           "res/conditions/sonVolume24.png",
           "res/conditions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Volume to test"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   extension
       .AddCondition(
@@ -438,26 +386,30 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           _("Volume of the music on a channel"),
           _("Test the volume of the music on a specified channel. The volume "
             "is between 0 and 100."),
-          _("the volume of the music on channel _PARAM1_"),
+          _("The volume of the music on channel _PARAM1_ is _PARAM2__PARAM3_"),
           _("Audio/Music on channels"),
           "res/conditions/musicVolume24.png",
           "res/conditions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Volume to test"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   extension
       .AddCondition(
           "GlobalVolume",
           _("Global volume"),
           _("Test the global sound level. The volume is between 0 and 100."),
-          _("the global game volume"),
+          _("The global game volume is _PARAM1__PARAM2_"),
           _("Audio"),
           "res/conditions/volume24.png",
           "res/conditions/volume.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardRelationalOperatorParameters("number");
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Volume to test"))
+      .SetManipulatedType("number");
 
   extension
       .AddCondition(
@@ -465,14 +417,16 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           _("Pitch of the sound of a channel"),
           _("Test the pitch of the sound on the specified channel. 1 is the "
             "default pitch."),
-          _("the pitch of the sound on channel _PARAM1_"),
+          _("The pitch of the sound on channel _PARAM1_ is _PARAM2__PARAM3_"),
           _("Audio/Sounds on channels"),
           "res/conditions/sonVolume24.png",
           "res/conditions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Pitch to test"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   extension
       .AddCondition(
@@ -480,42 +434,50 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           _("Pitch of the music on a channel"),
           _("Test the pitch (speed) of the music on a specified channel. 1 is "
             "the default pitch."),
-          _("the pitch of the music on channel _PARAM1_"),
+          _("The pitch of the music on channel _PARAM1_ is _PARAM2__PARAM3_"),
           _("Audio/Music on channels"),
           "res/conditions/musicVolume24.png",
           "res/conditions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Pitch to test"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   extension
       .AddCondition(
           "SoundChannelPlayingOffset",
           _("Playing offset of the sound on a channel"),
           _("Test the playing offset of the sound on the specified channel."),
-          _("the playing offset of the sound on channel _PARAM1_"),
+          _("The playing offset of the sound on channel _PARAM1_ is "
+            "_PARAM2__PARAM3_"),
           _("Audio/Sounds on channels"),
           "res/conditions/sonVolume24.png",
           "res/conditions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Playing position (in seconds)"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   extension
       .AddCondition(
           "MusicChannelPlayingOffset",
           _("Playing offset of the music on a channel"),
           _("Test the playing offset of the music on the specified channel."),
-          _("the playing offset of the music on channel _PARAM1_"),
+          _("The playing offset of the music on channel _PARAM1_ is "
+            "_PARAM2__PARAM3_"),
           _("Audio/Music on channels"),
           "res/conditions/musicVolume24.png",
           "res/conditions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Playing position (in seconds)"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   extension
       .AddExpression("SoundChannelPlayingOffset",

Core/GDCore/Extensions/Builtin/CameraExtension.cpp

@@ -4,7 +4,6 @@
  * reserved. This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"
-#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
 #include "GDCore/Tools/Localization.h"
 
 using namespace std;
@@ -13,115 +12,165 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation(
-          "BuiltinCamera",
-          _("Cameras and layers features"),
-          "Each scene can be composed of multiple layers. These conditions "
-          "and actions allow to manipulate them during the game. In "
-          "particular, you can move the camera of a layer to center it on an "
-          "object or a position.",
-          "Florian Rival",
-          "Open source (MIT License)")
+      .SetExtensionInformation("BuiltinCamera",
+                               _("Cameras and layers features"),
+                               _("Built-in camera extension"),
+                               "Florian Rival",
+                               "Open source (MIT License)")
       .SetExtensionHelpPath("/interface/scene-editor/layers-and-cameras");
 
 #if defined(GD_IDE_ONLY)
   extension
-      .AddExpressionAndConditionAndAction(
-          "number",
+      .AddCondition("CameraX",
+                    _("Camera center X position"),
+                    _("Compare the X position of the center of a camera."),
+                    _("X position of camera _PARAM4_ is _PARAM1__PARAM2_ "
+                      "(layer: _PARAM3_)"),
+                    _("Layers and cameras"),
+                    "res/conditions/camera24.png",
+                    "res/conditions/camera.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Value to compare"))
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
+      .SetDefaultValue("0")
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
+
+  extension
+      .AddCondition("CameraY",
+                    _("Camera center Y position"),
+                    _("Compare the Y position of the center of a camera."),
+                    _("The Y position of camera _PARAM4_ is _PARAM1__PARAM2_ "
+                      "(layer: _PARAM3_)"),
+                    _("Layers and cameras"),
+                    "res/conditions/camera24.png",
+                    "res/conditions/camera.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Value to compare"))
+      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("Camera number (default : 0)"))
+      .SetDefaultValue("0")
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
+
+  extension
+      .AddAction(
           "CameraX",
           _("Camera center X position"),
-          _("the X position of the center of a camera"),
-          _("the X position of camera _PARAM4_ (layer: _PARAM3_)"),
+          _("Change the X position of the center of the specified camera."),
+          _("Do _PARAM1__PARAM2_ to X position of camera _PARAM4_ (layer: "
+            "_PARAM3_)"),
           _("Layers and cameras"),
-          "res/conditions/camera24.png")
+          "res/conditions/camera24.png",
+          "res/conditions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number")
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("Value"))
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
-      .MarkAsAdvanced();
-
-  extension.AddDuplicatedAction("CameraX", "SetCameraX")
-      .SetHidden();  // Deprecated
-  extension.AddDuplicatedExpression("VueX", "CameraX")
-      .SetHidden();  // Deprecated
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   extension
-      .AddExpressionAndConditionAndAction(
-          "number",
+      .AddAction(
           "CameraY",
           _("Camera center Y position"),
-          _("the Y position of the center of a camera"),
-          _("the Y position of camera _PARAM4_ (layer: _PARAM3_)"),
+          _("Change the Y position of the center of the specified camera."),
+          _("Do _PARAM1__PARAM2_ to Y position of camera _PARAM4_ (layer: "
+            "_PARAM3_)"),
           _("Layers and cameras"),
-          "res/conditions/camera24.png")
+          "res/conditions/camera24.png",
+          "res/conditions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number")
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("Value"))
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
-      .MarkAsAdvanced();
-
-  extension.AddDuplicatedAction("CameraY", "SetCameraY")
-      .SetHidden();  // Deprecated
-  extension.AddDuplicatedExpression("VueY", "CameraY")
-      .SetHidden();  // Deprecated
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   extension
-      .AddExpressionAndCondition(
-          "number",
-          "CameraWidth",
-          _("Width of a camera"),
-          _("the width of a camera of a layer"),
-          _("the width of camera _PARAM2_ of layer _PARAM1_"),
-          _("Layers and cameras"),
-          "res/conditions/camera24.png")
+      .AddCondition("CameraWidth",
+                    _("Width of a camera"),
+                    _("Test the width of a camera of a layer"),
+                    _("The width of camera _PARAM2_ of layer _PARAM1_ is "
+                      "_PARAM3__PARAM4_"),
+                    _("Layers and cameras"),
+                    "res/conditions/camera24.png",
+                    "res/conditions/camera.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("layer", _("Layer"))
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("Camera number"))
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Value to compare"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
+
+  extension
+      .AddCondition("CameraHeight",
+                    _("Height of a camera"),
+                    _("Test the height of a camera of a layer"),
+                    _("The height of camera _PARAM2_ of layer _PARAM1_ is "
+                      "_PARAM3__PARAM4_"),
+                    _("Layers and cameras"),
+                    "res/conditions/camera24.png",
+                    "res/conditions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"))
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"))
-      .UseStandardParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Value to compare"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   extension
-      .AddExpressionAndCondition(
-          "number",
-          "CameraHeight",
-          _("Height of a camera"),
-          _("the height of a camera of a layer"),
-          _("the height of camera _PARAM2_ of layer _PARAM1_"),
-          _("Layers and cameras"),
-          "res/conditions/camera24.png")
+      .AddCondition("CameraAngle",
+                    _("Angle of a camera of a layer"),
+                    _("Test a camera angle."),
+                    _("Angle of camera is _PARAM1__PARAM2_ (layer: _PARAM3_, "
+                      "camera: _PARAM4_)"),
+                    _("Layers and cameras"),
+                    "res/conditions/camera24.png",
+                    "res/conditions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number"))
-      .UseStandardParameters("number")
-      .MarkAsAdvanced();
-
-  extension
-      .AddExpressionAndConditionAndAction(
-          "number",
-          "CameraAngle",
-          _("Angle of a camera of a layer"),
-          _("the angle of rotation of a camera"),
-          _("the angle of camera (layer: _PARAM3_, camera: _PARAM4_)"),
-          _("Layers and cameras"),
-          "res/conditions/camera24.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number")
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Value to compare"))
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
-      .MarkAsAdvanced();
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
-  extension.AddDuplicatedAction("RotateCamera", "SetCameraAngle").SetHidden();
-  extension.AddDuplicatedExpression("CameraRotation", "CameraAngle")
-      .SetHidden();
-  extension.AddDuplicatedExpression("VueRotation", "CameraAngle").SetHidden();
+  extension
+      .AddAction("RotateCamera",
+                 _("Change camera angle"),
+                 _("This action modifies the angle of a camera in the "
+                   "specified layer."),
+                 _("Do _PARAM1__PARAM2_ to angle of camera (layer: _PARAM3_, "
+                   "camera: _PARAM4_)"),
+                 _("Layers and cameras"),
+                 "res/actions/camera24.png",
+                 "res/actions/camera.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("Value"))
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
+      .SetDefaultValue("0")
+      .SetManipulatedType("number");
 
   extension
       .AddAction("AddCamera",
@@ -220,9 +269,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
 
   extension
       .AddAction("ZoomCamera",
-                 _("Change camera zoom"),
                  _("Change camera zoom."),
-                 _("Change camera zoom to _PARAM1_ (layer: _PARAM2_, camera: "
+                 _("Change camera zoom."),
+                 _("Change camera zoom to _PARAM1_ (layer : _PARAM2_, camera : "
                    "_PARAM3_)"),
                  _("Layers and cameras"),
                  "res/actions/camera24.png",
@@ -331,10 +380,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
   extension
       .AddAction(
           "SetLayerEffectParameter",
-          _("Effect parameter (number)"),
-          _("Change the value of a parameter of an effect.") + "\n" +
-              _("You can find the parameter names (and change the effect "
-                "names) in the effects window."),
+          _("Effect parameter"),
+          _("Change the parameter of an effect"),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
           _("Layers and cameras/Effects"),
           "res/conditions/camera24.png",
@@ -348,13 +395,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .MarkAsAdvanced();
 
   extension
-      .AddAction(
-          "SetLayerEffectStringParameter",
-          _("Effect parameter (string)"),
-          _("Change the value (string) of a parameter of an effect.") + "\n" +
-              _("You can find the parameter names (and change the effect "
-                "names) in the effects window."),
-          _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
+      .AddCondition(
+          "LayerEffectEnabled",
+          _("Layer effect is enabled"),
+          _("The effect on a layer is enabled"),
+          _("Effect _PARAM2_ on layer _PARAM1_ is enabled"),
           _("Layers and cameras/Effects"),
           "res/conditions/camera24.png",
           "res/conditions/camera.png")
@@ -362,18 +407,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("string", _("Effect"))
-      .AddParameter("string", _("Parameter name"))
-      .AddParameter("string", _("New value"))
       .MarkAsAdvanced();
 
   extension
       .AddAction(
-          "SetLayerEffectBooleanParameter",
-          _("Effect parameter (enable or disable)"),
-          _("Enable or disable a parameter of an effect.") + "\n" +
-              _("You can find the parameter names (and change the effect "
-                "names) in the effects window."),
-          _("Enable _PARAM3_ for effect _PARAM2_ of layer _PARAM1_: _PARAM4_"),
+          "EnableLayerEffect",
+          _("Enable layer effect"),
+          _("Enable an effect on a layer"),
+          _("Enable effect _PARAM2_ on layer _PARAM1_: _PARAM3_"),
           _("Layers and cameras/Effects"),
           "res/conditions/camera24.png",
           "res/conditions/camera.png")
@@ -381,36 +422,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("string", _("Effect"))
-      .AddParameter("string", _("Parameter name"))
-      .AddParameter("yesorno", _("Enable this parameter"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddCondition("LayerEffectEnabled",
-                    _("Layer effect is enabled"),
-                    _("The effect on a layer is enabled"),
-                    _("Effect _PARAM2_ on layer _PARAM1_ is enabled"),
-                    _("Layers and cameras/Effects"),
-                    "res/conditions/camera24.png",
-                    "res/conditions/camera.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("string", _("Effect"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("EnableLayerEffect",
-                 _("Enable layer effect"),
-                 _("Enable an effect on a layer"),
-                 _("Enable effect _PARAM2_ on layer _PARAM1_: _PARAM3_"),
-                 _("Layers and cameras/Effects"),
-                 "res/conditions/camera24.png",
-                 "res/conditions/camera.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("string", _("Effect"))
       .AddParameter("yesorno", _("Enable"), "", true)
       .MarkAsAdvanced();
 
@@ -419,15 +430,17 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "LayerTimeScale",
           _("Layer time scale"),
           _("Compare the time scale applied to the objects of the layer."),
-          _("the time scale of layer _PARAM1_"),
+          _("The time scale of layer _PARAM1_ is _PARAM2__PARAM3_"),
           _("Layers and cameras/Time"),
           "res/conditions/time24.png",
           "res/conditions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
-      .UseStandardRelationalOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Value to compare"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   extension
       .AddAction(
@@ -445,50 +458,26 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     _("Scale (1: Default, 2: 2x faster, 0.5: 2x slower...)"));
 
   extension
-      .AddCondition("LayerDefaultZOrder",
-                    _("Layer default Z order"),
-                    _("Compare the default Z order set to objects when they "
-                      "are created on a layer."),
-                    _("the default Z order of objects created on _PARAM1_"),
-                    _("Layers and cameras"),
-                    "res/conditions/layer24.png",
-                    "res/conditions/layer.png")
+      .AddExpression("CameraWidth",
+                     _("Width of a camera of a layer"),
+                     _("Width of a camera of a layer"),
+                     _("Layers and cameras"),
+                     "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
-      .SetDefaultValue("\"\"")
-      .UseStandardRelationalOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("layer", _("Layer"))
+      .AddParameter("expression", _("Camera number (default : 0)"))
+      .SetDefaultValue("0");
 
   extension
-      .AddAction("SetLayerDefaultZOrder",
-                 _("Change layer default Z order"),
-                 _("Change the default Z order set to objects when they are "
-                   "created on a layer."),
-                 _("Set the default Z order of objects created on _PARAM1_ to "
-                   "_PARAM2_"),
-                 _("Layers and cameras"),
-                 "res/actions/layer24.png",
-                 "res/actions/layer.png")
+      .AddExpression("CameraHeight",
+                     _("Height of a camera of a layer"),
+                     _("Height of a camera of a layer"),
+                     _("Layers and cameras"),
+                     "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("New default Z order"));
-
-  extension
-      .AddAction(
-          "SetLayerAmbientLightColor",
-          _("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_"),
-          _("Layers and cameras/Lighting"),
-          "res/actions/color24.png",
-          "res/actions/color.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
-      .SetDefaultValue("\"Lighting\"")
-      .AddParameter("color", _("Color"))
-      .MarkAsAdvanced();
+      .AddParameter("layer", _("Layer"))
+      .AddParameter("expression", _("Camera number (default : 0)"))
+      .SetDefaultValue("0");
 
   extension
       .AddExpression(
@@ -539,9 +528,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .SetDefaultValue("0");
 
   extension
-      .AddExpression("CameraZoom",
-                     _("Zoom of a camera of a layer"),
-                     _("Zoom of a camera of a layer"),
+      .AddExpression("CameraX",
+                     _("Camera X position"),
+                     _("Camera X position"),
                      _("Layers and cameras"),
                      "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -550,6 +539,69 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
 
+  extension
+      .AddExpression("VueX",
+                     _("Camera X position"),
+                     _("Camera X position"),
+                     _("Layers and cameras"),
+                     "res/actions/camera.png")
+      .SetHidden()
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("layer", _("Layer"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
+      .SetDefaultValue("0");
+
+  extension
+      .AddExpression("CameraY",
+                     _("Camera Y position"),
+                     _("Camera Y position"),
+                     _("Layers and cameras"),
+                     "res/actions/camera.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("layer", _("Layer"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
+      .SetDefaultValue("0");
+
+  extension
+      .AddExpression("VueY",
+                     _("Camera Y position"),
+                     _("Camera Y position"),
+                     _("Layers and cameras"),
+                     "res/actions/camera.png")
+      .SetHidden()
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("layer", _("Layer"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
+      .SetDefaultValue("0");
+
+  extension
+      .AddExpression("CameraRotation",
+                     _("Angle of a camera of a layer"),
+                     _("Angle of a camera of a layer"),
+                     _("Layers and cameras"),
+                     "res/actions/camera.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("layer", _("Layer"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
+      .SetDefaultValue("0");
+
+  extension
+      .AddExpression("VueRotation",
+                     _("Angle of a camera of a layer"),
+                     _("Angle of a camera of a layer"),
+                     _("Layers and cameras"),
+                     "res/actions/camera.png")
+      .SetHidden()
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("layer", _("Layer"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
+      .SetDefaultValue("0");
+
   extension
       .AddExpression("LayerTimeScale",
                      _("Time scale"),
@@ -558,15 +610,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                      "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"));
-
-  extension
-      .AddExpression("LayerDefaultZOrder",
-                     _("Default Z Order for a layer"),
-                     _("Default Z Order for a layer"),
-                     _("Layers and cameras"),
-                     "res/actions/camera.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"));
 #endif
 }
 

Core/GDCore/Extensions/Builtin/CommonConversionsExtension.cpp

@@ -16,7 +16,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
       .SetExtensionInformation(
           "BuiltinCommonConversions",
           _("Standard Conversions"),
-          "Expressions to convert number, texts and quantities.",
+          _("Built-in extension providing standard conversions expressions."),
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/common-conversions");

Core/GDCore/Extensions/Builtin/CommonInstructionsExtension.cpp

@@ -7,7 +7,6 @@
 #include "GDCore/Tools/Localization.h"
 #if defined(GD_IDE_ONLY)
 #include "GDCore/Events/Builtin/CommentEvent.h"
-#include "GDCore/Events/Builtin/ForEachChildVariableEvent.h"
 #include "GDCore/Events/Builtin/ForEachEvent.h"
 #include "GDCore/Events/Builtin/GroupEvent.h"
 #include "GDCore/Events/Builtin/LinkEvent.h"
@@ -26,9 +25,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
   extension
       .SetExtensionInformation(
           "BuiltinCommonInstructions",
-          _("Builtin events"),
-          "GDevelop comes with a set of events and conditions that allow to "
-          "express the game logic and rules.",
+          _("Standard events"),
+          _("Built-in extension providing standard events."),
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/advanced-conditions");
@@ -37,7 +35,7 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
   extension
       .AddCondition("Or",
                     _("Or"),
-                    _("Check if one of the sub conditions is true"),
+                    _("Return true if one of the sub conditions is true"),
                     _("If one of these conditions is true:"),
                     _("Advanced"),
                     "res/conditions/or24.png",
@@ -48,7 +46,7 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
   extension
       .AddCondition("And",
                     _("And"),
-                    _("Check if all sub conditions are true"),
+                    _("Return true if all sub conditions are true"),
                     _("If all of these conditions are true:"),
                     _("Advanced"),
                     "res/conditions/and24.png",
@@ -120,14 +118,6 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                      "res/foreach.png",
                      std::make_shared<gd::ForEachEvent>());
 
-  extension.AddEvent(
-      "ForEachChildVariable",
-      _("For each child variable (of a structure or array)"),
-      _("Repeat the event for each child variable of a structure or array."),
-      "",
-      "res/foreach.png",
-      std::make_shared<gd::ForEachChildVariableEvent>());
-
   extension.AddEvent("Group",
                      _("Group"),
                      _("Group containing events"),

Core/GDCore/Extensions/Builtin/ExternalLayoutsExtension.cpp

@@ -13,12 +13,13 @@ void GD_CORE_API
 BuiltinExtensionsImplementer::ImplementsExternalLayoutsExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation("BuiltinExternalLayouts",
-                               _("External layouts"),
-                               "Provides actions and conditions related to "
-                               "external layouts.",
-                               "Florian Rival",
-                               "Open source (MIT License)")
+      .SetExtensionInformation(
+          "BuiltinExternalLayouts",
+          _("External layouts"),
+          _("Built-in extension providing actions and conditions related to "
+            "external layouts"),
+          "Florian Rival",
+          "Open source (MIT License)")
       .SetExtensionHelpPath("/interface/scene-editor/external-layouts");
 
 #if defined(GD_IDE_ONLY)

Core/GDCore/Extensions/Builtin/FileExtension.cpp

@@ -12,14 +12,12 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation(
-          "BuiltinFile",
-          _("Storage"),
-          "Actions and conditions to store data (like the player progress or "
-          "anything else to be persisted across game sessions). Data are "
-          "stored on the device and erased when the game is uninstalled.",
-          "Florian Rival",
-          "Open source (MIT License)")
+      .SetExtensionInformation("BuiltinFile",
+                               _("Storage"),
+                               _("Built-in extension providing functions "
+                                 "to store data."),
+                               "Florian Rival",
+                               "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/storage");
 
 #if defined(GD_IDE_ONLY)
@@ -101,7 +99,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
           "LireFichierExp",
           _("Read a value"),
           _("Read the value saved in the specified element and store it in a "
-            "scene "
             "variable.\nSpecify the structure leading to the element using / "
             "(example : Root/Level/Current)\nSpaces are forbidden in element "
             "names."),
@@ -119,7 +116,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
           "LireFichierTxt",
           _("Read a text"),
           _("Read the text saved in the specified element and store it in a "
-            "scene "
             "variable.\nSpecify the structure leading to the element using / "
             "(example : Root/Level/Current)\nSpaces are forbidden in element "
             "names."),

Core/GDCore/Extensions/Builtin/JoystickExtension.cpp

@@ -15,7 +15,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsJoystickExtension(
       .SetExtensionInformation(
           "BuiltinJoystick",
           _("Joysticks features"),
-          "Built-in extension that enables the use of joysticks.",
+          _("Built-in extension that enables the use of joysticks"),
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("" /*TODO: Add a documentation page for this */);
@@ -37,14 +37,17 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsJoystickExtension(
       .AddCondition("JoystickAxis",
                     _("Value of an axis of a joystick"),
                     _("Test the value of an axis of a joystick."),
-                    _("the value of the axis _PARAM2_ of joystick _PARAM1_"),
+                    _("The value of the axis _PARAM2_ of joystick _PARAM1_ is "
+                      "_PARAM3__PARAM4_"),
                     _("Joystick"),
                     "res/conditions/joystick24.png",
                     "res/conditions/joystick.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Joystick number (first joystick: 0)"))
       .AddParameter("joyaxis", _("Axis"))
-      .UseStandardRelationalOperatorParameters("number");
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Value to compare"))
+      .SetManipulatedType("number");
 
   extension
       .AddAction(

Core/GDCore/Extensions/Builtin/KeyboardExtension.cpp

@@ -15,10 +15,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
       .SetExtensionInformation(
           "BuiltinKeyboard",
           _("Keyboard features"),
-          _("Allows your game to respond to keyboard input. Note that this "
-            "does not work with on-screen keyboard on touch devices: use "
-            "instead conditions related to touch when making a game for "
-            "mobile/touchscreen devices."),
+          _("Built-in extension that enables the use of a keyboard"),
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/keyboard");
@@ -82,16 +79,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "");
 
- extension
-      .AddCondition("AnyKeyReleased",
-                    _("Any key released"),
-                    _("Test if any key is released"),
-                    _("Any key is released"),
-                    _("Keyboard"),
-                    "res/conditions/keyboard24.png",
-                    "res/conditions/keyboard.png")
-      .AddCodeOnlyParameter("currentScene", "");
-
   extension
       .AddStrExpression(
           "LastPressedKey",

Core/GDCore/Extensions/Builtin/MathematicalToolsExtension.cpp

@@ -15,32 +15,12 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
   extension.SetExtensionInformation(
       "BuiltinMathematicalTools",
       _("Mathematical tools"),
-      "A set of mathematical functions that can be used in expressions.",
+      _("Built-in extension providing mathematical tools"),
       "Florian Rival",
       "Open source (MIT License)");
 
 #if defined(GD_IDE_ONLY)
 
-  extension
-      .AddExpression("normalize",
-                     _("Normalize a value between `min` and `max` to a value between 0 and 1."),
-                     _("Remap a value between 0 and 1."),
-                     _("Mathematical tools"),
-                     "res/mathfunction.png")
-      .AddParameter("expression", _("Value"))
-      .AddParameter("expression", _("Min"))
-      .AddParameter("expression", _("Max"));
-
-  extension
-      .AddExpression("clamp",
-                     _("Clamp (restrict a value to a given range)"),
-                     _("Restrict a value to a given range"),
-                     _("Mathematical tools"),
-                     "res/mathfunction.png")
-      .AddParameter("expression", _("Value"))
-      .AddParameter("expression", _("Min"))
-      .AddParameter("expression", _("Max"));
-
   extension
       .AddExpression("AngleDifference",
                      _("Difference between two angles"),
@@ -50,28 +30,6 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddParameter("expression", _("First angle"))
       .AddParameter("expression", _("Second angle"));
 
-  extension
-      .AddExpression("AngleBetweenPositions",
-                     _("Angle between two positions"),
-                     _("Compute the angle between two positions."),
-                     _("Mathematical tools"),
-                     "res/mathfunction.png")
-      .AddParameter("expression", _("First point X position"))
-      .AddParameter("expression", _("First point Y position"))
-      .AddParameter("expression", _("Second point X position"))
-      .AddParameter("expression", _("Second point Y position"));
-
-  extension
-      .AddExpression("DistanceBetweenPositions",
-                     _("Distance between two positions"),
-                     _("Compute the distance between two positions."),
-                     _("Mathematical tools"),
-                     "res/mathfunction.png")
-      .AddParameter("expression", _("First point X position"))
-      .AddParameter("expression", _("First point Y position"))
-      .AddParameter("expression", _("Second point X position"))
-      .AddParameter("expression", _("Second point Y position"));
-
   extension
       .AddExpression("mod",
                      _("Modulo"),
@@ -364,7 +322,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
   extension
       .AddExpression("trunc",
                      _("Truncation"),
-                     _("Truncate a number"),
+                     _("Troncate a number"),
                      _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
@@ -379,30 +337,6 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddParameter("expression", _("b (in a+(b-a)*x)"))
       .AddParameter("expression", _("x (in a+(b-a)*x)"));
 
-  extension
-      .AddExpression("XFromAngleAndDistance",
-                     _("X position from angle and distance"),
-                     _("Compute the X position when given an angle and distance "
-                      "relative to the origin (0;0). This is also known as "
-                      "getting the cartesian coordinates of a 2D vector, using "
-                      "its polar coordinates."),
-                     _("Mathematical tools"),
-                     "res/mathfunction.png")
-      .AddParameter("expression", _("Angle, in degrees"))
-      .AddParameter("expression", _("Distance"));
-
-  extension
-      .AddExpression("YFromAngleAndDistance",
-                     _("Y position from angle and distance"),
-                     _("Compute the Y position when given an angle and distance "
-                      "relative to the origin (0;0). This is also known as "
-                      "getting the cartesian coordinates of a 2D vector, using "
-                      "its polar coordinates."),
-                     _("Mathematical tools"),
-                     "res/mathfunction.png")
-      .AddParameter("expression", _("Angle, in degrees"))
-      .AddParameter("expression", _("Distance"));
-
 #endif
 }
 

Core/GDCore/Extensions/Builtin/MouseExtension.cpp

@@ -4,7 +4,6 @@
  * reserved. This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"
-#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
 #include "GDCore/Tools/Localization.h"
 
 using namespace std;
@@ -15,17 +14,30 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
   extension
       .SetExtensionInformation(
           "BuiltinMouse",
-          _("Mouse and touch"),
-          "Conditions and actions to handle either the mouse or touches on "
-          "touchscreen. By default, conditions related to the mouse will also "
-          "handle the touches - so that it's easier to handle both in your "
-          "game. You can disable this behavior if you want to handle them "
-          "separately in different events.",
+          _("Mouse features"),
+          _("Built-in extension that enables the use of a mouse"),
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/mouse-touch");
 
 #if defined(GD_IDE_ONLY)
+  extension
+      .AddCondition("SourisSurObjet",
+                    _("The cursor/touch is on an object"),
+                    _("Test if the cursor is over an object, or if the object "
+                      "is being touched."),
+                    _("The cursor/touch is on _PARAM0_"),
+                    _("Mouse and touch"),
+                    "res/conditions/surObjet24.png",
+                    "res/conditions/surObjet.png")
+
+      .AddParameter("objectList", _("Object"))
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("yesorno", _("Accurate test (yes by default)"), "", true)
+      .SetDefaultValue("yes")
+      .AddCodeOnlyParameter("conditionInverted", "")
+      .MarkAsSimple();
+
   extension
       .AddCondition(
           "IsMouseWheelScrollingUp",
@@ -149,111 +161,106 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .MarkAsAdvanced();
 
   extension
-      .AddExpressionAndCondition(
-          "number",
-          "MouseX",
-          _("Cursor X position"),
-          _("the X position of the cursor or of a touch"),
-          _("the cursor (or touch) X position"),
-          _("Mouse and touch"),
-          "res/conditions/mouse24.png")
+      .AddCondition("SourisX",
+                    _("Cursor X position"),
+                    _("Compare the X position of the cursor or of a touch."),
+                    _("Cursor X position is _PARAM1__PARAM2_"),
+                    _("Mouse and touch"),
+                    "res/conditions/mouse24.png",
+                    "res/conditions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number")
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("X position"))
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0");
-
-  // Support for deprecated names:
-  extension.AddDuplicatedCondition("SourisX", "MouseX").SetHidden();
-  extension.AddDuplicatedExpression("SourisX", "MouseX").SetHidden();
+      .SetDefaultValue("0")
+      .SetManipulatedType("number");
 
   extension
-      .AddExpressionAndCondition(
-          "number",
-          "MouseY",
-          _("Cursor Y position"),
-          _("the Y position of the cursor or of a touch"),
-          _("the cursor (or touch) Y position"),
-          _("Mouse and touch"),
-          "res/conditions/mouse24.png")
+      .AddCondition("SourisY",
+                    _("Cursor Y position"),
+                    _("Compare the Y position of the cursor or of a touch."),
+                    _("Cursor Y position is _PARAM1__PARAM2_"),
+                    _("Mouse and touch"),
+                    "res/conditions/mouse24.png",
+                    "res/conditions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number")
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Y position"))
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0");
-
-  // Support for deprecated names:
-  extension.AddDuplicatedCondition("SourisY", "MouseY").SetHidden();
-  extension.AddDuplicatedExpression("SourisY", "MouseY").SetHidden();
+      .SetDefaultValue("0")
+      .SetManipulatedType("number");
 
   extension
-      .AddCondition("MouseButtonPressed",
+      .AddCondition("SourisBouton",
                     _("Mouse button pressed or touch held"),
-                    _("Check if the specified mouse button is pressed or "
+                    _("Return true if the specified mouse button is pressed or "
                       "if a touch is in contact with the screen."),
                     _("Touch or _PARAM1_ mouse button is down"),
                     _("Mouse and touch"),
                     "res/conditions/mouse24.png",
                     "res/conditions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("mouse", _("Button to check"))
-      .MarkAsSimple();
-
-  // Support for deprecated names:
-  extension.AddDuplicatedCondition("SourisBouton", "MouseButtonPressed")
-      .SetHidden();
-
-  extension
-      .AddCondition("MouseButtonReleased",
-                    _("Mouse button released"),
-                    _("Check if the specified mouse button was released."),
-                    _("_PARAM1_ mouse button was released"),
-                    _("Mouse and touch"),
-                    "res/conditions/mouse24.png",
-                    "res/conditions/mouse.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("mouse", _("Button to check"))
+      .AddParameter("mouse", _("Button to test"))
       .MarkAsSimple();
 
   extension
-      .AddExpressionAndCondition("number",
-                                 "TouchX",
-                                 _("Touch X position"),
-                                 _("the X position of a specific touch"),
-                                 _("the touch #_PARAM1_ X position"),
-                                 _("Mouse and touch/Multitouch"),
-                                 "res/conditions/touch24.png")
+      .AddCondition(
+          "MouseButtonReleased",
+          _("Mouse button released"),
+          _("Return true if the specified mouse button was released."),
+          _("_PARAM1_ mouse button was released"),
+          _("Mouse and touch"),
+          "res/conditions/mouse24.png",
+          "res/conditions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("expression", _("Touch identifier"))
-      .UseStandardParameters("number")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0");
+      .AddParameter("mouse", _("Button to test"))
+      .MarkAsSimple();
 
   extension
-      .AddExpressionAndCondition("number",
-                                 "TouchY",
-                                 _("Touch Y position"),
-                                 _("the Y position of a specific touch"),
-                                 _("the touch #_PARAM1_ Y position"),
-                                 _("Mouse and touch/Multitouch"),
-                                 "res/conditions/touch24.png")
+      .AddCondition("TouchX",
+                    _("Touch X position"),
+                    _("Compare the X position of a specific touch."),
+                    _("Touch #_PARAM1_ X position is _PARAM2__PARAM3_"),
+                    _("Mouse and touch/Multitouch"),
+                    "res/conditions/touch24.png",
+                    "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch identifier"))
-      .UseStandardParameters("number")
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("X position"))
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0");
+      .SetDefaultValue("0")
+      .SetManipulatedType("number");
+
+  extension
+      .AddCondition("TouchY",
+                    _("Touch Y position"),
+                    _("Compare the Y position of a specific touch."),
+                    _("Touch #_PARAM1_ Y position is _PARAM2__PARAM3_"),
+                    _("Mouse and touch/Multitouch"),
+                    "res/conditions/touch24.png",
+                    "res/conditions/touch.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("expression", _("Touch identifier"))
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Y position"))
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
+      .SetDefaultValue("0")
+      .SetManipulatedType("number");
 
   extension
       .AddCondition(
           "PopStartedTouch",
           _("A new touch has started"),
-          _("Check if a touch has started. The touch identifier can be "
+          _("Return true if a touch has started. The touch identifier can be "
             "accessed using LastTouchId().\nAs more than one touch can be "
             "started, this condition is only true once for each touch: the "
             "next time you use it, it will be for a new touch, or it will "
@@ -268,7 +275,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .AddCondition(
           "PopEndedTouch",
           _("A touch has ended"),
-          _("Check if a touch has ended. The touch identifier can be "
+          _("Return true if a touch has ended. The touch identifier can be "
             "accessed using LastEndedTouchId().\nAs more than one touch can be "
             "ended, this condition is only true once for each touch: the next "
             "time you use it, it will be for a new touch, or it will return "
@@ -279,19 +286,95 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
           "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "");
 
+  extension
+      .AddExpression("MouseX",
+                     _("Cursor X position"),
+                     _("Cursor X position"),
+                     _("Mouse cursor"),
+                     "res/actions/mouse.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("layer", _("Layer"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("camera", _("Camera"), "", true)
+      .SetDefaultValue("0");
+
+  extension
+      .AddExpression("SourisX",
+                     _("Cursor X position"),
+                     _("Cursor X position"),
+                     _("Mouse cursor"),
+                     "res/actions/mouse.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("layer", _("Layer"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("camera", _("Camera"), "", true)
+      .SetDefaultValue("0")
+      .SetHidden();
+
+  extension
+      .AddExpression("MouseY",
+                     _("Cursor Y position"),
+                     _("Cursor Y position"),
+                     _("Mouse cursor"),
+                     "res/actions/mouse.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("layer", _("Layer"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("camera", _("Camera"), "", true)
+      .SetDefaultValue("0");
+
+  extension
+      .AddExpression("SourisY",
+                     _("Cursor Y position"),
+                     _("Cursor Y position"),
+                     _("Mouse cursor"),
+                     "res/actions/mouse.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("layer", _("Layer"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("camera", _("Camera"), "", true)
+      .SetDefaultValue("0")
+      .SetHidden();
+
   extension
       .AddExpression("MouseWheelDelta",
                      _("Mouse wheel: Displacement"),
                      _("Mouse wheel displacement"),
-                     _("Mouse and touch"),
+                     _("Mouse cursor"),
                      "res/actions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "");
 
+  extension
+      .AddExpression("TouchX",
+                     _("Touch X position"),
+                     _("Touch X position"),
+                     _("Multitouch"),
+                     "res/conditions/touch.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("expression", _("Touch identifier"))
+      .AddParameter("layer", _("Layer"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("camera", _("Camera"), "", true)
+      .SetDefaultValue("0");
+
+  extension
+      .AddExpression("TouchY",
+                     _("Touch Y position"),
+                     _("Touch Y position"),
+                     _("Multitouch"),
+                     "res/conditions/touch.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("expression", _("Touch identifier"))
+      .AddParameter("layer", _("Layer"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("camera", _("Camera"), "", true)
+      .SetDefaultValue("0");
+
   extension
       .AddExpression("LastTouchId",
                      _("Identifier of the last touch"),
                      _("Identifier of the last touch"),
-                     _("Mouse and touch/Multitouch"),
+                     _("Multitouch"),
                      "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "");
 
@@ -299,7 +382,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .AddExpression("LastEndedTouchId",
                      _("Identifier of the last ended touch"),
                      _("Identifier of the last ended touch"),
-                     _("Mouse and touch/Multitouch"),
+                     _("Multitouch"),
                      "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "");
 

Core/GDCore/Extensions/Builtin/NetworkExtension.cpp

@@ -15,8 +15,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(
       .SetExtensionInformation(
           "BuiltinNetwork",
           _("Basic internet features"),
-          _("Features to send web requests, communicate with external \"APIs\" "
-            "and other network related tasks."),
+          _("Built-in extension providing network features."),
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/network");
@@ -25,79 +24,31 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(
   extension
       .AddAction(
           "SendRequest",
-          "Send a request to a web page",
-          "Send a request to the specified web page.\n\nPlease note that for "
-          "the web games, the game must be hosted on the same host "
-          "as specified below, except if the server is configured to answer "
-          "to all requests (cross-domain requests).",
-          "Send _PARAM3_ request to _PARAM0__PARAM1_ with body: _PARAM2_",
-          _("Network"),
-          "res/actions/net24.png",
-          "res/actions/net.png")
-      .AddParameter("string", "Host, with protocol")
-      .SetParameterLongDescription("Example: \"http://example.com/\".")
-      .AddParameter("string", "Path")
-      .SetParameterLongDescription(
-          "Example: \"/user/123\" or \"/some-page.php\".")
-      .AddParameter("string", "Request body content")
-      .AddParameter("string", "Method: \"POST\" or \"GET\"", "", true)
-      .SetParameterLongDescription("If empty, \"GET\" will be used.")
-      .SetDefaultValue("\"GET\"")
-      .AddParameter("string", "Content type", "", true)
-      .SetParameterLongDescription(
-          "If empty, \"application/x-www-form-urlencoded\" will be used.")
-      .AddParameter("scenevar", "Reponse scene variable", "", true)
-      .SetParameterLongDescription(
-          "The response of the server will be stored, as a string, in this "
-          "variable. If the server returns *JSON*, you may want to use the "
-          "action \"Convert JSON to a scene variable\" afterwards, to "
-          "explore the results with a *structure variable*.")
-      .MarkAsComplex()
-      .SetHidden();
-
-  extension
-      .AddAction(
-          "SendAsyncRequest",
           _("Send a request to a web page"),
-          _("Send an asynchronous request to the specified web page.\n\nPlease "
-            "note that for "
-            "the web games, the game must be hosted on the same host "
+          _("Send a request to the specified web page.\n\nPlease note that for "
+            "the web platform games, the game must be hosted on the same host "
             "as specified below, except if the server is configured to answer "
             "to all requests (cross-domain requests)."),
-          _("Send a _PARAM2_ request to _PARAM0_ with body: _PARAM1_, and "
-            "store the result in _PARAM4_ (or in _PARAM5_ in case of error)"),
+          _("Send _PARAM3_ request to _PARAM0__PARAM1_ with body: _PARAM2_"),
           _("Network"),
           "res/actions/net24.png",
           "res/actions/net.png")
-      .AddParameter("string", _("URL (API or web-page address)"))
-      .SetParameterLongDescription(
-          _("Example: \"https://example.com/user/123\". Using *https* is "
-            "highly recommended."))
+      .AddParameter("string", _("Host (example: http://www.some-server.org/)"))
+      .AddParameter("string", _("Path to page (Example: /page.php)"))
       .AddParameter("string", _("Request body content"))
-      .AddParameter("stringWithSelector",
-                    _("Request method"),
-                    "[\"GET\", \"POST\", \"PUT\", \"HEAD\", \"DELETE\", "
-                    "\"PATCH\", \"OPTIONS\"]",
-                    false)
-      .SetParameterLongDescription(_("If empty, \"GET\" will be used."))
+      .AddParameter(
+          "string",
+          _("Method: \"POST\" or \"GET\" (if empty, GET will be used)"),
+          "",
+          true)
       .SetDefaultValue("\"GET\"")
-      .AddParameter("string", _("Content type"), "", true)
-      .SetParameterLongDescription(
-          _("If empty, \"application/x-www-form-urlencoded\" will be used."))
       .AddParameter(
-          "scenevar", _("Variable where to store the response"), "", true)
-      .SetParameterLongDescription(
-          _("The response of the server will be stored, as a string, in this "
-            "variable. If the server returns *JSON*, you may want to use the "
-            "action \"Convert JSON to a scene variable\" afterwards, to "
-            "explore the results with a *structure variable*."))
+          "string",
+          _("Content type (application/x-www-form-urlencoded by default)"),
+          "",
+          true)
       .AddParameter(
-          "scenevar", _("Variable where to store the error message"), "", true)
-      .SetParameterLongDescription(
-          _("Optional, only used if an error occurs. This will contain the "
-            "error message (if request could not be sent) or the [\"status "
-            "code\"](https://en.wikipedia.org/wiki/List_of_HTTP_status_codes), "
-            "if the server returns a status >= 400."))
+          "scenevar", _("Store the response in this variable"), "", true)
       .MarkAsComplex();
 
   extension
@@ -114,27 +65,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(
                     _("Path to file (for example : /folder/file.txt)"))
       .AddParameter("string", _("Save as"));
 
-  extension
-      .AddAction(
-          "EnableMetrics",
-          _("Enable (or disable) metrics collection"),
-          _("Enable, or disable, the sending of anonymous data used to compute "
-            "the number of sessions and other metrics from your game "
-            "players.\nBe sure to only send metrics if in accordance with the "
-            "terms of service of your game and if they player gave their "
-            "consent, depending on how your game/company handles this."),
-          _("Enable analytics metrics: _PARAM1_"),
-          _("Network"),
-          "res/actions/net24.png",
-          "res/actions/net.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("yesorno", _("Enable the metrics?"));
-
   extension
       .AddAction(
           "JSONToVariableStructure",
-          _("Convert JSON to a scene variable"),
-          _("Parse a JSON object and store it into a scene variable"),
+          _("Convert JSON to a variable"),
+          _("Parse a JSON object and store it into a variable"),
           _("Parse JSON string _PARAM0_ and store it into variable _PARAM1_"),
           _("Network"),
           "res/actions/net24.png",
@@ -174,11 +109,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(
 
   extension
       .AddStrExpression("ToJSON",
-                        _("Convert scene variable to JSON"),
-                        _("Convert a scene variable to JSON"),
+                        _("Convert variable to JSON"),
+                        _("Convert a variable to JSON"),
                         _("Conversion"),
                         "res/conditions/toujours24.png")
-      .AddParameter("scenevar", _("Scene variable to be stringified"));
+      .AddParameter("scenevar", _("The variable to be stringified"));
 
   extension
       .AddStrExpression("GlobalVarToJSON",

Core/GDCore/Extensions/Builtin/SceneExtension.cpp

@@ -15,7 +15,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
       .SetExtensionInformation(
           "BuiltinScene",
           _("Scene management features"),
-          _("Actions and conditions to manipulate the scenes during the game."),
+          _("Built-in extension allowing to manipulate scenes and providing common features"),
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("" /*TODO: Add a documentation page for this */);
@@ -91,18 +91,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
       .AddCodeOnlyParameter("currentScene", "")
       .MarkAsSimple();
 
-  extension
-      .AddCondition("SceneJustResumed",
-                    _("Scene just resumed"),
-                    _("The scene has just resumed after being paused."),
-                    _("Scene just resumed"),
-                    _("Scene"),
-                    "res/conditions/depart24.png",
-                    "res/conditions/depart.png")
-      .SetHelpPath("/interface/scene-editor/events")
-      .AddCodeOnlyParameter("currentScene", "")
-      .MarkAsSimple();
-
   extension
       .AddAction("Scene",
                  _("Change the scene"),

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

@@ -21,7 +21,7 @@ Direction::~Direction(){};
 
 void Direction::SetLoop(bool loop_) { loop = loop_; }
 
-void Direction::SetTimeBetweenFrames(double time) { timeBetweenFrame = time; }
+void Direction::SetTimeBetweenFrames(float time) { timeBetweenFrame = time; }
 
 void Direction::AddSprite(const Sprite& sprite) { sprites.push_back(sprite); }
 

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

@@ -43,14 +43,14 @@ class GD_CORE_API Direction {
   /**
    * \brief Get the time between each sprite
    */
-  inline double GetTimeBetweenFrames() const { return timeBetweenFrame; }
+  inline float GetTimeBetweenFrames() const { return timeBetweenFrame; }
 
   /**
    * \brief Set the time between each sprite
    *
    * \param time Time between each sprite, in seconds.
    */
-  void SetTimeBetweenFrames(double time);
+  void SetTimeBetweenFrames(float time);
 
   /**
    * \brief Return a reference to a sprite of the direction.
@@ -133,7 +133,7 @@ class GD_CORE_API Direction {
 
  private:
   bool loop;               ///< true if the animation must loop.
-  double timeBetweenFrame;  ///< The time between each sprite of the animation.
+  float timeBetweenFrame;  ///< The time between each sprite of the animation.
   std::vector<Sprite> sprites;  ///< The sprites of the direction.
 #if defined(GD_IDE_ONLY)
   gd::String metadata;

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

@@ -31,30 +31,35 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
 
 #if defined(GD_IDE_ONLY)
   obj.AddAction("Opacity",
-                _("Change sprite opacity"),
+                _("Change Sprite opacity"),
                 _("Change the opacity of a Sprite. 0 is fully transparent, 255 "
                   "is opaque (default)."),
-                _("the opacity"),
+                _("Do _PARAM1__PARAM2_ to the opacity of _PARAM0_"),
                 _("Visibility"),
                 "res/actions/opacity24.png",
                 "res/actions/opacity.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number")
-      .MarkAsSimple();
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("Value (between 0 and 255)"))
+      .MarkAsSimple()
+      .SetManipulatedType("number");
 
   obj.AddAction("ChangeAnimation",
                 _("Change the animation"),
                 _("Change the animation of the object, using the animation "
                   "number in the animations list."),
-                _("the number of the animation"),
+                _("Do _PARAM1__PARAM2_ to the number of current animation of "
+                  "_PARAM0_"),
                 _("Animations and images"),
                 "res/actions/animation24.png",
                 "res/actions/animation.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number")
-      .MarkAsSimple();
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("Value"))
+      .MarkAsSimple()
+      .SetManipulatedType("number");
 
   obj.AddAction("SetAnimationName",
                 _("Change the animation (by name)"),
@@ -66,7 +71,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                 "res/actions/animation.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("objectAnimationName", _("Animation name"))
+      .AddParameter("string", _("Animation name"))
       .MarkAsAdvanced();
 
   obj.AddAction(
@@ -75,31 +80,35 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
          _("Change the direction of the object.\nIf the object is set to "
            "automatically rotate, the direction is its angle.\nIf the object "
            "is in 8 directions mode, the valid directions are 0..7"),
-         _("the direction"),
+         _("Do _PARAM1__PARAM2_ to the direction of _PARAM0_"),
          _("Direction"),
          "res/actions/direction24.png",
          "res/actions/direction.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("Value"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   obj.AddAction("ChangeSprite",
                 _("Current frame"),
                 _("Modify the current frame of the object"),
-                _("the animation frame"),
+                _("Do _PARAM1__PARAM2_ to animation frame of _PARAM0_"),
                 _("Animations and images"),
                 "res/actions/sprite24.png",
                 "res/actions/sprite.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("Value"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   obj.AddAction("PauseAnimation",
                 _("Pause the animation"),
-                _("Pause the animation of the object"),
-                _("Pause the animation of _PARAM0_"),
+                _("Pause the current animation of the object"),
+                _("Pause the current animation of _PARAM0_"),
                 _("Animations and images"),
                 "res/actions/animation24.png",
                 "res/actions/animation.png")
@@ -109,8 +118,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
 
   obj.AddAction("PlayAnimation",
                 _("Play the animation"),
-                _("Play the animation of the object"),
-                _("Play the animation of _PARAM0_"),
+                _("Play the current animation of the object"),
+                _("Play the current animation of _PARAM0_"),
                 _("Animations and images"),
                 "res/actions/animation24.png",
                 "res/actions/animation.png")
@@ -123,19 +132,21 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
          _("Animation speed scale"),
          _("Modify the animation speed scale (1 = the default speed, >1 = "
            "faster and <1 = slower)."),
-         _("the animation speed scale"),
+         _("Do _PARAM1__PARAM2_ to the animation speed scale of _PARAM0_"),
          _("Animations and images"),
          "res/actions/animation24.png",
          "res/actions/animation.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number")
-      .MarkAsSimple();
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("Value"))
+      .MarkAsSimple()
+      .SetManipulatedType("number");
 
   obj.AddAction("TourneVersPos",
-                "Rotate an object toward a position",
-                "Rotate an object towards a position.",
-                "Rotate _PARAM0_ towards _PARAM1_;_PARAM2_",
+                _("Rotate an object toward a position"),
+                _("Rotate an object towards a position."),
+                _("Rotate _PARAM0_ towards _PARAM1_;_PARAM2_"),
                 _("Direction"),
                 "res/actions/direction24.png",
                 "res/actions/direction.png")
@@ -151,86 +162,98 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
   obj.AddAction("ChangeScale",
                 _("Scale"),
                 _("Modify the scale of the specified object."),
-                _("the scale"),
+                _("Do _PARAM1__PARAM2_ to the scale of _PARAM0_"),
                 _("Size"),
                 "res/actions/scale24.png",
                 "res/actions/scale.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number")
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("Value"))
       .MarkAsAdvanced();
 
   obj.AddAction("ChangeScaleWidth",
                 _("Scale on X axis"),
                 _("Modify the scale of the width of an object."),
-                _("the width's scale"),
+                _("Do _PARAM1__PARAM2_ to the width's scale of _PARAM0_"),
                 _("Size"),
                 "res/actions/scale24.png",
                 "res/actions/scale.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("Value"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   obj.AddAction("ChangeScaleHeight",
                 _("Scale on Y axis"),
                 _("Modify the scale of the height of an object."),
-                _("the height's scale"),
+                _("Do _PARAM1__PARAM2_ to the height's scale of _PARAM0_"),
                 _("Size"),
                 "res/actions/scale24.png",
                 "res/actions/scale.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("Value"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   obj.AddAction("ChangeWidth",
                 _("Width"),
                 _("Change the width of a Sprite object."),
-                _("the width"),
+                _("Do _PARAM1__PARAM2_ to the width of _PARAM0_"),
                 _("Size"),
                 "res/actions/scale24.png",
                 "res/actions/scale.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("Value"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   obj.AddAction("ChangeHeight",
                 _("Height"),
                 _("Change the height of a Sprite object."),
-                _("the height"),
+                _("Do _PARAM1__PARAM2_ to the height of _PARAM0_"),
                 _("Size"),
                 "res/actions/scale24.png",
                 "res/actions/scale.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("Value"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   obj.AddCondition(
          "Animation",
          _("Current animation"),
-         _("Compare the number of the animation played by the object."),
-         _("the number of the animation"),
+         _("Compare the number of the current animation of the object."),
+         _("The number of the current animation of _PARAM0_ is "
+           "_PARAM1__PARAM2_"),
          _("Animations and images"),
          "res/conditions/animation24.png",
          "res/conditions/animation.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Number to test"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   obj.AddCondition("AnimationName",
                    _("Current animation name"),
-                   _("Check the animation by played by the object."),
+                   _("Check the current animation of the object."),
                    _("The animation of _PARAM0_ is _PARAM1_"),
                    _("Animations and images"),
                    "res/conditions/animation24.png",
                    "res/conditions/animation.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("objectAnimationName", _("Animation name"))
+      .AddParameter("string", _("Animation name"))
       .MarkAsAdvanced();
 
   obj.AddCondition(
@@ -239,31 +262,33 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
          _("Compare the direction of the object. If 8 direction mode is "
            "activated for the sprite, the value taken for direction will be "
            "from 0 to 7. Otherwise, the direction is in degrees."),
-         _("the direction"),
+         _("Direction of _PARAM0_ is _PARAM1__PARAM2_"),
          _("Direction"),
          "res/conditions/direction24.png",
          "res/conditions/direction.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters("number");
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Direction to test"))
+      .SetManipulatedType("number");
 
   obj.AddCondition("Sprite",
                    _("Current frame"),
-                   _("Compare the index of the current frame in the animation "
-                     "displayed by the specified object. The first frame in an "
-                     "animation starts at index 0."),
-                   _("the animation frame"),
+                   _("Test the number of the current animation frame."),
+                   _("The animation frame of _PARAM0_ is _PARAM1__PARAM2_"),
                    _("Animations and images"),
                    "res/conditions/sprite24.png",
                    "res/conditions/sprite.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Animation frame to test"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   obj.AddCondition("AnimStopped",
                    _("Animation paused"),
-                   _("Check if the animation of an object is paused."),
+                   _("Test if the animation of an object is paused"),
                    _("The animation of _PARAM0_ is paused"),
                    _("Animations and images"),
                    "res/conditions/animation24.png",
@@ -287,52 +312,62 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
   obj.AddCondition("ScaleWidth",
                    _("Scale on X axis"),
                    _("Compare the scale of the width of an object."),
-                   _("the width's scale"),
+                   _("The width's scale of _PARAM0_ is _PARAM1__PARAM2_"),
                    _("Size"),
                    "res/conditions/scaleWidth24.png",
                    "res/conditions/scaleWidth.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Value to compare"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   obj.AddCondition("ScaleHeight",
                    _("Scale on Y axis"),
                    _("Compare the scale of the height of an object."),
-                   _("the height's scale"),
+                   _("The height's scale of _PARAM0_ is _PARAM1__PARAM2_"),
                    _("Size"),
                    "res/conditions/scaleHeight24.png",
                    "res/conditions/scaleHeight.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Value to compare"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   obj.AddCondition("Opacity",
                    _("Opacity"),
                    _("Compare the opacity of a Sprite, between 0 (fully "
                      "transparent) to 255 (opaque)."),
-                   _("the opacity"),
+                   _("The opacity of _PARAM0_ is _PARAM1__PARAM2_"),
                    _("Visibility"),
                    "res/conditions/opacity24.png",
                    "res/conditions/opacity.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters("number")
-      .MarkAsSimple();
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Value to compare"))
+      .MarkAsSimple()
+      .SetManipulatedType("number");
 
   obj.AddCondition(
          "BlendMode",
          _("Blend mode"),
          _("Compare the number of the blend mode currently used by an object"),
-         _("the number of the current blend mode"),
+         _("The number of the current blend mode of _PARAM0_ is "
+           "_PARAM1__PARAM2_"),
          _("Effects"),
          "res/conditions/opacity24.png",
          "res/conditions/opacity.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression",
+                    _("Value to compare (0: Alpha, 1: Add, 2: Multiply, 3: None)"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   obj.AddAction("CopyImageOnImageOfSprite",
                 _("Copy an image on the current one of an object"),
@@ -367,21 +402,22 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
       .AddParameter("object", _("Object"), "Sprite")
       .AddParameter("color", _("Color to make transparent"));
 
-  obj.AddAction("ChangeColor",
-                _("Tint color"),
-                _("Change the tint of an object. The default color is white."),
-                _("Change tint of _PARAM0_ to _PARAM1_"),
-                _("Effects"),
-                "res/actions/color24.png",
-                "res/actions/color.png")
+  obj.AddAction(
+         "ChangeColor",
+         _("Global color"),
+         _("Change the global color of an object. The default color is white."),
+         _("Change color of _PARAM0_ to _PARAM1_"),
+         _("Effects"),
+         "res/actions/color24.png",
+         "res/actions/color.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("color", _("Tint"));
+      .AddParameter("color", _("Color"));
 
   obj.AddAction("ChangeBlendMode",
                 _("Blend mode"),
                 _("Change the number of the blend mode of an object.\nThe "
-                  "default blend mode is 0 (Normal)."),
+                  "default blend mode is 0 (Alpha)."),
                 _("Change Blend mode of _PARAM0_ to _PARAM1_"),
                 _("Effects"),
                 "res/actions/color24.png",
@@ -389,7 +425,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
 
       .AddParameter("object", _("Object"), "Sprite")
       .AddParameter("expression",
-                    _("Mode (0: Normal, 1: Add, 2: Multiply, 3: Screen)"))
+                    _("Mode (0 : Alpha, 1 : Add, 2 : Multiply, 3 : None)"))
       .MarkAsSimple();
 
   obj.AddAction("FlipX",
@@ -418,7 +454,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
 
   obj.AddCondition("FlippedX",
                    _("Horizontally flipped"),
-                   _("Check if the object is horizontally flipped"),
+                   _("Return true if the object is horizontally flipped"),
                    _("_PARAM0_ is horizontally flipped"),
                    _("Effects"),
                    "res/actions/flipX24.png",
@@ -428,7 +464,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
 
   obj.AddCondition("FlippedY",
                    _("Vertically flipped"),
-                   _("Check if the object is vertically flipped"),
+                   _("Return true if the object is vertically flipped"),
                    _("_PARAM0_ is vertically flipped"),
                    _("Effects"),
                    "res/actions/flipY24.png",
@@ -437,15 +473,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
       .AddParameter("object", _("Object"), "Sprite");
 
   obj.AddAction("TourneVers",
-                "Rotate an object toward another",
-                "Rotate an object towards another.",
-                "Rotate _PARAM0_ towards _PARAM1_",
+                _("Rotate an object toward another"),
+                _("Rotate an object towards another."),
+                _("Rotate _PARAM0_ towards _PARAM1_"),
                 _("Direction"),
                 "res/actions/direction24.png",
                 "res/actions/direction.png")
 
-      .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("objectPtr", "Rotate toward this object")
+      .AddParameter("object", _("Object to be rotated"), "Sprite")
+      .AddParameter("objectPtr", _("Rotate toward this object"))
       .AddCodeOnlyParameter("currentScene", "")
       .SetHidden();  // Deprecated
 
@@ -456,7 +492,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     "res/actions/position.png")
       .SetHidden()
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("objectPointName", _("Name of the point"), "", true);
+      .AddParameter("string", _("Name of the point"), "", true);
 
   obj.AddExpression("Y",
                     _("Y position of a point"),
@@ -465,7 +501,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     "res/actions/position.png")
       .SetHidden()
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("objectPointName", _("Name of the point"), "", true);
+      .AddParameter("string", _("Name of the point"), "", true);
 
   obj.AddExpression("PointX",
                     _("X position of a point"),
@@ -474,7 +510,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     "res/actions/position.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("objectPointName", _("Name of the point"));
+      .AddParameter("string", _("Name of the point"));
 
   obj.AddExpression("PointY",
                     _("Y position of a point"),
@@ -483,7 +519,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     "res/actions/position.png")
 
       .AddParameter("object", _("Object"), "Sprite")
-      .AddParameter("objectPointName", _("Name of the point"));
+      .AddParameter("string", _("Name of the point"));
 
   obj.AddExpression("Direc",
                     _("Direction"),

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

@@ -107,7 +107,8 @@ void SpriteObject::DoSerializeTo(gd::SerializerElement& element) const {
   }
 }
 
-std::map<gd::String, gd::PropertyDescriptor> SpriteObject::GetProperties() const {
+std::map<gd::String, gd::PropertyDescriptor> SpriteObject::GetProperties(
+    gd::Project& project) const {
   std::map<gd::String, gd::PropertyDescriptor> properties;
   properties[_("Animate even if hidden or far from the screen")]
       .SetValue(updateIfNotVisible ? "true" : "false")
@@ -118,7 +119,8 @@ std::map<gd::String, gd::PropertyDescriptor> SpriteObject::GetProperties() const
 }
 
 bool SpriteObject::UpdateProperty(const gd::String& name,
-                                  const gd::String& value) {
+                                  const gd::String& value,
+                                  gd::Project& project) {
   if (name == _("Animate even if hidden or far from the screen"))
     updateIfNotVisible = value == "1";
 
@@ -143,7 +145,10 @@ SpriteObject::GetInitialInstanceProperties(const gd::InitialInstance& position,
                                            gd::Project& project,
                                            gd::Layout& scene) {
   std::map<gd::String, gd::PropertyDescriptor> properties;
-  properties[_("Animation")] = gd::String::From(position.GetRawDoubleProperty("animation"));
+  properties[_("Animation")] =
+      position.floatInfos.find("animation") != position.floatInfos.end()
+          ? gd::String::From(position.floatInfos.find("animation")->second)
+          : gd::String("0");
 
   return properties;
 }
@@ -154,7 +159,7 @@ bool SpriteObject::UpdateInitialInstanceProperty(gd::InitialInstance& position,
                                                  gd::Project& project,
                                                  gd::Layout& scene) {
   if (name == _("Animation"))
-    position.SetRawDoubleProperty("animation", value.To<int>());
+    position.floatInfos["animation"] = value.To<int>();
 
   return true;
 }

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

@@ -48,9 +48,11 @@ class GD_CORE_API SpriteObject : public gd::Object {
 #if defined(GD_IDE_ONLY)
   void ExposeResources(gd::ArbitraryResourceWorker& worker) override;
 
-  std::map<gd::String, gd::PropertyDescriptor> GetProperties() const override;
+  std::map<gd::String, gd::PropertyDescriptor> GetProperties(
+      gd::Project& project) const override;
   bool UpdateProperty(const gd::String& name,
-                      const gd::String& value) override;
+                      const gd::String& value,
+                      gd::Project& project) override;
 
   std::map<gd::String, gd::PropertyDescriptor> GetInitialInstanceProperties(
       const gd::InitialInstance& position,

Core/GDCore/Extensions/Builtin/StringInstructionsExtension.cpp

@@ -16,7 +16,8 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
       .SetExtensionInformation(
           "BuiltinStringInstructions",
           _("Text manipulation"),
-          "Provides expressions to manipulate strings (also called texts).",
+          _("Built-in extension providing expressions for manipulating text "
+            "objects."),
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("" /*TODO: Add a documentation page for this */);
@@ -112,26 +113,12 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
 
   extension
       .AddExpression("StrRFind",
-                     "Search in a text from the end",
-                     "Search in a text from the end (return the position of "
-                     "the result or -1 if not found)",
+                     _("Search in a text from the end"),
+                     _("Search in a text from the end (return the position of "
+                       "the result or -1 if not found)"),
                      _("Manipulation of text"),
                      "res/conditions/toujours24.png")
 
-      .AddParameter("string", _("Text"))
-      .AddParameter("string", _("Text to search for"))
-      .SetHidden();  // Deprecated, see StrFindLast instead.
-
-  extension
-      .AddExpression(
-          "StrFindLast",
-          _("Search the last occurence in a text"),
-          _("Search the last occurence in a string (return the position of "
-            "the result, from the beginning of the string, or -1 if not "
-            "found)"),
-          _("Manipulation of text"),
-          "res/conditions/toujours24.png")
-
       .AddParameter("string", _("Text"))
       .AddParameter("string", _("Text to search for"));
 
@@ -152,27 +139,9 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
   extension
       .AddExpression(
           "StrRFindFrom",
-          "Search in a text from the end, starting from a position",
-          "Search in a text from the end, starting from a position (return "
-          "the position of the result or -1 if not found)",
-          _("Manipulation of text"),
-          "res/conditions/toujours24.png")
-
-      .AddParameter("string", _("Text"))
-      .AddParameter("string", _("Text to search for"))
-      .AddParameter("expression",
-                    "Position of the last character in the string to be "
-                    "considered in the search")
-      .SetHidden();  // Deprecated, see StrFindLastFrom instead.
-
-  extension
-      .AddExpression(
-          "StrFindLastFrom",
-          _("Search the last occurence in a text, starting from a position"),
-          _("Search in a text the last occurence, starting from a position "
-            "(return "
-            " the position of the result, from the beginning of the string, or "
-            "-1 if not found)"),
+          _("Search in a text from the end, starting from a position"),
+          _("Search in a text from the end, starting from a position (return "
+            "the position of the result or -1 if not found)"),
           _("Manipulation of text"),
           "res/conditions/toujours24.png")
 

Core/GDCore/Extensions/Builtin/TimeExtension.cpp

@@ -12,14 +12,12 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation(
-          "BuiltinTime",
-          _("Time"),
-          "Actions and conditions to run timers, get the current time or "
-          "modify the time scale (speed at which the game is running - useful "
-          "for slow motion effects).",
-          "Florian Rival",
-          "Open source (MIT License)")
+      .SetExtensionInformation("BuiltinTime",
+                               _("Time"),
+                               _("Built-in extension providing actions and "
+                                 "conditions related to time."),
+                               "Florian Rival",
+                               "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/timers");
 
 #if defined(GD_IDE_ONLY)
@@ -40,13 +38,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
       .AddCondition("TimeScale",
                     _("Time scale"),
                     _("Test the time scale."),
-                    _("the time scale"),
+                    _("The time scale is _PARAM1__PARAM2_"),
                     _("Timers and time"),
                     "res/conditions/time24.png",
                     "res/conditions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardRelationalOperatorParameters("number")
-      .MarkAsAdvanced();
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Value to compare"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   extension
       .AddCondition("TimerPaused",
@@ -123,16 +123,16 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
 
   extension
       .AddExpression("TimeDelta",
-                     _("Time elapsed since the last frame"),
-                     _("Time elapsed since the last frame rendered on screen"),
+                     _("Time elapsed since the last image"),
+                     _("Time elapsed since the last image"),
                      _("Time"),
                      "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "");
 
   extension
       .AddExpression("TempsFrame",
-                     _("Time elapsed since the last frame"),
-                     _("Time elapsed since the last frame rendered on screen"),
+                     _("Time elapsed since the last image"),
+                     _("Time elapsed since the last image"),
                      _("Time"),
                      "res/actions/time.png")
       .SetHidden()
@@ -140,8 +140,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
 
   extension
       .AddExpression("ElapsedTime",
-                     _("Time elapsed since the last frame"),
-                     _("Time elapsed since the last frame rendered on screen"),
+                     _("Time elapsed since the last image"),
+                     _("Time elapsed since the last image"),
                      _("Time"),
                      "res/actions/time.png")
       .SetHidden()

Core/GDCore/Extensions/Builtin/VariablesExtension.cpp

@@ -15,10 +15,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .SetExtensionInformation(
           "BuiltinVariables",
           _("Variable features"),
-          "Actions, conditions and expressions to handle variables, from "
-          "simple variables like the player score, the number of remaining "
-          "lives to complex variables containing arbitrary data like an "
-          "inventory or the result of a web request.",
+          _("Built-in extension allowing to manipulate variables"),
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/variables");
@@ -28,44 +25,35 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddCondition("VarScene",
                     _("Value of a scene variable"),
                     _("Compare the value of a scene variable."),
-                    _("the scene variable _PARAM0_"),
+                    _("Scene variable _PARAM0_ is _PARAM1__PARAM2_"),
                     _("Variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .UseStandardRelationalOperatorParameters("number");
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Value to compare"))
+      .SetManipulatedType("number");
 
   extension
       .AddCondition("VarSceneTxt",
                     _("Text of a scene variable"),
                     _("Compare the text of a scene variable."),
-                    _("the text of scene variable _PARAM0_"),
+                    _("The text of scene variable _PARAM0_ is _PARAM1__PARAM2_"),
                     _("Variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .UseStandardRelationalOperatorParameters("string");
-
-  extension
-      .AddCondition(
-          "SceneVariableAsBoolean",
-          _("Boolean value of a scene variable"),
-          _("Compare the boolean value of a scene variable."),
-          _("The boolean value of scene variable _PARAM0_ is _PARAM1_"),
-          _("Variables"),
-          "res/conditions/var24.png",
-          "res/conditions/var.png")
-      .AddParameter("scenevar", _("Variable"))
-      .AddParameter("trueorfalse", _("Check if the value is"))
-      .SetDefaultValue("true");
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("string", _("Text to compare"))
+      .SetManipulatedType("string");
 
   extension
       .AddCondition(
           "VariableChildExists",
           _("Child existence"),
-          _("Check if the specified child of the scene variable exists."),
+          _("Return true if the specified child of the scene variable exists."),
           _("Child _PARAM1_ of scene variable _PARAM0_ exists"),
-          _("Variables/Collections/Structures"),
+          _("Variables/Structures"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
@@ -75,10 +63,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
   extension
       .AddCondition("GlobalVariableChildExists",
                     _("Child existence"),
-                    _("Check if the specified child of the global "
+                    _("Return true if the specified child of the global "
                       "variable exists."),
                     _("Child _PARAM1_ of global variable _PARAM0_ exists"),
-                    _("Variables/Global variables/Collections/Structures"),
+                    _("Variables/Global variables/Structures"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
@@ -87,9 +75,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddCondition("VarSceneDef",
-                    "Test if a scene variable is defined",
-                    "Test if the scene variable exists.",
-                    "Scene variable _PARAM0_ is defined",
+                    _("Test if a scene variable is defined"),
+                    _("Test if the scene variable exists."),
+                    _("Scene variable _PARAM0_ is defined"),
                     _("Variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
@@ -101,44 +89,36 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddCondition("VarGlobal",
                     _("Value of a global variable"),
                     _("Compare the value of a global variable."),
-                    _("the global variable _PARAM0_"),
+                    _("Global variable _PARAM0_ is _PARAM1__PARAM2_"),
                     _("Variables/Global variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .UseStandardRelationalOperatorParameters("number")
-      .MarkAsAdvanced();
-
-  extension
-      .AddCondition("VarGlobalTxt",
-                    _("Text of a global variable"),
-                    _("Compare the text of a global variable."),
-                    _("the text of the global variable _PARAM0_"),
-                    _("Variables/Global variables"),
-                    "res/conditions/var24.png",
-                    "res/conditions/var.png")
-      .AddParameter("globalvar", _("Variable"))
-      .UseStandardRelationalOperatorParameters("string")
-      .MarkAsAdvanced();
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("expression", _("Value to compare"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   extension
       .AddCondition(
-          "GlobalVariableAsBoolean",
-          _("Boolean value of a global variable"),
-          _("Compare the boolean value of a global variable."),
-          _("The boolean value of global variable _PARAM0_ is _PARAM1_"),
+          "VarGlobalTxt",
+          _("Text of a global variable"),
+          _("Compare the text of a global variable."),
+          _("The text of the global variable _PARAM0_ is _PARAM1__PARAM2_"),
           _("Variables/Global variables"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .AddParameter("trueorfalse", _("Check if the value is"))
-      .SetDefaultValue("true");
+      .AddParameter("relationalOperator", _("Sign of the test"))
+      .AddParameter("string", _("Text to compare"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("string");
 
   extension
       .AddCondition("VarGlobalDef",
-                    "Test if a global variable is defined",
-                    "Test if a global variable exists",
-                    "Global variable _PARAM0_ is defined",
+                    _("Test if a global variable is defined"),
+                    _("Test if a global variable exists"),
+                    _("Global variable _PARAM0_ is defined"),
                     _("Variables/Global variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
@@ -150,103 +130,64 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
   extension
       .AddAction("ModVarScene",
                  _("Value of a scene variable"),
-                 _("Change the value of a scene variable."),
-                 _("the scene variable _PARAM0_"),
+                 _("Modify the value of a scene variable."),
+                 _("Do _PARAM1__PARAM2_ to scene variable _PARAM0_"),
                  _("Variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .UseStandardOperatorParameters("number");
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("Value"))
+      .SetManipulatedType("number");
 
   extension
       .AddAction("ModVarSceneTxt",
                  _("String of a scene variable"),
                  _("Modify the text of a scene variable."),
-                 _("the text of scene variable _PARAM0_"),
+                 _("Do _PARAM1__PARAM2_ to the text of scene variable _PARAM0_"),
                  _("Variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .UseStandardOperatorParameters("string");
-
-  extension
-      .AddAction(
-          "SetSceneVariableAsBoolean",
-          _("Boolean value of a scene variable"),
-          _("Modify the boolean value of a scene variable."),
-          _("Set the boolean value of scene variable _PARAM0_ to _PARAM1_"),
-          _("Variables"),
-          "res/conditions/var24.png",
-          "res/conditions/var.png")
-      .AddParameter("scenevar", _("Variable"))
-      .AddParameter("trueorfalse", _("New Value:"));
-
-  extension
-      .AddAction("ToggleSceneVariableAsBoolean",
-                 _("Toggle boolean value of a scene variable"),
-                 _("Toggle the boolean value of a scene variable.") + "\n" +
-                     _("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_"),
-                 _("Variables"),
-                 "res/conditions/var24.png",
-                 "res/conditions/var.png")
-      .AddParameter("scenevar", _("Variable"));
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("string", _("Text"))
+      .SetManipulatedType("string");
 
   extension
       .AddAction("ModVarGlobal",
                  _("Value of a global variable"),
-                 _("Change the value of a global variable"),
-                 _("the global variable _PARAM0_"),
+                 _("Modify the value of a global variable"),
+                 _("Do _PARAM1__PARAM2_ to global variable _PARAM0_"),
                  _("Variables/Global variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .UseStandardOperatorParameters("number")
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("ModVarGlobalTxt",
-                 _("String of a global variable"),
-                 _("Modify the text of a global variable."),
-                 _("the text of global variable _PARAM0_"),
-                 _("Variables/Global variables"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("globalvar", _("Variable"))
-      .UseStandardOperatorParameters("string")
-      .MarkAsAdvanced();
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("Value"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("number");
 
   extension
       .AddAction(
-          "SetGlobalVariableAsBoolean",
-          _("Boolean value of a global variable"),
-          _("Modify the boolean value of a global variable."),
-          _("Set the boolean value of global variable _PARAM0_ to _PARAM1_"),
+          "ModVarGlobalTxt",
+          _("String of a global variable"),
+          _("Modify the text of a global variable."),
+          _("Do _PARAM1__PARAM2_ to the text of global variable _PARAM0_"),
           _("Variables/Global variables"),
-          "res/conditions/var24.png",
-          "res/conditions/var.png")
+          "res/actions/var24.png",
+          "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .AddParameter("trueorfalse", _("New Value:"));
-
-  extension
-      .AddAction("ToggleGlobalVariableAsBoolean",
-                 _("Toggle boolean value of a global variable"),
-                 _("Toggle the boolean value of a global variable.") + "\n" +
-                     _("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_"),
-                 _("Variables/Global variables"),
-                 "res/conditions/var24.png",
-                 "res/conditions/var.png")
-      .AddParameter("globalvar", _("Variable"));
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("string", _("Text"))
+      .MarkAsAdvanced()
+      .SetManipulatedType("string");
 
   extension
       .AddAction("VariableRemoveChild",
                  _("Remove a child"),
                  _("Remove a child from a scene variable."),
                  _("Remove child _PARAM1_ from scene variable _PARAM0_"),
-                 _("Variables/Collections/Structures"),
+                 _("Variables/Structure"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
@@ -258,7 +199,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Remove a child"),
                  _("Remove a child from a global variable."),
                  _("Remove child _PARAM1_ from global variable _PARAM0_"),
-                 _("Variables/Global variables/Collections/Structures"),
+                 _("Variables/Global variables/Structure"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
@@ -270,7 +211,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Clear scene variable"),
                  _("Remove all the children from the scene variable."),
                  _("Clear children from scene variable _PARAM0_"),
-                 _("Variables/Collections"),
+                 _("Variables/Structure"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
@@ -281,140 +222,16 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Clear global variable"),
                  _("Remove all the children from the global variable."),
                  _("Clear children from global variable _PARAM0_"),
-                 _("Variables/Global variables/Collections"),
+                 _("Variables/Global variables/Structure"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .MarkAsAdvanced();
 
-  extension
-      .AddAction("SceneVariablePush",
-                 _("Append variable to a scene array"),
-                 _("Appends a variable at the end of a scene array variable."),
-                 _("Append variable _PARAM1_ to array variable _PARAM0_"),
-                 _("Variables/Collections/Arrays"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("scenevar", _("Array variable"))
-      .AddParameter("scenevar", _("Scene variable with the content to append"))
-      .SetParameterLongDescription(_("The content of the variable will *be copied* and appended at the end of the array."))
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("SceneVariablePushString",
-                 _("Append a string to a scene array"),
-                 _("Appends a string at the end of a scene array variable."),
-                 _("Append string _PARAM1_ to array variable _PARAM0_"),
-                 _("Variables/Collections/Arrays"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("scenevar", _("Array variable"))
-      .AddParameter("string", _("String to append"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("SceneVariablePushNumber",
-                 _("Append a number to a scene array"),
-                 _("Appends a number at the end of a scene array variable."),
-                 _("Append number _PARAM1_ to array variable _PARAM0_"),
-                 _("Variables/Collections/Arrays"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("scenevar", _("Array variable"))
-      .AddParameter("expression", _("Number to append"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("SceneVariablePushBool",
-                 _("Append a boolean to a scene array"),
-                 _("Appends a boolean at the end of a scene array variable."),
-                 _("Append boolean _PARAM1_ to array variable _PARAM0_"),
-                 _("Variables/Collections/Arrays"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("scenevar", _("Array variable"))
-      .AddParameter("trueorfalse", _("Boolean to append"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction(
-          "SceneVariableRemoveAt",
-          _("Remove variable from a scene array (by index)"),
-          _("Removes a variable at the specified index of a scene array variable."),
-          _("Remove variable at index _PARAM1_ from scene array variable _PARAM0_"),
-          _("Variables/Collections/Arrays"),
-          "res/actions/var24.png",
-          "res/actions/var.png")
-      .AddParameter("scenevar", _("Variable"))
-      .AddParameter("expression", _("Index to remove"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("GlobalVariablePush",
-                 _("Append variable to a global array"),
-                 _("Appends a variable at the end of a global array variable."),
-                 _("Append variable _PARAM1_ to array variable _PARAM0_"),
-                 _("Variables/Global variables/Collections/Arrays"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("globalvar", _("Array variable"))
-      .AddParameter("scenevar", _("Scene variable with the content to append"))
-      .SetParameterLongDescription(_("The content of the variable will *be copied* and appended at the end of the array."))
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction(
-          "GlobalVariableRemoveAt",
-          _("Remove variable from a global array (by index)"),
-          _("Removes a variable at the specified index of a global array variable."),
-          _("Remove variable at index _PARAM1_ from global array variable _PARAM0_"),
-          _("Variables/Global variables/Collections/Arrays"),
-          "res/actions/var24.png",
-          "res/actions/var.png")
-      .AddParameter("globalvar", _("Variable"))
-      .AddParameter("expression", _("Index to remove"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("GlobalVariablePushString",
-                 _("Append a string to a global array"),
-                 _("Appends a string at the end of a global array variable."),
-                 _("Append string _PARAM1_ to array variable _PARAM0_"),
-                 _("Variables/Global variables/Collections/Arrays"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("globalvar", _("Array variable"))
-      .AddParameter("string", _("String to append"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("GlobalVariablePushNumber",
-                 _("Append a number to a global array"),
-                 _("Appends a number at the end of a global array variable."),
-                 _("Append number _PARAM1_ to array variable _PARAM0_"),
-                 _("Variables/Global variables/Collections/Arrays"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("globalvar", _("Array variable"))
-      .AddParameter("expression", _("Number to append"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("GlobalVariablePushBool",
-                 _("Append a boolean to a global array"),
-                 _("Appends a boolean at the end of a global array variable."),
-                 _("Append boolean _PARAM1_ to array variable _PARAM0_"),
-                 _("Variables/Global variables/Collections/Arrays"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("globalvar", _("Array variable"))
-      .AddParameter("trueorfalse", _("Boolean to append"))
-      .MarkAsAdvanced();
-
   extension
       .AddExpression("GlobalVariableChildCount",
                      _("Number of children of a global variable"),
-                     _("Number of children of a global variable"),
+                     _("Get the number of children of a global variable"),
                      _("Variables"),
                      "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"));
@@ -422,7 +239,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
   extension
       .AddExpression("VariableChildCount",
                      _("Number of children of a scene variable"),
-                     _("Number of children of a scene variable"),
+                     _("Get the number of children of a scene variable"),
                      _("Variables"),
                      "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"));

Core/GDCore/Extensions/Builtin/WindowExtension.cpp

@@ -12,14 +12,12 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation(
-          "BuiltinWindow",
-          _("Window features"),
-          "Provides actions and conditions to manipulate the game window. "
-          "Depending on the platform on which the game is running, not all of "
-          "these features can be applied.",
-          "Florian Rival",
-          "Open source (MIT License)")
+      .SetExtensionInformation("BuiltinWindow",
+                               _("Window features"),
+                               _("Built-in extension allowing to manipulate "
+                                 "the game window and canvas"),
+                               "Florian Rival",
+                               "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/window");
 
 #if defined(GD_IDE_ONLY)
@@ -29,7 +27,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
           _("De/activate fullscreen"),
           _("This action activates or deactivates fullscreen."),
           _("Activate fullscreen: _PARAM1_ (keep aspect ratio: _PARAM2_)"),
-          _("Game's window and resolution"),
+          _("Game's window"),
           "res/actions/fullscreen24.png",
           "res/actions/fullscreen.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -40,24 +38,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
                     true)
       .SetDefaultValue("yes");
 
-  extension
-      .AddCondition("IsFullScreen",
-                    _("Fullscreen activated?"),
-                    _("Check if the game is currently in fullscreen."),
-                    _("The game is in fullscreen"),
-                    _("Game's window and resolution"),
-                    "res/actions/fullscreen24.png",
-                    "res/actions/fullscreen.png")
-      .AddCodeOnlyParameter("currentScene", "");
-
   extension
       .AddAction("SetWindowMargins",
                  _("Change the window's margins"),
-                 _("This action changes the margins, in pixels, between the "
-                   "game frame and the window borders."),
+                 _("This action changes the margins, in pixels, of the game's "
+                   "window."),
                  _("Set margins of game window to "
                    "_PARAM1_;_PARAM2_;_PARAM3_;_PARAM4_"),
-                 _("Game's window and resolution"),
+                 _("Game's window"),
                  "res/actions/window24.png",
                  "res/actions/window.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -67,93 +55,28 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
       .AddParameter("expression", _("Left"));
 
   extension
-      .AddAction("SetGameResolutionSize",
-                 _("Change the resolution of the game"),
-                 _("Changes the resolution of the game, effectively changing "
-                   "the game area size. This won't change the size of the "
-                   "window in which the game is running."),
-                 _("Set game resolution to _PARAM1_x_PARAM2_"),
-                 _("Game's window and resolution"),
+      .AddAction("SetWindowSize",
+                 _("Change the size of the window"),
+                 _("This action changes the size of the game's window."),
+                 _("Change window size: _PARAM1_x_PARAM2_"),
+                 _("Game's window"),
                  "res/actions/window24.png",
                  "res/actions/window.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Width"))
-      .AddParameter("expression", _("Height"));
-
-  extension
-      .AddAction(
-          "SetWindowSize",
-          _("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."),
-          _("Set game window size to _PARAM1_x_PARAM2_ (also update game "
-            "resolution: _PARAM3_)"),
-          _("Game's window and resolution"),
-          "res/actions/window24.png",
-          "res/actions/window.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("expression", _("Width"))
       .AddParameter("expression", _("Height"))
-      .AddParameter("yesorno",
-                    _("Also update the game resolution? If not, the game will "
-                      "be stretched or reduced to fit in the window."));
-
-  extension
-      .AddAction("CenterWindow",
-                 _("Center the game window on the screen"),
-                 _("This action centers the game window on the screen. This "
-                   "only works on Windows, macOS and Linux (not when the game "
-                   "is executed in a web-browser or on iOS/Android)."),
-                 _("Center the game window"),
-                 _("Game's window and resolution"),
-                 "res/actions/window24.png",
-                 "res/actions/window.png")
-      .AddCodeOnlyParameter("currentScene", "");
-
-  extension
-      .AddAction("SetGameResolutionResizeMode",
-                 _("Change the game resolution resize mode"),
-                 _("Set if the width or the height of the game resolution "
-                   "should be changed to fit the game window - or if the game "
-                   "resolution should not be updated automatically."),
-                 _("Set game resolution resize mode to _PARAM1_"),
-                 _("Game's window and resolution"),
-                 "res/actions/window24.png",
-                 "res/actions/window.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("stringWithSelector",
-                    _("Resize mode"),
-                    "[\"adaptWidth\", \"adaptHeight\", \"\"]",
-                    false)
-      .SetParameterLongDescription(
-          _("Empty to disable resizing. \"adaptWidth\" will update the game "
-            "width to fit in the window or screen. \"adaptHeight\" will do the "
-            "same but with the game height."));
-
-  extension
-      .AddAction("SetAdaptGameResolutionAtRuntime",
-                 _("Automatically adapt the game resolution"),
-                 _("Set if the game resolution should be automatically adapted "
-                   "when the game window or screen size change. This will only "
-                   "be the case if the game resolution resize mode is "
-                   "configured to adapt the width or the height of the game."),
-                 _("Automatically adapt the game resolution: _PARAM1_"),
-                 _("Game's window and resolution"),
-                 "res/actions/window24.png",
-                 "res/actions/window.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("yesorno",
-                    _("Update resolution during the game to fit the screen or "
-                      "window size?"));
+      .AddParameter(
+          "yesorno",
+          _("Do you want to use this size as the default size for new scene "
+            "cameras\?\n(Yes to change the size of the game's viewable "
+            "area,\nNo to stretch the game to the window's size)."));
 
   extension
       .AddAction("SetWindowIcon",
                  _("Change the window's icon"),
                  _("This action changes the icon of the game's window."),
                  _("Use _PARAM1_ as the icon for the game's window."),
-                 _("Game's window and resolution"),
+                 _("Game's window"),
                  "res/actions/window24.png",
                  "res/actions/window.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -164,7 +87,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
                  _("Change the window's title"),
                  _("This action changes the title of the game's window."),
                  _("Change window title to _PARAM1_"),
-                 _("Game's window and resolution"),
+                 _("Game's window"),
                  "res/actions/window24.png",
                  "res/actions/window.png")
       .AddCodeOnlyParameter("currentScene", "")

Core/GDCore/Extensions/Metadata/BehaviorMetadata.cpp

@@ -4,16 +4,12 @@
  * reserved. This project is released under the MIT License.
  */
 #include "BehaviorMetadata.h"
-
 #include <iostream>
-
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
-#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/BehaviorsSharedData.h"
-#include "GDCore/Tools/Localization.h"
 
 namespace gd {
 
@@ -63,8 +59,7 @@ gd::InstructionMetadata& BehaviorMetadata::AddCondition(
                                                            group,
                                                            icon,
                                                            smallicon)
-                                           .SetHelpPath(GetHelpPath())
-                                           .SetIsBehaviorInstruction();
+                                           .SetHelpPath(GetHelpPath());
   return conditionsInfos[nameWithNamespace];
 #endif
 }
@@ -88,8 +83,7 @@ gd::InstructionMetadata& BehaviorMetadata::AddAction(
                                                         group,
                                                         icon,
                                                         smallicon)
-                                        .SetHelpPath(GetHelpPath())
-                                        .SetIsBehaviorInstruction();
+                                        .SetHelpPath(GetHelpPath());
   return actionsInfos[nameWithNamespace];
 #endif
 }
@@ -113,8 +107,7 @@ gd::InstructionMetadata& BehaviorMetadata::AddScopedCondition(
                                                            group,
                                                            icon,
                                                            smallicon)
-                                           .SetHelpPath(GetHelpPath())
-                                           .SetIsBehaviorInstruction();
+                                           .SetHelpPath(GetHelpPath());
   return conditionsInfos[nameWithNamespace];
 #endif
 }
@@ -138,8 +131,7 @@ gd::InstructionMetadata& BehaviorMetadata::AddScopedAction(
                                                         group,
                                                         icon,
                                                         smallicon)
-                                        .SetHelpPath(GetHelpPath())
-                                        .SetIsBehaviorInstruction();
+                                        .SetHelpPath(GetHelpPath());
   return actionsInfos[nameWithNamespace];
 #endif
 }
@@ -151,16 +143,12 @@ gd::ExpressionMetadata& BehaviorMetadata::AddExpression(
     const gd::String& group,
     const gd::String& smallicon) {
 #if defined(GD_IDE_ONLY)
-  // Be careful, behaviors expression do not have namespace (not necessary as
-  // we refer to the behavior name in the expression).
-  expressionsInfos[name] = ExpressionMetadata("number",
-                                              extensionNamespace,
-                                              name,
-                                              fullname,
-                                              description,
-                                              group,
-                                              smallicon)
-                               .SetHelpPath(GetHelpPath());
+  // Be careful, behaviors expression do not have namespace ( not necessary as
+  // we refer to the auomatism name in the expression )
+  expressionsInfos[name] =
+      ExpressionMetadata(
+          extensionNamespace, name, fullname, description, group, smallicon)
+          .SetHelpPath(GetHelpPath());
   return expressionsInfos[name];
 #endif
 }
@@ -172,179 +160,16 @@ gd::ExpressionMetadata& BehaviorMetadata::AddStrExpression(
     const gd::String& group,
     const gd::String& smallicon) {
 #if defined(GD_IDE_ONLY)
-  // Be careful, behaviors expression do not have namespace (not necessary as
-  // we refer to the behavior name in the expression).
-  strExpressionsInfos[name] = ExpressionMetadata("string",
-                                                 extensionNamespace,
-                                                 name,
-                                                 fullname,
-                                                 description,
-                                                 group,
-                                                 smallicon)
-                                  .SetHelpPath(GetHelpPath());
+  // Be careful, behaviors expression do not have namespace ( not necessary as
+  // we refer to the auomatism name in the expression )
+  strExpressionsInfos[name] =
+      ExpressionMetadata(
+          extensionNamespace, name, fullname, description, group, smallicon)
+          .SetHelpPath(GetHelpPath());
   return strExpressionsInfos[name];
 #endif
 }
 
-gd::MultipleInstructionMetadata BehaviorMetadata::AddExpressionAndCondition(
-    const gd::String& type,
-    const gd::String& name,
-    const gd::String& fullname,
-    const gd::String& descriptionSubject,
-    const gd::String& sentenceName,
-    const gd::String& group,
-    const gd::String& icon) {
-  gd::String expressionDescriptionTemplate = _("Return <subject>.");
-  auto& expression =
-      type == "number"
-          ? AddExpression(name,
-                          fullname,
-                          expressionDescriptionTemplate.FindAndReplace(
-                              "<subject>", descriptionSubject),
-                          group,
-                          icon)
-          : AddStrExpression(name,
-                             fullname,
-                             expressionDescriptionTemplate.FindAndReplace(
-                                 "<subject>", descriptionSubject),
-                             group,
-                             icon);
-
-  gd::String conditionDescriptionTemplate = _("Compare <subject>.");
-  auto& condition =
-      AddScopedCondition(name,
-                         fullname,
-                         conditionDescriptionTemplate.FindAndReplace(
-                             "<subject>", descriptionSubject),
-                         sentenceName,
-                         group,
-                         icon,
-                         icon);
-
-  return MultipleInstructionMetadata::WithExpressionAndCondition(expression,
-                                                                 condition);
-}
-
-gd::MultipleInstructionMetadata
-BehaviorMetadata::AddExpressionAndConditionAndAction(
-    const gd::String& type,
-    const gd::String& name,
-    const gd::String& fullname,
-    const gd::String& descriptionSubject,
-    const gd::String& sentenceName,
-    const gd::String& group,
-    const gd::String& icon) {
-  gd::String expressionDescriptionTemplate = _("Return <subject>.");
-  auto& expression =
-      type == "number"
-          ? AddExpression(name,
-                          fullname,
-                          expressionDescriptionTemplate.FindAndReplace(
-                              "<subject>", descriptionSubject),
-                          group,
-                          icon)
-          : AddStrExpression(name,
-                             fullname,
-                             expressionDescriptionTemplate.FindAndReplace(
-                                 "<subject>", descriptionSubject),
-                             group,
-                             icon);
-
-  gd::String conditionDescriptionTemplate = _("Compare <subject>.");
-  auto& condition =
-      AddScopedCondition(name,
-                         fullname,
-                         conditionDescriptionTemplate.FindAndReplace(
-                             "<subject>", descriptionSubject),
-                         sentenceName,
-                         group,
-                         icon,
-                         icon);
-
-  gd::String actionDescriptionTemplate = _("Change <subject>.");
-  auto& action = AddScopedAction(
-      "Set" + name,
-      fullname,
-      actionDescriptionTemplate.FindAndReplace("<subject>", descriptionSubject),
-      sentenceName,
-      group,
-      icon,
-      icon);
-
-  return MultipleInstructionMetadata::WithExpressionAndConditionAndAction(
-      expression, condition, action);
-}
-
-#if defined(GD_IDE_ONLY)
-gd::InstructionMetadata& BehaviorMetadata::AddDuplicatedAction(
-    const gd::String& newActionName, const gd::String& copiedActionName) {
-  gd::String newNameWithNamespace = extensionNamespace + newActionName;
-  gd::String copiedNameWithNamespace = extensionNamespace + copiedActionName;
-
-  auto copiedAction = actionsInfos.find(copiedNameWithNamespace);
-  if (copiedAction == actionsInfos.end()) {
-    gd::LogWarning("Could not find an action with name " +
-                   copiedNameWithNamespace + " to copy.");
-  } else {
-    actionsInfos[newNameWithNamespace] = copiedAction->second;
-  }
-
-  return actionsInfos[newNameWithNamespace];
-}
-
-gd::InstructionMetadata& BehaviorMetadata::AddDuplicatedCondition(
-    const gd::String& newConditionName, const gd::String& copiedConditionName) {
-  gd::String newNameWithNamespace = extensionNamespace + newConditionName;
-  gd::String copiedNameWithNamespace = extensionNamespace + copiedConditionName;
-
-  auto copiedCondition = conditionsInfos.find(copiedNameWithNamespace);
-  if (copiedCondition == conditionsInfos.end()) {
-    gd::LogWarning("Could not find a condition with name " +
-                   copiedNameWithNamespace + " to copy.");
-  } else {
-    conditionsInfos[newNameWithNamespace] = copiedCondition->second;
-  }
-
-  return conditionsInfos[newNameWithNamespace];
-}
-
-gd::ExpressionMetadata& BehaviorMetadata::AddDuplicatedExpression(
-    const gd::String& newExpressionName,
-    const gd::String& copiedExpressionName) {
-  gd::String newNameWithNamespace = extensionNamespace + newExpressionName;
-  gd::String copiedNameWithNamespace =
-      extensionNamespace + copiedExpressionName;
-
-  auto copiedExpression = expressionsInfos.find(copiedNameWithNamespace);
-  if (copiedExpression == expressionsInfos.end()) {
-    gd::LogWarning("Could not find an expression with name " +
-                   copiedNameWithNamespace + " to copy.");
-  } else {
-    expressionsInfos[newNameWithNamespace] = copiedExpression->second;
-  }
-
-  return expressionsInfos[newNameWithNamespace];
-}
-
-gd::ExpressionMetadata& BehaviorMetadata::AddDuplicatedStrExpression(
-    const gd::String& newExpressionName,
-    const gd::String& copiedExpressionName) {
-  gd::String newNameWithNamespace = extensionNamespace + newExpressionName;
-  gd::String copiedNameWithNamespace =
-      extensionNamespace + copiedExpressionName;
-
-  auto copiedExpression = strExpressionsInfos.find(copiedNameWithNamespace);
-  if (copiedExpression == strExpressionsInfos.end()) {
-    gd::LogWarning("Could not find a string expression with name " +
-                   copiedNameWithNamespace + " to copy.");
-  } else {
-    strExpressionsInfos[newNameWithNamespace] = copiedExpression->second;
-  }
-
-  return strExpressionsInfos[newNameWithNamespace];
-}
-#endif
-
 BehaviorMetadata& BehaviorMetadata::SetFullName(const gd::String& fullname_) {
 #if defined(GD_IDE_ONLY)
   fullname = fullname_;

Core/GDCore/Extensions/Metadata/BehaviorMetadata.h

@@ -6,14 +6,12 @@
 #ifndef BEHAVIORMETADATA_H
 #define BEHAVIORMETADATA_H
 #include <map>
-
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/String.h"
 namespace gd {
 class Behavior;
 class BehaviorsSharedData;
-class MultipleInstructionMetadata;
 class InstructionMetadata;
 class ExpressionMetadata;
 }  // namespace gd
@@ -43,8 +41,7 @@ class GD_CORE_API BehaviorMetadata {
 
   /**
    * Declare a new condition as being part of the behavior.
-   * \deprecated Prefer using `AddScopedCondition`, to properly namespace
-   * the condition.
+   * \deprecated Prefer using `AddScopedCondition`.
    */
   gd::InstructionMetadata& AddCondition(const gd::String& name_,
                                         const gd::String& fullname_,
@@ -56,8 +53,7 @@ class GD_CORE_API BehaviorMetadata {
 
   /**
    * Declare a new action as being part of the behavior.
-   * \deprecated Prefer using `AddScopedAction`, to properly namespace
-   * the action.
+   * \deprecated Prefer using `AddScopedAction`.
    */
   gd::InstructionMetadata& AddAction(const gd::String& name_,
                                      const gd::String& fullname_,
@@ -71,23 +67,23 @@ class GD_CORE_API BehaviorMetadata {
    * Declare a new condition as being part of the behavior.
    */
   gd::InstructionMetadata& AddScopedCondition(const gd::String& name_,
-                                              const gd::String& fullname_,
-                                              const gd::String& description_,
-                                              const gd::String& sentence_,
-                                              const gd::String& group_,
-                                              const gd::String& icon_,
-                                              const gd::String& smallicon_);
+                                        const gd::String& fullname_,
+                                        const gd::String& description_,
+                                        const gd::String& sentence_,
+                                        const gd::String& group_,
+                                        const gd::String& icon_,
+                                        const gd::String& smallicon_);
 
   /**
    * Declare a new action as being part of the behavior.
    */
   gd::InstructionMetadata& AddScopedAction(const gd::String& name_,
-                                           const gd::String& fullname_,
-                                           const gd::String& description_,
-                                           const gd::String& sentence_,
-                                           const gd::String& group_,
-                                           const gd::String& icon_,
-                                           const gd::String& smallicon_);
+                                     const gd::String& fullname_,
+                                     const gd::String& description_,
+                                     const gd::String& sentence_,
+                                     const gd::String& group_,
+                                     const gd::String& icon_,
+                                     const gd::String& smallicon_);
   /**
    * Declare a new action as being part of the extension.
    */
@@ -106,78 +102,6 @@ class GD_CORE_API BehaviorMetadata {
                                            const gd::String& group_,
                                            const gd::String& smallicon_);
 
-  /**
-   * \brief Declare a new expression and condition as being part of the
-   * behavior.
-   * \note It's recommended to use this function to avoid declaring twice a
-   * similar expression/condition.
-   */
-  gd::MultipleInstructionMetadata AddExpressionAndCondition(
-      const gd::String& type,
-      const gd::String& name,
-      const gd::String& fullname,
-      const gd::String& description,
-      const gd::String& sentenceName,
-      const gd::String& group,
-      const gd::String& icon);
-
-  /**
-   * \brief Declare a new expression, condition and action as being part of the
-   * behavior.
-   * \note The action name is prefixed by "Set" (and the namespace, as the
-   * condition).
-   * \note It's recommended to use this function to avoid declaring 3 times a
-   * similar expression/condition/action.
-   */
-  gd::MultipleInstructionMetadata AddExpressionAndConditionAndAction(
-      const gd::String& type,
-      const gd::String& name,
-      const gd::String& fullname,
-      const gd::String& description,
-      const gd::String& sentenceName,
-      const gd::String& group,
-      const gd::String& icon);
-
-  /**
-   * \brief Create a new action which is the duplicate of the specified one.
-   *
-   * Useful for handling a deprecated action that is just a "copy" of the new
-   * one.
-   */
-  gd::InstructionMetadata& AddDuplicatedAction(
-      const gd::String& newActionName, const gd::String& copiedActionName);
-
-  /**
-   * \brief Create a new condition which is the duplicate of the specified one.
-   *
-   * Useful for handling a deprecated condition that is just a "copy" of the new
-   * one.
-   */
-  gd::InstructionMetadata& AddDuplicatedCondition(
-      const gd::String& newConditionName,
-      const gd::String& copiedConditionName);
-
-  /**
-   * \brief Create a new expression which is the duplicate of the specified one.
-   *
-   * Useful for handling a deprecated expression that is just a "copy" of the
-   * new one.
-   */
-  gd::ExpressionMetadata& AddDuplicatedExpression(
-      const gd::String& newExpressionName,
-      const gd::String& copiedExpressionName);
-
-  /**
-   * \brief Create a new string expression which is the duplicate of the
-   * specified one.
-   *
-   * Useful for handling a deprecated string expression that is just a "copy" of
-   * the new one.
-   */
-  gd::ExpressionMetadata& AddDuplicatedStrExpression(
-      const gd::String& newExpressionName,
-      const gd::String& copiedExpressionName);
-
   BehaviorMetadata& SetFullName(const gd::String& fullname_);
   BehaviorMetadata& SetDefaultName(const gd::String& defaultName_);
   BehaviorMetadata& SetDescription(const gd::String& description_);
@@ -196,14 +120,12 @@ class GD_CORE_API BehaviorMetadata {
   BehaviorMetadata& AddIncludeFile(const gd::String& includeFile);
 
   /**
-   * Get the help path of the behavior, relative to the GDevelop documentation
-   * root.
+   * Get the help path of the behavior, relative to the documentation root.
    */
   const gd::String& GetHelpPath() const { return helpPath; }
 
   /**
-   * Set the help path of the behavior, relative to the GDevelop documentation
-   * root.
+   * Set the help path of the behavior, relative to the documentation root.
    *
    * The behavior instructions will have this help path set by
    * default, unless you call SetHelpPath on them.

Core/GDCore/Extensions/Metadata/DependencyMetadata.h

@@ -1,155 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#ifndef DEPENDENCYMETADATA_H
-#define DEPENDENCYMETADATA_H
-#include <map>
-#include <set>
-
-#include "GDCore/Project/PropertyDescriptor.h"
-#include "GDCore/String.h"
-#include "GDCore/Tools/Log.h"
-
-namespace gd {
-/**
- * \brief Contains information about a dependency (library, npm/cordova
- * package, or other according to the export) of an extension.
- */
-class GD_CORE_API DependencyMetadata {
- public:
-  /**
-   * Construct a new dependency metadata, though you probably want to call
-   * `AddDependency` on gd::PlatformExtension.
-   *
-   * \see gd::PlatformExtension
-   */
-  DependencyMetadata() : onlyIfSomeExtraSettingsNonEmpty(false){};
-
-  /**
-   * \brief Sets the name shown to users.
-   */
-  DependencyMetadata& SetName(const gd::String& name_) {
-    name = name_;
-    return *this;
-  };
-
-  /**
-   * \brief Sets the name written by the exporter.
-   * Typically, this is what is used by the dependency manager
-   * to find the dependency.
-   *
-   * \example
-   * \code
-   *  // For depending upon the NPM package is-thirteen
-   *  gd::DependencyMetadata dependencyMetadata = gd::DependencyMetadata();
-   *  dependencyMetadata.setExporterName("is-thirteen");
-   * \endcode
-   */
-  DependencyMetadata& SetExportName(const gd::String& exportName_) {
-    exportName = exportName_;
-    return *this;
-  };
-
-  /**
-   * \brief Set the version of the dependency to install.
-   * Use an empty string to use the latest version.
-   */
-  DependencyMetadata& SetVersion(const gd::String& version_) {
-    version = version_;
-    return *this;
-  };
-
-  /**
-   * \brief Sets the type of dependecy (what will be used to install it)
-   *
-   * This can either be "npm" or "cordova" for now.
-   */
-  DependencyMetadata& SetDependencyType(const gd::String& dependencyType_) {
-    dependencyType = dependencyType_;
-    if (dependencyType != "npm" && dependencyType != "cordova") {
-      gd::LogWarning("Invalid dependency type: " + dependencyType);
-    }
-    return *this;
-  };
-
-  /**
-   * \brief Sets a dependency type specific setting.
-   */
-  DependencyMetadata& SetExtraSetting(
-      const gd::String& settingName,
-      const gd::PropertyDescriptor& settingValue) {
-    extraData[settingName] = settingValue;
-    return *this;
-  };
-
-  /**
-   * \brief Mark the dependency to be included in the export only if at least
-   * one of the extra settings is set.
-   */
-  DependencyMetadata& OnlyIfSomeExtraSettingsNonEmpty() {
-    onlyIfSomeExtraSettingsNonEmpty = true;
-    return *this;
-  };
-
-  /**
-   * \brief Check if at least one of the extra settings must be set for the
-   * dependency to be included in the export.
-   */
-  bool IsOnlyIfSomeExtraSettingsNonEmpty() const {
-    return onlyIfSomeExtraSettingsNonEmpty;
-  };
-
-  /**
-   * \brief Mark the dependency to be included in the export only if one other
-   * dependency is included in the export.
-   */
-  DependencyMetadata& OnlyIfOtherDependencyIsExported(
-      const gd::String& otherDependency) {
-    onlyIfOtherDependencyIsExported = otherDependency;
-    return *this;
-  };
-
-  /**
-   * \brief Get the name of another dependency that must be exported to have
-   * this one also exported.
-   */
-  const gd::String& GetOtherDependencyThatMustBeExported() const {
-    return onlyIfOtherDependencyIsExported;
-  };
-
-  const gd::String& GetName() const { return name; };
-  const gd::String& GetExportName() const { return exportName; };
-  const gd::String& GetVersion() const { return version; };
-  const gd::String& GetDependencyType() const {
-    if (dependencyType == "")
-      gd::LogWarning("Dependency has no type, it won't be exported.");
-    return dependencyType;
-  };
-
-  const std::map<gd::String, gd::PropertyDescriptor>& GetAllExtraSettings()
-      const {
-    return extraData;
-  }
-
-  void CopyFrom(const DependencyMetadata& dependencyMetadata) {
-    *this = dependencyMetadata;
-  }
-
- private:
-  gd::String name;        ///< The name of the dependency.
-  gd::String exportName;  ///< The name used to install the package (example:
-                          ///< npm package name for npm dependency type).
-  gd::String version;     ///< The version of the dependency
-  gd::String dependencyType;  ///< The tool used to install the dependency.
-  std::map<gd::String, gd::PropertyDescriptor>
-      extraData;  ///< Contains dependency type specific additional parameters
-                  ///< for the dependency.
-  bool onlyIfSomeExtraSettingsNonEmpty;  ///< If true, only use this dependency
-                                         ///< if at least one of the extra
-                                         ///< settings is set.
-  gd::String onlyIfOtherDependencyIsExported;
-};
-}  // namespace gd
-#endif  // DEPENDENCYMETADATA_H

Core/GDCore/Extensions/Metadata/EffectMetadata.cpp

@@ -1,25 +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 "EffectMetadata.h"
-
-namespace gd {
-
-EffectMetadata::EffectMetadata(const gd::String& type_) : type(type_) {}
-
-EffectMetadata& EffectMetadata::SetIncludeFile(const gd::String& includeFile) {
-  includeFiles.clear();
-  includeFiles.push_back(includeFile);
-  return *this;
-}
-
-EffectMetadata& EffectMetadata::AddIncludeFile(const gd::String& includeFile) {
-  if (std::find(includeFiles.begin(), includeFiles.end(), includeFile) ==
-      includeFiles.end())
-    includeFiles.push_back(includeFile);
-  return *this;
-}
-
-}  // namespace gd

Core/GDCore/Extensions/Metadata/EffectMetadata.h

@@ -1,121 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#ifndef EFFECTMETADATA_H
-#define EFFECTMETADATA_H
-#include <functional>
-#include <map>
-#include <memory>
-#include "GDCore/Project/PropertyDescriptor.h"
-#include "GDCore/String.h"
-
-namespace gd {
-
-/**
- * \brief Contains user-friendly information about an effect.
- *
- * \ingroup Events
- */
-class GD_CORE_API EffectMetadata {
- public:
-  /**
-   * \brief Construct an effect metadata, with the given type
-   */
-  EffectMetadata(const gd::String& type_);
-
-  /**
-   * \brief Default constructor, only used for initializing `badEffectMetadata`.
-   */
-  EffectMetadata() {}
-
-  virtual ~EffectMetadata(){};
-
-  /**
-   * \brief Set the name shown to the user.
-   */
-  EffectMetadata& SetFullName(const gd::String& fullname_) {
-    fullname = fullname_;
-    return *this;
-  };
-
-  /**
-   * \brief Set the description shown to the user.
-   */
-  EffectMetadata& SetDescription(const gd::String& description_) {
-    description = description_;
-    return *this;
-  };
-
-  /**
-   * Set the help path of the effect, relative to the GDevelop documentation root.
-   */
-  EffectMetadata& SetHelpPath(const gd::String& path) {
-    helpPath = path;
-    return *this;
-  }
-
-  /**
-   * \brief Clear any existing include file and add the specified include file.
-   */
-  EffectMetadata& SetIncludeFile(const gd::String& includeFile);
-
-  /**
-   * \brief Add a file to the already existing include files.
-   */
-  EffectMetadata& AddIncludeFile(const gd::String& includeFile);
-
-  /**
-   * \brief Return a reference to the properties of this effect.
-   */
-  std::map<gd::String, gd::PropertyDescriptor>& GetProperties() {
-    return properties;
-  }
-
-  /**
-   * \brief Return a (const) reference to the properties of this effect.
-   */
-  const std::map<gd::String, gd::PropertyDescriptor>& GetProperties() const {
-    return properties;
-  }
-
-  /**
-   * \brief Get the help path of the effect, relative to the GDevelop documentation root.
-   */
-  const gd::String& GetHelpPath() const { return helpPath; }
-
-  /**
-   * \brief Get the type of the effect (its internal name, like "BlackAndWhite").
-   */
-  const gd::String& GetType() const { return type; }
-
-  /**
-   * \brief Get the user facing name of the effect (like "Black and White").
-   */
-  const gd::String& GetFullName() const { return fullname; }
-
-  /**
-   * \brief Get the user friendly description of the effect.
-   */
-  const gd::String& GetDescription() const { return description; }
-
-  /**
-   * \brief Get the required include files for this effect.
-   */
-  const std::vector<gd::String>& GetIncludeFiles() const {
-    return includeFiles;
-  }
-
- private:
-  gd::String extensionNamespace;
-  gd::String type;
-  gd::String helpPath;
-  gd::String fullname;
-  gd::String description;
-  std::vector<gd::String> includeFiles;
-  std::map<gd::String, gd::PropertyDescriptor> properties;
-};
-
-}  // namespace gd
-#endif  // EFFECTMETADATA_H

Core/GDCore/Extensions/Metadata/ExpressionMetadata.cpp

@@ -9,15 +9,13 @@
 
 namespace gd {
 
-ExpressionMetadata::ExpressionMetadata(const gd::String& returnType_,
-  const gd::String& extensionNamespace_,
+ExpressionMetadata::ExpressionMetadata(const gd::String& extensionNamespace_,
                                        const gd::String& name_,
                                        const gd::String& fullname_,
                                        const gd::String& description_,
                                        const gd::String& group_,
                                        const gd::String& smallicon_)
-    : returnType(returnType_),
-      fullname(fullname_),
+    : fullname(fullname_),
       description(description_),
       group(group_),
       shown(true),

Core/GDCore/Extensions/Metadata/ExpressionMetadata.h

@@ -8,7 +8,6 @@
 #if defined(GD_IDE_ONLY)
 #include <functional>
 #include <memory>
-
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/String.h"
@@ -123,8 +122,7 @@ class GD_CORE_API ExpressionMetadata {
   /**
    * Construct a new expression metadata.
    */
-  ExpressionMetadata(const gd::String& returnType,
-                     const gd::String& extensionNamespace,
+  ExpressionMetadata(const gd::String& extensionNamespace,
                      const gd::String& name,
                      const gd::String& fullname,
                      const gd::String& description,
@@ -133,11 +131,9 @@ class GD_CORE_API ExpressionMetadata {
 
   /**
    * Construct an empty ExpressionMetadata.
-   * \warning Don't use this - only here to construct a "bad" ExpressionData and
-   * to fulfill std::map requirements.
+   * \warning Don't use this - only here to fullfil std::map requirements.
    */
-  ExpressionMetadata()
-      : returnType("unknown"), shown(false), isPrivate(false){};
+  ExpressionMetadata() : shown(false), isPrivate(false){};
 
   virtual ~ExpressionMetadata(){};
 
@@ -155,16 +151,14 @@ class GD_CORE_API ExpressionMetadata {
   }
 
   /**
-   * Get the help path of the expression, relative to the GDevelop documentation
-   * root.
+   * Get the help path of the expression, relative to the documentation root.
    */
-  const gd::String& GetHelpPath() const { return helpPath; }
+  const gd::String &GetHelpPath() const { return helpPath; }
 
   /**
-   * Set the help path of the expression, relative to the GDevelop documentation
-   * root.
+   * Set the help path of the expression, relative to the documentation root.
    */
-  ExpressionMetadata& SetHelpPath(const gd::String& path) {
+  ExpressionMetadata &SetHelpPath(const gd::String &path) {
     helpPath = path;
     return *this;
   }
@@ -206,19 +200,7 @@ class GD_CORE_API ExpressionMetadata {
    * \see AddParameter
    */
   ExpressionMetadata& SetDefaultValue(gd::String defaultValue_) {
-    if (!parameters.empty()) parameters.back().SetDefaultValue(defaultValue_);
-    return *this;
-  };
-
-  /**
-   * \brief Set the long description shown in the editor for the last added
-   * parameter.
-   *
-   * \see AddParameter
-   */
-  ExpressionMetadata& SetParameterLongDescription(gd::String longDescription) {
-    if (!parameters.empty())
-      parameters.back().SetLongDescription(longDescription);
+    if (!parameters.empty()) parameters.back().defaultValue = defaultValue_;
     return *this;
   };
 
@@ -244,7 +226,6 @@ class GD_CORE_API ExpressionMetadata {
   ExpressionCodeGenerationInformation codeExtraInformation;
 
   bool IsShown() const { return shown; }
-  const gd::String& GetReturnType() const { return returnType; }
   const gd::String& GetFullName() const { return fullname; }
   const gd::String& GetDescription() const { return description; }
   const gd::String& GetGroup() const { return group; }
@@ -263,7 +244,6 @@ class GD_CORE_API ExpressionMetadata {
   std::vector<gd::ParameterMetadata> parameters;
 
  private:
-  gd::String returnType;
   gd::String fullname;
   gd::String description;
   gd::String helpPath;

Core/GDCore/Extensions/Metadata/InstructionMetadata.cpp

@@ -3,27 +3,23 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#include "InstructionMetadata.h"
-
 #include <algorithm>
-
 #include "GDCore/CommonTools.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/Tools/Localization.h"
-#include "ParameterMetadata.h"
+#include "InstructionMetadata.h"
 
 namespace gd {
 InstructionMetadata::InstructionMetadata()
-    : sentence("Unknown or unsupported instruction"),  // Avoid translating this
-                                                       // string, so that it's
-                                                       // safe and *fast* to use
-                                                       // a InstructionMetadata.
+    : sentence(
+          "Unknown or unsupported instruction"),  // Avoid translating this
+                                                  // string, so that it's safe
+                                                  // and *fast* to use a
+                                                  // InstructionMetadata.
       canHaveSubInstructions(false),
       hidden(true),
       usageComplexity(5),
-      isPrivate(false),
-      isObjectInstruction(false),
-      isBehaviorInstruction(false) {}
+      isPrivate(false) {}
 
 InstructionMetadata::InstructionMetadata(const gd::String& extensionNamespace_,
                                          const gd::String& name_,
@@ -44,9 +40,10 @@ InstructionMetadata::InstructionMetadata(const gd::String& extensionNamespace_,
       extensionNamespace(extensionNamespace_),
       hidden(false),
       usageComplexity(5),
-      isPrivate(false),
-      isObjectInstruction(false),
-      isBehaviorInstruction(false) {}
+      isPrivate(false) {
+}
+
+ParameterMetadata::ParameterMetadata() : optional(false), codeOnly(false) {}
 
 InstructionMetadata& InstructionMetadata::AddParameter(
     const gd::String& type,
@@ -89,74 +86,24 @@ InstructionMetadata& InstructionMetadata::AddCodeOnlyParameter(
   return *this;
 }
 
-InstructionMetadata& InstructionMetadata::UseStandardOperatorParameters(
-    const gd::String& type) {
-  SetManipulatedType(type);
-
-  AddParameter("operator", _("Modification's sign"));
-  AddParameter(type == "number" ? "expression" : type, _("Value"));
-  size_t operatorParamIndex = parameters.size() - 2;
-  size_t valueParamIndex = parameters.size() - 1;
-
-  if (isObjectInstruction || isBehaviorInstruction) {
-    gd::String templateSentence =
-        _("Change <subject> of _PARAM0_: <operator> <value>");
-
-    sentence =
-        templateSentence.FindAndReplace("<subject>", sentence)
-            .FindAndReplace(
-                "<operator>",
-                "_PARAM" + gd::String::From(operatorParamIndex) + "_")
-            .FindAndReplace("<value>",
-                            "_PARAM" + gd::String::From(valueParamIndex) + "_");
-  } else {
-    gd::String templateSentence = _("Change <subject>: <operator> <value>");
-
-    sentence =
-        templateSentence.FindAndReplace("<subject>", sentence)
-            .FindAndReplace(
-                "<operator>",
-                "_PARAM" + gd::String::From(operatorParamIndex) + "_")
-            .FindAndReplace("<value>",
-                            "_PARAM" + gd::String::From(valueParamIndex) + "_");
-  }
-
-  return *this;
+void ParameterMetadata::SerializeTo(SerializerElement& element) const {
+  element.SetAttribute("type", type);
+  element.SetAttribute("supplementaryInformation", supplementaryInformation);
+  element.SetAttribute("optional", optional);
+  element.SetAttribute("description", description);
+  element.SetAttribute("codeOnly", codeOnly);
+  element.SetAttribute("defaultValue", defaultValue);
+  element.SetAttribute("name", name);
 }
 
-InstructionMetadata&
-InstructionMetadata::UseStandardRelationalOperatorParameters(
-    const gd::String& type) {
-  SetManipulatedType(type);
-
-  AddParameter("relationalOperator", _("Sign of the test"));
-  AddParameter(type == "number" ? "expression" : type, _("Value to compare"));
-  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)
-            .FindAndReplace(
-                "<operator>",
-                "_PARAM" + gd::String::From(operatorParamIndex) + "_")
-            .FindAndReplace("<value>",
-                            "_PARAM" + gd::String::From(valueParamIndex) + "_");
-  } else {
-    gd::String templateSentence = _("<subject> <operator> <value>");
-
-    sentence =
-        templateSentence.FindAndReplace("<subject>", sentence)
-            .FindAndReplace(
-                "<operator>",
-                "_PARAM" + gd::String::From(operatorParamIndex) + "_")
-            .FindAndReplace("<value>",
-                            "_PARAM" + gd::String::From(valueParamIndex) + "_");
-  }
-
-  return *this;
+void ParameterMetadata::UnserializeFrom(const SerializerElement& element) {
+  type = element.GetStringAttribute("type");
+  supplementaryInformation =
+      element.GetStringAttribute("supplementaryInformation");
+  optional = element.GetBoolAttribute("optional");
+  description = element.GetStringAttribute("description");
+  codeOnly = element.GetBoolAttribute("codeOnly");
+  defaultValue = element.GetStringAttribute("defaultValue");
+  name = element.GetStringAttribute("name");
 }
-
 }  // namespace gd

Core/GDCore/Extensions/Metadata/InstructionMetadata.h

@@ -10,10 +10,8 @@
 #include <functional>
 #include <map>
 #include <memory>
-
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/String.h"
-#include "ParameterMetadata.h"
 namespace gd {
 class Project;
 class Layout;
@@ -24,6 +22,198 @@ class SerializerElement;
 
 namespace gd {
 
+/**
+ * \brief Contains user-friendly info about a parameter, and information about
+ * what a parameter need
+ *
+ * \ingroup Events
+ */
+class GD_CORE_API ParameterMetadata {
+ public:
+  ParameterMetadata();
+  virtual ~ParameterMetadata(){};
+
+  /**
+   * \brief Return the type of the parameter.
+   * \see gd::ParameterMetadata::IsObject
+   */
+  const gd::String &GetType() const { return type; }
+
+  /**
+   * \brief Set the type of the parameter.
+   */
+  ParameterMetadata &SetType(const gd::String &type_) {
+    type = type_;
+    return *this;
+  }
+
+  /**
+   * \brief Return the name of the parameter.
+   *
+   * Name is optional, and won't be filled for most parameters of extensions.
+   * It is useful when generating a function from events, where parameters must
+   * be named.
+   */
+  const gd::String &GetName() const { return name; }
+
+  /**
+   * \brief Set the name of the parameter.
+   *
+   * Name is optional, and won't be filled for most parameters of extensions.
+   * It is useful when generating a function from events, where parameters must
+   * be named.
+   */
+  ParameterMetadata &SetName(const gd::String &name_) {
+    name = name_;
+    return *this;
+  }
+
+  /**
+   * \brief Return an optional additional information, used for some parameters
+   * with special type (For example, it can contains the type of object accepted
+   * by the parameter).
+   */
+  const gd::String &GetExtraInfo() const { return supplementaryInformation; }
+
+  /**
+   * \brief Set an optional additional information, used for some parameters
+   * with special type (For example, it can contains the type of object accepted
+   * by the parameter).
+   */
+  ParameterMetadata &SetExtraInfo(const gd::String &supplementaryInformation_) {
+    supplementaryInformation = supplementaryInformation_;
+    return *this;
+  }
+
+  /**
+   * \brief Return true if the parameter is optional.
+   */
+  bool IsOptional() const { return optional; }
+
+  /**
+   * \brief Set if the parameter is optional.
+   */
+  ParameterMetadata &SetOptional(bool optional_ = true) {
+    optional = optional_;
+    return *this;
+  }
+
+  /**
+   * \brief Return the description of the parameter
+   */
+  const gd::String &GetDescription() const { return description; }
+
+  /**
+   * \brief Set the description of the parameter.
+   */
+  ParameterMetadata &SetDescription(const gd::String &description_) {
+    description = description_;
+    return *this;
+  }
+
+  /**
+   * \brief Return true if the parameter is only meant to be completed during
+   * compilation and must not be displayed to the user.
+   */
+  bool IsCodeOnly() const { return codeOnly; }
+
+  /**
+   * \brief Set if the parameter is only meant to be completed during
+   * compilation and must not be displayed to the user.
+   */
+  ParameterMetadata &SetCodeOnly(bool codeOnly_ = true) {
+    codeOnly = codeOnly_;
+    return *this;
+  }
+
+  /**
+   * \brief Get the default value for the parameter.
+   */
+  const gd::String &GetDefaultValue() const { return defaultValue; }
+
+  /**
+   * \brief Set the default value, if the parameter is optional.
+   */
+  ParameterMetadata &SetDefaultValue(const gd::String &defaultValue_) {
+    defaultValue = defaultValue_;
+    return *this;
+  }
+
+  /**
+   * \brief Return true if the type of the parameter is "object", "objectPtr" or
+   * "objectList".
+   *
+   * \see gd::ParameterMetadata::GetType
+   */
+  static bool IsObject(const gd::String &parameterType) {
+    return parameterType == "object" || parameterType == "objectPtr" ||
+           parameterType == "objectList" ||
+           parameterType == "objectListWithoutPicking";
+  }
+
+  /**
+   * \brief Return true if the type of the parameter is "behavior".
+   *
+   * \see gd::ParameterMetadata::GetType
+   */
+  static bool IsBehavior(const gd::String &parameterType) {
+    return parameterType == "behavior";
+  }
+
+  /**
+   * \brief Return true if the type of the parameter is an expression of the
+   * given type.
+   * \note If you had a new type of parameter, also add it in the IDE (
+   * see EventsFunctionParametersEditor) and in the EventsCodeGenerator.
+   */
+  static bool IsExpression(const gd::String &type,
+                           const gd::String &parameterType) {
+    if (type == "number") {
+      return parameterType == "expression" || parameterType == "camera" ||
+             parameterType == "forceMultiplier";
+    } else if (type == "string") {
+      return parameterType == "string" || parameterType == "layer" ||
+             parameterType == "color" || parameterType == "file" ||
+             parameterType == "joyaxis" ||
+             parameterType == "stringWithSelector" ||
+             parameterType == "sceneName";
+    } else if (type == "variable") {
+      return parameterType == "objectvar" || parameterType == "globalvar" ||
+             parameterType == "scenevar";
+    }
+    return false;
+  }
+
+  /** \name Serialization
+   */
+  ///@{
+  /**
+   * \brief Serialize the ParameterMetadata to the specified element
+   */
+  void SerializeTo(gd::SerializerElement &element) const;
+
+  /**
+   * \brief Load the ParameterMetadata from the specified element
+   */
+  void UnserializeFrom(const gd::SerializerElement &element);
+  ///@}
+
+  // TODO: Deprecated public fields. Any direct using should be moved to
+  // getter/setter.
+  gd::String type;                      ///< Parameter type
+  gd::String supplementaryInformation;  ///< Used if needed
+  bool optional;                        ///< True if the parameter is optional
+
+  gd::String description;  ///< Description shown in editor
+  bool codeOnly;  ///< True if parameter is relative to code generation only,
+                  ///< i.e. must not be shown in editor
+  gd::String defaultValue;  ///< Used as a default value in editor or if an
+                            ///< optional parameter is empty.
+ private:
+  gd::String name;  ///< The name of the parameter to be used in code
+                    ///< generation. Optional.
+};
+
 /**
  * \brief Describe user-friendly information about an instruction (action or
  * condition), its parameters and the function name as well as other information
@@ -70,14 +260,12 @@ class GD_CORE_API InstructionMetadata {
   bool CanHaveSubInstructions() const { return canHaveSubInstructions; }
 
   /**
-   * Get the help path of the instruction, relative to the GDevelop
-   * documentation root.
+   * Get the help path of the instruction, relative to the documentation root.
    */
   const gd::String &GetHelpPath() const { return helpPath; }
 
   /**
-   * Set the help path of the instruction, relative to the GDevelop
-   * documentation root.
+   * Set the help path of the instruction, relative to the documentation root.
    */
   InstructionMetadata &SetHelpPath(const gd::String &path) {
     helpPath = path;
@@ -131,122 +319,46 @@ class GD_CORE_API InstructionMetadata {
   bool IsHidden() const { return hidden; }
 
   /**
-   * \brief Add a parameter to the instruction metadata.
-   *
-   * \param type One of the type handled by GDevelop. This
+   * \brief Add a parameter to the instruction ( condition or action )
+   * information class. \param type One of the type handled by GDevelop. This
    * will also determine the type of the argument used when calling the function
-   * in the generated code.
+   * in the generated code. \see EventsCodeGenerator::GenerateParametersCodes
    * \param description Description for parameter
    * \param optionalObjectType If type is "object", this parameter will describe
-   * which objects are allowed. If it is empty, all objects are allowed.
-   * \param parameterIsOptional true if the parameter must be optional, false
+   * which objects are allowed. If it is empty, all objects are allowed. \param
+   * parameterIsOptional true if the parameter must be optional, false
    * otherwise.
-   *
-   * \see EventsCodeGenerator::GenerateParametersCodes
    */
   InstructionMetadata &AddParameter(const gd::String &type,
-                                    const gd::String &label,
+                                    const gd::String &description,
                                     const gd::String &optionalObjectType = "",
                                     bool parameterIsOptional = false);
 
   /**
    * \brief Add a parameter not displayed in editor.
-   *
    * \param type One of the type handled by GDevelop. This will also determine
-   * the type of the argument used when calling the function in the generated
-   * code. \param supplementaryInformation Depends on `type`. For example, when
-   * `type == "inlineCode"`, the content of supplementaryInformation is inserted
-   * in the generated code.
-   *
-   * \see EventsCodeGenerator::GenerateParametersCodes
+   * the type of the argument used when calling the function in C++ code. \see
+   * EventsCodeGenerator::GenerateParametersCodes \param
+   * supplementaryInformation Can be used if needed. For example, when type ==
+   * "inlineCode", the content of supplementaryInformation is inserted in the
+   * generated C++ code.
    */
   InstructionMetadata &AddCodeOnlyParameter(
       const gd::String &type, const gd::String &supplementaryInformation);
 
   /**
    * \brief Set the default value used in editor (or if an optional parameter is
-   * empty during code generation) for the last added parameter.
+   * empty during code generation) for the latest added parameter.
    *
    * \see AddParameter
    */
-  InstructionMetadata &SetDefaultValue(const gd::String &defaultValue_) {
-    if (!parameters.empty()) parameters.back().SetDefaultValue(defaultValue_);
+  InstructionMetadata &SetDefaultValue(gd::String defaultValue_) {
+    if (!parameters.empty()) parameters.back().defaultValue = defaultValue_;
     return *this;
   };
 
   /**
-   * \brief Set the long description shown in the editor for the last added
-   * parameter.
-   *
-   * \see AddParameter
-   */
-  InstructionMetadata &SetParameterLongDescription(
-      const gd::String &longDescription) {
-    if (!parameters.empty())
-      parameters.back().SetLongDescription(longDescription);
-    return *this;
-  };
-
-  /**
-   * \brief Set the additional information, used for some parameters
-   * with special type (for example, it can contains the type of object accepted
-   * by the parameter), for the last added parameter.
-   *
-   * \see AddParameter
-   */
-  InstructionMetadata &SetParameterExtraInfo(const gd::String &extraInfo) {
-    if (!parameters.empty())
-      parameters.back().SetExtraInfo(extraInfo);
-    return *this;
-  };
-
-  /**
-   * \brief Add the default parameters for an instruction manipulating the
-   * specified type ("string", "number") with the default operators.
-   */
-  InstructionMetadata &UseStandardOperatorParameters(const gd::String &type);
-
-  /**
-   * \brief Add the default parameters for an instruction comparing the
-   * specified type ("string", "number") with the default relational operators.
-   */
-  InstructionMetadata &UseStandardRelationalOperatorParameters(
-      const gd::String &type);
-
-  /**
-   * \brief Mark the instruction as an object instruction. Automatically called
-   * when using `AddAction`/`AddCondition` on an `ObjectMetadata`.
-   */
-  InstructionMetadata &SetIsObjectInstruction() {
-    isObjectInstruction = true;
-    return *this;
-  }
-
-  /**
-   * \brief Mark the instruction as a behavior instruction. Automatically called
-   * when using `AddAction`/`AddCondition` on a `BehaviorMetadata`.
-   */
-  InstructionMetadata &SetIsBehaviorInstruction() {
-    isBehaviorInstruction = true;
-    return *this;
-  }
-
-  /**
-   * \brief Check if the instruction is an object instruction.
-   */
-  bool IsObjectInstruction() {
-    return isObjectInstruction;
-  }
-
-  /**
-   * \brief Check if the instruction is a behavior instruction.
-   */
-  bool IsBehaviorInstruction() {
-    return isBehaviorInstruction;
-  }
-
-  /**
-   * \brief Consider that the instruction is easy for a user to understand.
+   * \brief Consider that the instruction is easy for an user to understand.
    */
   InstructionMetadata &MarkAsSimple() {
     usageComplexity = 2;
@@ -254,7 +366,7 @@ class GD_CORE_API InstructionMetadata {
   }
 
   /**
-   * \brief Consider that the instruction is harder for a user to understand
+   * \brief Consider that the instruction is harder for an user to understand
    * than a normal instruction.
    */
   InstructionMetadata &MarkAsAdvanced() {
@@ -263,7 +375,7 @@ class GD_CORE_API InstructionMetadata {
   }
 
   /**
-   * \brief Consider that the instruction is complex for a user to understand.
+   * \brief Consider that the instruction is complex for an user to understand.
    */
   InstructionMetadata &MarkAsComplex() {
     usageComplexity = 9;
@@ -313,7 +425,7 @@ class GD_CORE_API InstructionMetadata {
      *  obj.AddAction("String",
      *                 _("Change the string"),
      *                 _("Change the string of a text"),
-     *                 _("the string"),
+     *                 _("Do _PARAM1__PARAM2_ to the string of _PARAM0_"),
      *                 _("Text"),
      *                 "CppPlatform/Extensions/text24.png",
      *                 "CppPlatform/Extensions/text.png");
@@ -446,8 +558,6 @@ class GD_CORE_API InstructionMetadata {
   int usageComplexity;  ///< Evaluate the instruction from 0 (simple&easy to
                         ///< use) to 10 (complex to understand)
   bool isPrivate;
-  bool isObjectInstruction;
-  bool isBehaviorInstruction;
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/MetadataProvider.cpp

@@ -4,11 +4,8 @@
  * reserved. This project is released under the MIT License.
  */
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
-
 #include <algorithm>
-
 #include "GDCore/Extensions/Metadata/BehaviorMetadata.h"
-#include "GDCore/Extensions/Metadata/EffectMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/Extensions/Metadata/ObjectMetadata.h"
 #include "GDCore/Extensions/Platform.h"
@@ -19,11 +16,11 @@ using namespace std;
 
 namespace gd {
 
-gd::BehaviorMetadata MetadataProvider::badBehaviorMetadata;
+gd::BehaviorMetadata MetadataProvider::badBehaviorInfo;
 gd::ObjectMetadata MetadataProvider::badObjectInfo;
-gd::EffectMetadata MetadataProvider::badEffectMetadata;
 gd::InstructionMetadata MetadataProvider::badInstructionMetadata;
 gd::ExpressionMetadata MetadataProvider::badExpressionMetadata;
+gd::ExpressionMetadata MetadataProvider::badStrExpressionMetadata;
 gd::PlatformExtension MetadataProvider::badExtension;
 
 ExtensionAndMetadata<BehaviorMetadata>
@@ -38,7 +35,7 @@ MetadataProvider::GetExtensionAndBehaviorMetadata(const gd::Platform& platform,
     }
   }
 
-  return ExtensionAndMetadata<BehaviorMetadata>(badExtension, badBehaviorMetadata);
+  return ExtensionAndMetadata<BehaviorMetadata>(badExtension, badBehaviorInfo);
 }
 
 const BehaviorMetadata& MetadataProvider::GetBehaviorMetadata(
@@ -66,26 +63,6 @@ const ObjectMetadata& MetadataProvider::GetObjectMetadata(
   return GetExtensionAndObjectMetadata(platform, objectType).GetMetadata();
 }
 
-ExtensionAndMetadata<EffectMetadata>
-MetadataProvider::GetExtensionAndEffectMetadata(const gd::Platform& platform,
-                                                gd::String type) {
-  for (auto& extension : platform.GetAllPlatformExtensions()) {
-    auto objectsTypes = extension->GetExtensionEffectTypes();
-    for (std::size_t j = 0; j < objectsTypes.size(); ++j) {
-      if (objectsTypes[j] == type)
-        return ExtensionAndMetadata<EffectMetadata>(
-            *extension, extension->GetEffectMetadata(type));
-    }
-  }
-
-  return ExtensionAndMetadata<EffectMetadata>(badExtension, badEffectMetadata);
-}
-
-const EffectMetadata& MetadataProvider::GetEffectMetadata(
-    const gd::Platform& platform, gd::String objectType) {
-  return GetExtensionAndEffectMetadata(platform, objectType).GetMetadata();
-}
-
 ExtensionAndMetadata<InstructionMetadata>
 MetadataProvider::GetExtensionAndActionMetadata(const gd::Platform& platform,
                                                 gd::String actionType) {
@@ -277,7 +254,7 @@ MetadataProvider::GetExtensionAndObjectStrExpressionMetadata(
   }
 
   return ExtensionAndMetadata<ExpressionMetadata>(badExtension,
-                                                  badExpressionMetadata);
+                                                  badStrExpressionMetadata);
 }
 
 const gd::ExpressionMetadata& MetadataProvider::GetObjectStrExpressionMetadata(
@@ -314,7 +291,7 @@ MetadataProvider::GetExtensionAndBehaviorStrExpressionMetadata(
   }
 
   return ExtensionAndMetadata<ExpressionMetadata>(badExtension,
-                                                  badExpressionMetadata);
+                                                  badStrExpressionMetadata);
 }
 
 const gd::ExpressionMetadata&
@@ -338,7 +315,7 @@ MetadataProvider::GetExtensionAndStrExpressionMetadata(
   }
 
   return ExtensionAndMetadata<ExpressionMetadata>(badExtension,
-                                                  badExpressionMetadata);
+                                                  badStrExpressionMetadata);
 }
 
 const gd::ExpressionMetadata& MetadataProvider::GetStrExpressionMetadata(
@@ -346,48 +323,197 @@ const gd::ExpressionMetadata& MetadataProvider::GetStrExpressionMetadata(
   return GetExtensionAndStrExpressionMetadata(platform, exprType).GetMetadata();
 }
 
-const gd::ExpressionMetadata& MetadataProvider::GetAnyExpressionMetadata(
-    const gd::Platform& platform, gd::String exprType) {
-  const auto& numberExpressionMetadata =
-      GetExpressionMetadata(platform, exprType);
-  const auto& stringExpressionMetadata =
-      GetStrExpressionMetadata(platform, exprType);
+bool MetadataProvider::HasAction(const gd::Platform& platform,
+                                 gd::String name) {
+  auto& extensions = platform.GetAllPlatformExtensions();
 
-  return &numberExpressionMetadata != &badExpressionMetadata
-             ? numberExpressionMetadata
-             : &stringExpressionMetadata != &badExpressionMetadata
-                   ? stringExpressionMetadata
-                   : badExpressionMetadata;
+  for (auto& extension : extensions) {
+    const auto& actions = extension->GetAllActions();
+    if (actions.find(name) != actions.end()) return true;
+  }
+
+  return false;
 }
 
-const gd::ExpressionMetadata& MetadataProvider::GetObjectAnyExpressionMetadata(
-    const gd::Platform& platform, gd::String objectType, gd::String exprType) {
-  const auto& numberExpressionMetadata =
-      GetObjectExpressionMetadata(platform, objectType, exprType);
-  const auto& stringExpressionMetadata =
-      GetObjectStrExpressionMetadata(platform, objectType, exprType);
+bool MetadataProvider::HasObjectAction(const gd::Platform& platform,
+                                       gd::String objectType,
+                                       gd::String name) {
+  auto& extensions = platform.GetAllPlatformExtensions();
+  for (auto& extension : extensions) {
+    const auto& actions = extension->GetAllActionsForObject(objectType);
+    if (actions.find(name) != actions.end()) return true;
+  }
 
-  return &numberExpressionMetadata != &badExpressionMetadata
-             ? numberExpressionMetadata
-             : &stringExpressionMetadata != &badExpressionMetadata
-                   ? stringExpressionMetadata
-                   : badExpressionMetadata;
+  // Then check in functions of "Base object".
+  for (auto& extension : extensions) {
+    const auto& actions = extension->GetAllActionsForObject("");
+    if (actions.find(name) != actions.end()) return true;
+  }
+
+  return false;
 }
 
-const gd::ExpressionMetadata&
-MetadataProvider::GetBehaviorAnyExpressionMetadata(const gd::Platform& platform,
-                                                   gd::String autoType,
-                                                   gd::String exprType) {
-  const auto& numberExpressionMetadata =
-      GetBehaviorExpressionMetadata(platform, autoType, exprType);
-  const auto& stringExpressionMetadata =
-      GetBehaviorStrExpressionMetadata(platform, autoType, exprType);
+bool MetadataProvider::HasBehaviorAction(const gd::Platform& platform,
+                                         gd::String behaviorType,
+                                         gd::String name) {
+  auto& extensions = platform.GetAllPlatformExtensions();
+  for (auto& extension : extensions) {
+    const auto& actions = extension->GetAllActionsForBehavior(behaviorType);
+    if (actions.find(name) != actions.end()) return true;
+  }
 
-  return &numberExpressionMetadata != &badExpressionMetadata
-             ? numberExpressionMetadata
-             : &stringExpressionMetadata != &badExpressionMetadata
-                   ? stringExpressionMetadata
-                   : badExpressionMetadata;
+  // Then check in functions of "Base object".
+  for (auto& extension : extensions) {
+    const auto& actions = extension->GetAllActionsForBehavior("");
+    if (actions.find(name) != actions.end()) return true;
+  }
+
+  return false;
+}
+
+bool MetadataProvider::HasCondition(const gd::Platform& platform,
+                                    gd::String name) {
+  auto& extensions = platform.GetAllPlatformExtensions();
+  for (auto& extension : extensions) {
+    const auto& conditions = extension->GetAllConditions();
+    if (conditions.find(name) != conditions.end()) return true;
+  }
+
+  return false;
+}
+
+bool MetadataProvider::HasObjectCondition(const gd::Platform& platform,
+                                          gd::String objectType,
+                                          gd::String name) {
+  auto& extensions = platform.GetAllPlatformExtensions();
+  for (auto& extension : extensions) {
+    const auto& conditions = extension->GetAllConditionsForObject(objectType);
+    if (conditions.find(name) != conditions.end()) return true;
+  }
+
+  // Then check in functions of "Base object".
+  for (auto& extension : extensions) {
+    const auto& conditions = extension->GetAllConditionsForObject("");
+    if (conditions.find(name) != conditions.end()) return true;
+  }
+
+  return false;
+}
+
+bool MetadataProvider::HasBehaviorCondition(const gd::Platform& platform,
+                                            gd::String behaviorType,
+                                            gd::String name) {
+  auto& extensions = platform.GetAllPlatformExtensions();
+  for (auto& extension : extensions) {
+    const auto& conditions =
+        extension->GetAllConditionsForBehavior(behaviorType);
+    if (conditions.find(name) != conditions.end()) return true;
+  }
+
+  // Then check in functions of "Base object".
+  for (auto& extension : extensions) {
+    const auto& conditions = extension->GetAllConditionsForBehavior("");
+    if (conditions.find(name) != conditions.end()) return true;
+  }
+
+  return false;
+}
+
+bool MetadataProvider::HasExpression(const gd::Platform& platform,
+                                     gd::String name) {
+  auto& extensions = platform.GetAllPlatformExtensions();
+  for (auto& extension : extensions) {
+    const auto& expressions = extension->GetAllExpressions();
+    if (expressions.find(name) != expressions.end()) return true;
+  }
+
+  return false;
+}
+
+bool MetadataProvider::HasObjectExpression(const gd::Platform& platform,
+                                           gd::String objectType,
+                                           gd::String name) {
+  auto& extensions = platform.GetAllPlatformExtensions();
+  for (auto& extension : extensions) {
+    const auto& expressions = extension->GetAllExpressionsForObject(objectType);
+    if (expressions.find(name) != expressions.end()) return true;
+  }
+
+  // Then check in functions of "Base object".
+  for (auto& extension : extensions) {
+    const auto& expressions = extension->GetAllExpressionsForObject("");
+    if (expressions.find(name) != expressions.end()) return true;
+  }
+
+  return false;
+}
+
+bool MetadataProvider::HasBehaviorExpression(const gd::Platform& platform,
+                                             gd::String behaviorType,
+                                             gd::String name) {
+  auto& extensions = platform.GetAllPlatformExtensions();
+  for (auto& extension : extensions) {
+    const auto& expressions =
+        extension->GetAllExpressionsForBehavior(behaviorType);
+    if (expressions.find(name) != expressions.end()) return true;
+  }
+
+  // Then check in functions of "Base object".
+  for (auto& extension : extensions) {
+    const auto& expressions = extension->GetAllExpressionsForBehavior("");
+    if (expressions.find(name) != expressions.end()) return true;
+  }
+
+  return false;
+}
+
+bool MetadataProvider::HasStrExpression(const gd::Platform& platform,
+                                        gd::String name) {
+  auto& extensions = platform.GetAllPlatformExtensions();
+  for (auto& extension : extensions) {
+    const auto& expressions = extension->GetAllStrExpressions();
+    if (expressions.find(name) != expressions.end()) return true;
+  }
+
+  return false;
+}
+
+bool MetadataProvider::HasObjectStrExpression(const gd::Platform& platform,
+                                              gd::String objectType,
+                                              gd::String name) {
+  auto& extensions = platform.GetAllPlatformExtensions();
+  for (auto& extension : extensions) {
+    const auto& expressions =
+        extension->GetAllStrExpressionsForObject(objectType);
+    if (expressions.find(name) != expressions.end()) return true;
+  }
+
+  // Then check in functions of "Base object".
+  for (auto& extension : extensions) {
+    const auto& expressions = extension->GetAllStrExpressionsForObject("");
+    if (expressions.find(name) != expressions.end()) return true;
+  }
+
+  return false;
+}
+
+bool MetadataProvider::HasBehaviorStrExpression(const gd::Platform& platform,
+                                                gd::String behaviorType,
+                                                gd::String name) {
+  auto& extensions = platform.GetAllPlatformExtensions();
+  for (auto& extension : extensions) {
+    const auto& expressions =
+        extension->GetAllStrExpressionsForBehavior(behaviorType);
+    if (expressions.find(name) != expressions.end()) return true;
+  }
+
+  // Then check in functions of "Base object".
+  for (auto& extension : extensions) {
+    const auto& expressions = extension->GetAllStrExpressionsForBehavior("");
+    if (expressions.find(name) != expressions.end()) return true;
+  }
+
+  return false;
 }
 
 MetadataProvider::~MetadataProvider() {}

Core/GDCore/Extensions/Metadata/MetadataProvider.h

@@ -10,7 +10,6 @@
 namespace gd {
 class BehaviorMetadata;
 class ObjectMetadata;
-class EffectMetadata;
 class ExpressionMetadata;
 class ExpressionMetadata;
 class Platform;
@@ -72,12 +71,6 @@ class GD_CORE_API MetadataProvider {
   static ExtensionAndMetadata<ObjectMetadata> GetExtensionAndObjectMetadata(
       const gd::Platform& platform, gd::String type);
 
-  /**
-   * Get the metadata about an effect, and its associated extension.
-   */
-  static ExtensionAndMetadata<EffectMetadata> GetExtensionAndEffectMetadata(
-      const gd::Platform& platform, gd::String type);
-
   /**
    * Get the metadata of an action, and its associated extension.
    * Works for object, behaviors and static actions.
@@ -96,7 +89,7 @@ class GD_CORE_API MetadataProvider {
 
   /**
    * Get information about an expression, and its associated extension.
-   * Works for free expressions.
+   * Works for static expressions.
    */
   static ExtensionAndMetadata<ExpressionMetadata>
   GetExtensionAndExpressionMetadata(const gd::Platform& platform,
@@ -122,7 +115,7 @@ class GD_CORE_API MetadataProvider {
 
   /**
    * Get information about a string expression, and its associated extension.
-   * Works for free expressions.
+   * Works for static expressions.
    */
   static ExtensionAndMetadata<ExpressionMetadata>
   GetExtensionAndStrExpressionMetadata(const gd::Platform& platform,
@@ -158,12 +151,6 @@ class GD_CORE_API MetadataProvider {
   static const ObjectMetadata& GetObjectMetadata(const gd::Platform& platform,
                                                  gd::String type);
 
-  /**
-   * Get the metadata about an effect.
-   */
-  static const EffectMetadata& GetEffectMetadata(const gd::Platform& platform,
-                                                 gd::String type);
-
   /**
    * Get the metadata of an action.
    * Works for object, behaviors and static actions.
@@ -180,7 +167,7 @@ class GD_CORE_API MetadataProvider {
 
   /**
    * Get information about an expression from its type
-   * Works for free expressions.
+   * Works for static expressions.
    */
   static const gd::ExpressionMetadata& GetExpressionMetadata(
       const gd::Platform& platform, gd::String exprType);
@@ -201,7 +188,7 @@ class GD_CORE_API MetadataProvider {
 
   /**
    * Get information about a string expression from its type
-   * Works for free expressions.
+   * Works for static expressions.
    */
   static const gd::ExpressionMetadata& GetStrExpressionMetadata(
       const gd::Platform& platform, gd::String exprType);
@@ -221,32 +208,96 @@ class GD_CORE_API MetadataProvider {
       const gd::Platform& platform, gd::String autoType, gd::String exprType);
 
   /**
-   * Get information about an expression from its type.
-   * Works for free expressions.
+   * \brief Check if a (static) condition exists
+   * @return true if the (static) condition exists
    */
-  static const gd::ExpressionMetadata& GetAnyExpressionMetadata(
-      const gd::Platform& platform, gd::String exprType);
+  static bool HasCondition(const gd::Platform& platform, gd::String name);
 
   /**
-   * Get information about an expression from its type.
-   * Works for object expressions.
+   * \brief Check if a (static) action exists
+   * @return true if the (static) action exists
    */
-  static const gd::ExpressionMetadata& GetObjectAnyExpressionMetadata(
-      const gd::Platform& platform, gd::String objectType, gd::String exprType);
+  static bool HasAction(const gd::Platform& platform, gd::String name);
 
   /**
-   * Get information about an expression from its type.
-   * Works for behavior expressions.
+   * \brief Check if a (object) action exists
+   * @return true if the (object) action exists
    */
-  static const gd::ExpressionMetadata& GetBehaviorAnyExpressionMetadata(
-      const gd::Platform& platform, gd::String autoType, gd::String exprType);
+  static bool HasObjectAction(const gd::Platform& platform,
+                              gd::String objectType,
+                              gd::String name);
+
+  /**
+   * \brief Check if a (object) condition exists
+   * @return true if the (object) condition exists
+   */
+  static bool HasObjectCondition(const gd::Platform& platform,
+                                 gd::String objectType,
+                                 gd::String name);
+
+  /**
+   * \brief Check if a (behavior) action exists
+   * @return true if the (behavior) action exists
+   */
+  static bool HasBehaviorAction(const gd::Platform& platform,
+                                gd::String behaviorType,
+                                gd::String name);
+
+  /**
+   * \brief Check if a (behavior) condition exists
+   * @return true if the (behavior) condition exists
+   */
+  static bool HasBehaviorCondition(const gd::Platform& platform,
+                                   gd::String behaviorType,
+                                   gd::String name);
+
+  /**
+   * \brief Check if a (static) expression exists
+   * @return true if the (static) expression exists
+   */
+  static bool HasExpression(const gd::Platform& platform, gd::String name);
+
+  /**
+   * \brief Check if a (object) expression exists
+   * @return true if the (object) expression exists
+   */
+  static bool HasObjectExpression(const gd::Platform& platform,
+                                  gd::String objectType,
+                                  gd::String name);
+
+  /**
+   * \brief Check if a (behavior) expression exists
+   * @return true if the (behavior) expression exists
+   */
+  static bool HasBehaviorExpression(const gd::Platform& platform,
+                                    gd::String behaviorType,
+                                    gd::String name);
+
+  /**
+   * \brief Check if a (static) string expression exists
+   * @return true if the (static) string expression exists
+   */
+  static bool HasStrExpression(const gd::Platform& platform, gd::String name);
+
+  /**
+   * \brief Check if a (object) string expression exists
+   * @return true if the (object) string expression exists
+   */
+  static bool HasObjectStrExpression(const gd::Platform& platform,
+                                     gd::String objectType,
+                                     gd::String name);
+
+  /**
+   * \brief Check if a (behavior) string expression exists
+   * @return true if the (behavior) string expression exists
+   */
+  static bool HasBehaviorStrExpression(const gd::Platform& platform,
+                                       gd::String behaviorType,
+                                       gd::String name);
 
   static bool IsBadExpressionMetadata(const gd::ExpressionMetadata& metadata) {
-    return &metadata == &badExpressionMetadata;
-  }
-
-  static bool IsBadBehaviorMetadata(const gd::BehaviorMetadata& metadata) {
-    return &metadata == &badBehaviorMetadata;
+    return &metadata == &badExpressionMetadata ||
+           &metadata == &badStrExpressionMetadata;
   }
 
   virtual ~MetadataProvider();
@@ -255,11 +306,11 @@ class GD_CORE_API MetadataProvider {
   MetadataProvider();
 
   static PlatformExtension badExtension;
-  static BehaviorMetadata badBehaviorMetadata;
+  static BehaviorMetadata badBehaviorInfo;
   static ObjectMetadata badObjectInfo;
-  static EffectMetadata badEffectMetadata;
   static gd::InstructionMetadata badInstructionMetadata;
   static gd::ExpressionMetadata badExpressionMetadata;
+  static gd::ExpressionMetadata badStrExpressionMetadata;
   int useless;  // Useless member to avoid emscripten "must have a positive
                 // integer typeid pointer" runtime error.
 };

Core/GDCore/Extensions/Metadata/MultipleInstructionMetadata.cpp

@@ -1,12 +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 "MultipleInstructionMetadata.h"
-
-#include "InstructionMetadata.h"
-
-namespace gd {
-
-}  // namespace gd

Core/GDCore/Extensions/Metadata/MultipleInstructionMetadata.h

@@ -1,216 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#ifndef MULTIPLEINSTRUCTIONSMETADATA_H
-#define MULTIPLEINSTRUCTIONSMETADATA_H
-#include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
-#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
-#include "GDCore/String.h"
-namespace gd {}  // namespace gd
-
-namespace gd {
-
-/**
- * \brief A "composite" metadata that can be used to easily declare
- * both an expression and a related condition (and a related action)
- * without writing manually the three of them.
- *
- * \ingroup PlatformDefinition
- */
-class GD_CORE_API MultipleInstructionMetadata {
- public:
-  static MultipleInstructionMetadata WithExpressionAndCondition(
-      gd::ExpressionMetadata &expression, gd::InstructionMetadata &condition) {
-    return MultipleInstructionMetadata(expression, condition);
-  }
-  static MultipleInstructionMetadata WithExpressionAndConditionAndAction(
-      gd::ExpressionMetadata &expression,
-      gd::InstructionMetadata &condition,
-      gd::InstructionMetadata &action) {
-    return MultipleInstructionMetadata(expression, condition, action);
-  }
-
-  /**
-   * \see gd::InstructionMetadata::AddParameter
-   */
-  MultipleInstructionMetadata &AddParameter(
-      const gd::String &type,
-      const gd::String &label,
-      const gd::String &optionalObjectType = "",
-      bool parameterIsOptional = false) {
-#if defined(GD_IDE_ONLY)
-    if (expression)
-      expression->AddParameter(
-          type, label, optionalObjectType, parameterIsOptional);
-    if (condition)
-      condition->AddParameter(
-          type, label, optionalObjectType, parameterIsOptional);
-    if (action)
-      action->AddParameter(
-          type, label, optionalObjectType, parameterIsOptional);
-#endif
-    return *this;
-  }
-
-  /**
-   * \see gd::InstructionMetadata::AddCodeOnlyParameter
-   */
-  MultipleInstructionMetadata &AddCodeOnlyParameter(
-      const gd::String &type, const gd::String &supplementaryInformation) {
-#if defined(GD_IDE_ONLY)
-    if (expression)
-      expression->AddCodeOnlyParameter(type, supplementaryInformation);
-    if (condition)
-      condition->AddCodeOnlyParameter(type, supplementaryInformation);
-    if (action) action->AddCodeOnlyParameter(type, supplementaryInformation);
-#endif
-    return *this;
-  }
-
-  /**
-   * \see gd::InstructionMetadata::SetDefaultValue
-   */
-  MultipleInstructionMetadata &SetDefaultValue(const gd::String &defaultValue) {
-#if defined(GD_IDE_ONLY)
-    if (expression) expression->SetDefaultValue(defaultValue);
-    if (condition) condition->SetDefaultValue(defaultValue);
-    if (action) action->SetDefaultValue(defaultValue);
-#endif
-    return *this;
-  };
-
-  /**
-   * \see gd::InstructionMetadata::SetParameterLongDescription
-   */
-  MultipleInstructionMetadata &SetParameterLongDescription(
-      const gd::String &longDescription) {
-#if defined(GD_IDE_ONLY)
-    if (expression) expression->SetParameterLongDescription(longDescription);
-    if (condition) condition->SetParameterLongDescription(longDescription);
-    if (action) action->SetParameterLongDescription(longDescription);
-#endif
-    return *this;
-  };
-
-  /**
-   * \see gd::InstructionMetadata::SetHidden
-   */
-  MultipleInstructionMetadata &SetHidden() {
-#if defined(GD_IDE_ONLY)
-    if (expression) expression->SetHidden();
-    if (condition) condition->SetHidden();
-    if (action) action->SetHidden();
-#endif
-    return *this;
-  };
-
-  /**
-   * \see gd::InstructionMetadata::UseStandardOperatorParameters
-   * \see gd::InstructionMetadata::UseStandardRelationalOperatorParameters
-   */
-  MultipleInstructionMetadata &UseStandardParameters(const gd::String &type) {
-#if defined(GD_IDE_ONLY)
-    if (condition) condition->UseStandardRelationalOperatorParameters(type);
-    if (action) action->UseStandardOperatorParameters(type);
-#endif
-    return *this;
-  }
-
-  MultipleInstructionMetadata &SetFunctionName(const gd::String &functionName) {
-#if defined(GD_IDE_ONLY)
-    if (expression) expression->SetFunctionName(functionName);
-    if (condition) condition->SetFunctionName(functionName);
-    if (action) action->GetCodeExtraInformation().SetFunctionName(functionName);
-#endif
-    return *this;
-  }
-
-  MultipleInstructionMetadata &SetGetter(const gd::String &getter) {
-#if defined(GD_IDE_ONLY)
-    if (expression) expression->SetFunctionName(getter);
-    if (condition) condition->SetFunctionName(getter);
-    if (action) action->GetCodeExtraInformation().SetGetter(getter);
-#endif
-    return *this;
-  }
-
-  MultipleInstructionMetadata &SetIncludeFile(const gd::String &includeFile) {
-#if defined(GD_IDE_ONLY)
-    if (expression)
-      expression->GetCodeExtraInformation().SetIncludeFile(includeFile);
-    if (condition)
-      condition->GetCodeExtraInformation().SetIncludeFile(includeFile);
-    if (action) action->GetCodeExtraInformation().SetIncludeFile(includeFile);
-#endif
-    return *this;
-  }
-
-  MultipleInstructionMetadata &AddIncludeFile(const gd::String &includeFile) {
-#if defined(GD_IDE_ONLY)
-    if (expression)
-      expression->GetCodeExtraInformation().AddIncludeFile(includeFile);
-    if (condition)
-      condition->GetCodeExtraInformation().AddIncludeFile(includeFile);
-    if (action) action->GetCodeExtraInformation().AddIncludeFile(includeFile);
-#endif
-    return *this;
-  }
-
-  /**
-   * \see gd::InstructionMetadata::MarkAsSimple
-   */
-  MultipleInstructionMetadata &MarkAsSimple() {
-#if defined(GD_IDE_ONLY)
-    if (condition) condition->MarkAsSimple();
-    if (action) action->MarkAsSimple();
-#endif
-    return *this;
-  }
-
-  /**
-   * \see gd::InstructionMetadata::MarkAsAdvanced
-   */
-  MultipleInstructionMetadata &MarkAsAdvanced() {
-#if defined(GD_IDE_ONLY)
-    if (condition) condition->MarkAsAdvanced();
-    if (action) action->MarkAsAdvanced();
-#endif
-    return *this;
-  }
-
-  /**
-   * \see gd::InstructionMetadata::MarkAsComplex
-   */
-  MultipleInstructionMetadata &MarkAsComplex() {
-#if defined(GD_IDE_ONLY)
-    if (condition) condition->MarkAsComplex();
-    if (action) action->MarkAsComplex();
-#endif
-    return *this;
-  }
-
-  /**
-   * \brief Don't use, only here to fulfill Emscripten bindings requirements.
-   */
-  MultipleInstructionMetadata()
-      : expression(nullptr), condition(nullptr), action(nullptr){};
-
- private:
-  MultipleInstructionMetadata(gd::ExpressionMetadata &expression_,
-                              gd::InstructionMetadata &condition_)
-      : expression(&expression_), condition(&condition_), action(nullptr){};
-  MultipleInstructionMetadata(gd::ExpressionMetadata &expression_,
-                              gd::InstructionMetadata &condition_,
-                              gd::InstructionMetadata &action_)
-      : expression(&expression_), condition(&condition_), action(&action_){};
-
-  gd::ExpressionMetadata *expression;
-  gd::InstructionMetadata *condition;
-  gd::InstructionMetadata *action;
-};
-
-}  // namespace gd
-
-#endif  // MULTIPLEINSTRUCTIONSMETADATA_H

Core/GDCore/Extensions/Metadata/ObjectMetadata.cpp

@@ -4,16 +4,11 @@
  * reserved. This project is released under the MIT License.
  */
 #include "ObjectMetadata.h"
-
 #include <algorithm>
 #include <iostream>
-
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
-#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
-#include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Project/Object.h"
-#include "GDCore/Tools/Localization.h"
 
 namespace gd {
 
@@ -82,8 +77,7 @@ gd::InstructionMetadata& ObjectMetadata::AddCondition(
                                                            group,
                                                            icon,
                                                            smallicon)
-                                           .SetHelpPath(GetHelpPath())
-                                           .SetIsObjectInstruction();
+                                           .SetHelpPath(GetHelpPath());
   return conditionsInfos[nameWithNamespace];
 #endif
 }
@@ -107,64 +101,7 @@ gd::InstructionMetadata& ObjectMetadata::AddAction(
                                                         group,
                                                         icon,
                                                         smallicon)
-                                        .SetHelpPath(GetHelpPath())
-                                        .SetIsObjectInstruction();
-  return actionsInfos[nameWithNamespace];
-#endif
-}
-
-gd::InstructionMetadata& ObjectMetadata::AddScopedCondition(
-    const gd::String& name,
-    const gd::String& fullname,
-    const gd::String& description,
-    const gd::String& sentence,
-    const gd::String& group,
-    const gd::String& icon,
-    const gd::String& smallicon) {
-#if defined(GD_IDE_ONLY)
-  gd::String nameWithNamespace =
-      GetName().empty()
-          ? name // Don't insert a namespace separator for the base object.
-          : GetName() + gd::PlatformExtension::GetNamespaceSeparator() + name;
-
-  conditionsInfos[nameWithNamespace] = InstructionMetadata(extensionNamespace,
-                                                           nameWithNamespace,
-                                                           fullname,
-                                                           description,
-                                                           sentence,
-                                                           group,
-                                                           icon,
-                                                           smallicon)
-                                           .SetHelpPath(GetHelpPath())
-                                           .SetIsObjectInstruction();
-  return conditionsInfos[nameWithNamespace];
-#endif
-}
-
-gd::InstructionMetadata& ObjectMetadata::AddScopedAction(
-    const gd::String& name,
-    const gd::String& fullname,
-    const gd::String& description,
-    const gd::String& sentence,
-    const gd::String& group,
-    const gd::String& icon,
-    const gd::String& smallicon) {
-#if defined(GD_IDE_ONLY)
-  gd::String nameWithNamespace =
-      GetName().empty()
-          ? name // Don't insert a namespace separator for the base object.
-          : GetName() + gd::PlatformExtension::GetNamespaceSeparator() + name;
-
-  actionsInfos[nameWithNamespace] = InstructionMetadata(extensionNamespace,
-                                                        nameWithNamespace,
-                                                        fullname,
-                                                        description,
-                                                        sentence,
-                                                        group,
-                                                        icon,
-                                                        smallicon)
-                                        .SetHelpPath(GetHelpPath())
-                                        .SetIsObjectInstruction();
+                                        .SetHelpPath(GetHelpPath());
   return actionsInfos[nameWithNamespace];
 #endif
 }
@@ -176,16 +113,12 @@ gd::ExpressionMetadata& ObjectMetadata::AddExpression(
     const gd::String& group,
     const gd::String& smallicon) {
 #if defined(GD_IDE_ONLY)
-  // Be careful, objects expression do not have namespace (not necessary as
-  // objects inherits from only one derived object).
-  expressionsInfos[name] = ExpressionMetadata("number",
-                                              extensionNamespace,
-                                              name,
-                                              fullname,
-                                              description,
-                                              group,
-                                              smallicon)
-                               .SetHelpPath(GetHelpPath());
+  // Be careful, objects expression do not have namespace ( not necessary as
+  // objects inherits from only one derived object )
+  expressionsInfos[name] =
+      ExpressionMetadata(
+          extensionNamespace, name, fullname, description, group, smallicon)
+          .SetHelpPath(GetHelpPath());
 
   return expressionsInfos[name];
 #endif
@@ -198,110 +131,17 @@ gd::ExpressionMetadata& ObjectMetadata::AddStrExpression(
     const gd::String& group,
     const gd::String& smallicon) {
 #if defined(GD_IDE_ONLY)
-  // Be careful, objects expression do not have namespace (not necessary as
-  // objects inherits from only one derived object).
-  strExpressionsInfos[name] = ExpressionMetadata("string",
-                                                 extensionNamespace,
-                                                 name,
-                                                 fullname,
-                                                 description,
-                                                 group,
-                                                 smallicon)
-                                  .SetHelpPath(GetHelpPath());
+  // Be careful, objects expression do not have namespace ( not necessary as
+  // objects inherits from only one derived object )
+  strExpressionsInfos[name] =
+      ExpressionMetadata(
+          extensionNamespace, name, fullname, description, group, smallicon)
+          .SetHelpPath(GetHelpPath());
 
   return strExpressionsInfos[name];
 #endif
 }
 
-gd::MultipleInstructionMetadata ObjectMetadata::AddExpressionAndCondition(
-    const gd::String& type,
-    const gd::String& name,
-    const gd::String& fullname,
-    const gd::String& descriptionSubject,
-    const gd::String& sentenceName,
-    const gd::String& group,
-    const gd::String& icon) {
-  gd::String expressionDescriptionTemplate = _("Return <subject>.");
-  auto& expression =
-      type == "number"
-          ? AddExpression(name,
-                          fullname,
-                          expressionDescriptionTemplate.FindAndReplace(
-                              "<subject>", descriptionSubject),
-                          group,
-                          icon)
-          : AddStrExpression(name,
-                             fullname,
-                             expressionDescriptionTemplate.FindAndReplace(
-                                 "<subject>", descriptionSubject),
-                             group,
-                             icon);
-
-  gd::String conditionDescriptionTemplate = _("Compare <subject>.");
-  auto& condition =
-      AddScopedCondition(name,
-                         fullname,
-                         conditionDescriptionTemplate.FindAndReplace(
-                             "<subject>", descriptionSubject),
-                         sentenceName,
-                         group,
-                         icon,
-                         icon);
-
-  return MultipleInstructionMetadata::WithExpressionAndCondition(expression,
-                                                                 condition);
-}
-
-gd::MultipleInstructionMetadata
-ObjectMetadata::AddExpressionAndConditionAndAction(
-    const gd::String& type,
-    const gd::String& name,
-    const gd::String& fullname,
-    const gd::String& descriptionSubject,
-    const gd::String& sentenceName,
-    const gd::String& group,
-    const gd::String& icon) {
-  gd::String expressionDescriptionTemplate = _("Return <subject>.");
-  auto& expression =
-      type == "number"
-          ? AddExpression(name,
-                          fullname,
-                          expressionDescriptionTemplate.FindAndReplace(
-                              "<subject>", descriptionSubject),
-                          group,
-                          icon)
-          : AddStrExpression(name,
-                             fullname,
-                             expressionDescriptionTemplate.FindAndReplace(
-                                 "<subject>", descriptionSubject),
-                             group,
-                             icon);
-
-  gd::String conditionDescriptionTemplate = _("Compare <subject>.");
-  auto& condition =
-      AddScopedCondition(name,
-                         fullname,
-                         conditionDescriptionTemplate.FindAndReplace(
-                             "<subject>", descriptionSubject),
-                         sentenceName,
-                         group,
-                         icon,
-                         icon);
-
-  gd::String actionDescriptionTemplate = _("Change <subject>.");
-  auto& action = AddScopedAction(
-      "Set" + name,
-      fullname,
-      actionDescriptionTemplate.FindAndReplace("<subject>", descriptionSubject),
-      sentenceName,
-      group,
-      icon,
-      icon);
-
-  return MultipleInstructionMetadata::WithExpressionAndConditionAndAction(
-      expression, condition, action);
-}
-
 ObjectMetadata& ObjectMetadata::SetFullName(const gd::String& fullname_) {
 #if defined(GD_IDE_ONLY)
   fullname = fullname_;

Core/GDCore/Extensions/Metadata/ObjectMetadata.h

@@ -5,22 +5,19 @@
  */
 #ifndef OBJECTMETADATA_H
 #define OBJECTMETADATA_H
-#include <functional>
 #include <map>
 #include <memory>
-
+#include <functional>
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/String.h"
 namespace gd {
 class InstructionMetadata;
-class MultipleInstructionMetadata;
 class ExpressionMetadata;
 }  // namespace gd
 
-typedef std::function<std::unique_ptr<gd::Object>(gd::String name)>
-    CreateFunPtr;
+typedef std::function<std::unique_ptr<gd::Object>(gd::String name)> CreateFunPtr;
 
 namespace gd {
 
@@ -34,7 +31,7 @@ class GD_CORE_API ObjectMetadata {
  public:
   /**
    * \brief Construct an object metadata, using a "blueprint" object that will
-   * be copied when a new object is requested.
+   * be copied when a new object is asked.
    */
   ObjectMetadata(const gd::String& extensionNamespace_,
                  const gd::String& name_,
@@ -58,8 +55,7 @@ class GD_CORE_API ObjectMetadata {
 
   /**
    * \brief Declare a new condition as being part of the extension.
-   * \deprecated Prefer using `AddScopedCondition`, to properly namespace the
-   * condition.
+   * \note This method does nothing when used for GD C++ runtime.
    */
   gd::InstructionMetadata& AddCondition(const gd::String& name_,
                                         const gd::String& fullname_,
@@ -71,8 +67,7 @@ class GD_CORE_API ObjectMetadata {
 
   /**
    * \brief Declare a new action as being part of the extension.
-   * \deprecated Prefer using `AddScopedAction`, to properly namespace the
-   * action.
+   * \note This method does nothing when used for GD C++ runtime.
    */
   gd::InstructionMetadata& AddAction(const gd::String& name_,
                                      const gd::String& fullname_,
@@ -81,31 +76,9 @@ class GD_CORE_API ObjectMetadata {
                                      const gd::String& group_,
                                      const gd::String& icon_,
                                      const gd::String& smallicon_);
-
-  /**
-   * Declare a new condition as being part of the object.
-   */
-  gd::InstructionMetadata& AddScopedCondition(const gd::String& name_,
-                                              const gd::String& fullname_,
-                                              const gd::String& description_,
-                                              const gd::String& sentence_,
-                                              const gd::String& group_,
-                                              const gd::String& icon_,
-                                              const gd::String& smallicon_);
-
-  /**
-   * Declare a new action as being part of the object.
-   */
-  gd::InstructionMetadata& AddScopedAction(const gd::String& name_,
-                                           const gd::String& fullname_,
-                                           const gd::String& description_,
-                                           const gd::String& sentence_,
-                                           const gd::String& group_,
-                                           const gd::String& icon_,
-                                           const gd::String& smallicon_);
-
   /**
    * \brief Declare a new expression as being part of the extension.
+   * \note This method does nothing when used for GD C++ runtime.
    */
   gd::ExpressionMetadata& AddExpression(const gd::String& name_,
                                         const gd::String& fullname_,
@@ -114,6 +87,7 @@ class GD_CORE_API ObjectMetadata {
                                         const gd::String& smallicon_);
   /**
    * \brief Declare a new string expression as being part of the extension.
+   * \note This method does nothing when used for GD C++ runtime.
    */
   gd::ExpressionMetadata& AddStrExpression(const gd::String& name_,
                                            const gd::String& fullname_,
@@ -121,62 +95,30 @@ class GD_CORE_API ObjectMetadata {
                                            const gd::String& group_,
                                            const gd::String& smallicon_);
 
-  /**
-   * \brief Declare a new expression and condition as being part of the
-   * object.
-   * \note It's recommended to use this function to avoid declaring twice a
-   * similar expression/condition.
-   */
-  gd::MultipleInstructionMetadata AddExpressionAndCondition(
-      const gd::String& type,
-      const gd::String& name,
-      const gd::String& fullname,
-      const gd::String& description,
-      const gd::String& sentenceName,
-      const gd::String& group,
-      const gd::String& icon);
-
-  /**
-   * \brief Declare a new expression, condition and action as being part of the
-   * object.
-   * \note The action name is prefixed by "Set" (and the namespace, as the
-   * condition).
-   * \note It's recommended to use this function to avoid declaring
-   * 3 times a similar expression/condition/action.
-   */
-  gd::MultipleInstructionMetadata AddExpressionAndConditionAndAction(
-      const gd::String& type,
-      const gd::String& name,
-      const gd::String& fullname,
-      const gd::String& description,
-      const gd::String& sentenceName,
-      const gd::String& group,
-      const gd::String& icon);
-
   /**
    * \brief Set the name shown to the user.
+   * \note This method does nothing when used for GD C++ runtime.
    */
   ObjectMetadata& SetFullName(const gd::String& fullname_);
 
   /**
    * \brief Set the description shown to the user.
+   * \note This method does nothing when used for GD C++ runtime.
    */
   ObjectMetadata& SetDescription(const gd::String& description_);
 
   /**
-   * \brief Get the help path of the object, relative to the GDevelop
-   * documentation root.
+   * Get the help path of the object, relative to the documentation root.
    */
-  const gd::String& GetHelpPath() const { return helpPath; }
+  const gd::String &GetHelpPath() const { return helpPath; }
 
   /**
-   * \brief Set the help path of the object, relative to the GDevelop
-   * documentation root.
-   *
+   * Set the help path of the object, relative to the documentation root.
+   * 
    * The object instructions will have this help path set by
    * default, unless you call SetHelpPath on them.
    */
-  ObjectMetadata& SetHelpPath(const gd::String& path) {
+  ObjectMetadata &SetHelpPath(const gd::String &path) {
     helpPath = path;
     return *this;
   }
@@ -224,7 +166,7 @@ class GD_CORE_API ObjectMetadata {
   gd::String name;
   gd::String helpPath;
 #if defined(GD_IDE_ONLY)
-  gd::String helpUrl;  ///< Deprecated. Use helpPath instead.
+  gd::String helpUrl; ///< Deprecated. Use helpPath instead.
   gd::String fullname;
   gd::String description;
   gd::String iconFilename;

Core/GDCore/Extensions/Metadata/ParameterMetadata.cpp

@@ -1,38 +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 "ParameterMetadata.h"
-
-#include "GDCore/CommonTools.h"
-#include "GDCore/Serialization/SerializerElement.h"
-
-namespace gd {
-
-ParameterMetadata::ParameterMetadata() : optional(false), codeOnly(false) {}
-
-void ParameterMetadata::SerializeTo(SerializerElement& element) const {
-  element.SetAttribute("type", type);
-  element.SetAttribute("supplementaryInformation", supplementaryInformation);
-  element.SetAttribute("optional", optional);
-  element.SetAttribute("description", description);
-  element.SetAttribute("longDescription", longDescription);
-  element.SetAttribute("codeOnly", codeOnly);
-  element.SetAttribute("defaultValue", defaultValue);
-  element.SetAttribute("name", name);
-}
-
-void ParameterMetadata::UnserializeFrom(const SerializerElement& element) {
-  type = element.GetStringAttribute("type");
-  supplementaryInformation =
-      element.GetStringAttribute("supplementaryInformation");
-  optional = element.GetBoolAttribute("optional");
-  description = element.GetStringAttribute("description");
-  longDescription = element.GetStringAttribute("longDescription");
-  codeOnly = element.GetBoolAttribute("codeOnly");
-  defaultValue = element.GetStringAttribute("defaultValue");
-  name = element.GetStringAttribute("name");
-}
-
-}  // namespace gd