Fix "debug draw" not taking into account camera zoom and rotation (#2636)

Don't show in changelog

.devcontainer/Dockerfile

@@ -0,0 +1,6 @@
+# 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

@@ -0,0 +1,16 @@
+# 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

@@ -0,0 +1,51 @@
+// 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

@@ -1,24 +0,0 @@
-{
-    "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

@@ -0,0 +1,13 @@
+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/ISSUE_TEMPLATE/--bug-report.md

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

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

@@ -1,28 +1,35 @@
 ---
 name: "\U0001F4A1Feature request"
-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.
+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: ''
 
 ---
 
 BEFORE opening a new feature request, please make sure that 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
+
+-   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
 
 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 implementing the solution.
+Explain if you can help to implement the solution.
 
 ## Alternatives considered
+
 A clear and concise description of any alternative solutions or features you've considered.

.github/workflows/issues.yml

@@ -18,3 +18,10 @@ jobs:
         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,5 +1,6 @@
 /Core/GDCore/Tools/VersionPriv.h
 /docs
+/docs-wiki
 /ExtLibs/SFML
 /ExtLibs/*.7z
 /scripts/logs/*.txt
@@ -8,49 +9,17 @@
 /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
-*.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
+/Binaries/Output
 *.autosave
 !/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

.travis.yml

@@ -77,7 +77,7 @@ install:
   - cd newIDE/app && npm install
   - cd ../..
 #Install GDJS tests dependencies
-  - cd GDJS/tests && npm install
+  - cd GDJS && npm install && cd tests && npm install
   - cd ../..
 
 script:
@@ -98,6 +98,10 @@ 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/c_cpp_properties.json

@@ -45,7 +45,6 @@
             "name": "Linux",
             "includePath": [
                 "${workspaceRoot}",
-                "${workspaceRoot}/IDE",
                 "${workspaceRoot}/GDCpp",
                 "${workspaceRoot}/GDJS",
                 "${workspaceRoot}/Extensions",

.vscode/extensions.json

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

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    // 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}"
+        }
+    ]
+}

.vscode/settings.json

@@ -89,18 +89,30 @@
         "__errc": "cpp",
         "__node_handle": "cpp",
         "bit": "cpp",
-        "optional": "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"
     },
     "files.exclude": {
         "Binaries/*build*": true,
         "Binaries/Output": true,
-        "Binaries/Packaging/GDevelop.app": true,
         "ExtLibs/SFML": 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,

Binaries/.directory

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

Binaries/README.md

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

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -288,7 +288,7 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
     condition.SetParameters(parameters);
   }
 
-  // Verify that there are not mismatch between object type in parameters
+  // Verify that there are no mismatchs 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,9 +312,69 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
     }
   }
 
-  // Generate static condition if available
-  if (MetadataProvider::HasCondition(platform, condition.GetType())) {
-    // Prepare arguments
+  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 {
     std::vector<std::pair<gd::String, gd::String> >
         supplementaryParametersTypes;
     supplementaryParametersTypes.push_back(std::make_pair(
@@ -329,78 +389,6 @@ 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;
 }
 
@@ -417,9 +405,6 @@ 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",
@@ -472,7 +457,7 @@ gd::String EventsCodeGenerator::GenerateActionCode(
     action.SetParameters(parameters);
   }
 
-  // Verify that there are not mismatch between object type in parameters
+  // Verify that there are no mismatchs 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();
@@ -495,77 +480,69 @@ gd::String EventsCodeGenerator::GenerateActionCode(
   }
 
   // Call free function first if available
-  if (MetadataProvider::HasAction(platform, action.GetType())) {
+  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 {
     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;
 }
 
@@ -576,9 +553,6 @@ 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 += "{";
@@ -1127,10 +1101,11 @@ size_t EventsCodeGenerator::GenerateSingleUsageUniqueIdFor(
   // 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 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++;
   }

Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.cpp

@@ -4,8 +4,10 @@
  * 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"
@@ -35,11 +37,18 @@ gd::String ExpressionCodeGenerator::GenerateExpressionCode(
   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 << ")"
@@ -130,8 +139,8 @@ void ExpressionCodeGenerator::OnVisitIdentifierNode(IdentifierNode& node) {
 void ExpressionCodeGenerator::OnVisitFunctionCallNode(FunctionCallNode& node) {
   if (gd::MetadataProvider::IsBadExpressionMetadata(node.expressionMetadata)) {
     output += "/* Error during generation, function not found: " +
-              codeGenerator.ConvertToString(node.functionName) + " for type " +
-              node.type + " */ " + GenerateDefaultValue(node.type);
+              codeGenerator.ConvertToString(node.functionName) + " */ " +
+              GenerateDefaultValue(node.type);
     return;
   }
 
@@ -359,7 +368,8 @@ void ExpressionCodeGenerator::OnVisitEmptyNode(EmptyNode& node) {
   output += GenerateDefaultValue(node.type);
 }
 
-void ExpressionCodeGenerator::OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) {
+void ExpressionCodeGenerator::OnVisitObjectFunctionNameNode(
+    ObjectFunctionNameNode& node) {
   output += GenerateDefaultValue(node.type);
 }
 

Core/GDCore/Events/Parsers/ExpressionParser2.cpp

@@ -4,9 +4,11 @@
  * 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"
@@ -67,7 +69,9 @@ size_t GetMaximumParametersNumber(
 }  // namespace
 
 std::unique_ptr<ExpressionParserDiagnostic> ExpressionParser2::ValidateFunction(
-    const gd::FunctionCallNode& function, size_t functionStartPosition) {
+    const gd::String& type,
+    const gd::FunctionCallNode& function,
+    size_t functionStartPosition) {
   if (gd::MetadataProvider::IsBadExpressionMetadata(
           function.expressionMetadata)) {
     return gd::make_unique<ExpressionParserError>(
@@ -79,6 +83,41 @@ 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));
@@ -115,7 +154,8 @@ std::unique_ptr<TextNode> ExpressionParser2::ReadText() {
     auto text = gd::make_unique<TextNode>("");
     text->diagnostic =
         RaiseSyntaxError(_("A text must start with a double quote (\")."));
-    text->location = ExpressionParserLocation(textStartPosition, GetCurrentPosition());
+    text->location =
+        ExpressionParserLocation(textStartPosition, GetCurrentPosition());
     return text;
   }
   SkipChar();
@@ -150,7 +190,8 @@ std::unique_ptr<TextNode> ExpressionParser2::ReadText() {
   }
 
   auto text = gd::make_unique<TextNode>(parsedText);
-  text->location = ExpressionParserLocation(textStartPosition, GetCurrentPosition());
+  text->location =
+      ExpressionParserLocation(textStartPosition, GetCurrentPosition());
   if (!textParsingHasEnded) {
     text->diagnostic =
         RaiseSyntaxError(_("A text must end with a double quote (\"). Add a "
@@ -172,7 +213,7 @@ std::unique_ptr<NumberNode> ExpressionParser2::ReadNumber() {
     if (CheckIfChar(IsZeroDigit)) {
       numberHasStarted = true;
       digitFound = true;
-      if (!parsedNumber.empty()) { // Ignore leading 0s.
+      if (!parsedNumber.empty()) {  // Ignore leading 0s.
         parsedNumber += GetCurrentChar();
       }
     } else if (CheckIfChar(IsNonZeroDigit)) {
@@ -183,7 +224,8 @@ std::unique_ptr<NumberNode> ExpressionParser2::ReadNumber() {
       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 += ".";
       }
@@ -204,7 +246,8 @@ 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());
+  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/ExpressionParser2.h

@@ -76,9 +76,11 @@ class GD_CORE_API ExpressionParser2 {
     size_t expressionStartPosition = GetCurrentPosition();
     auto expression = Expression(type, objectName);
 
+    const gd::String &inferredType = expression->type;
+
     // Check for extra characters at the end of the expression
     if (!IsEndReached()) {
-      auto op = gd::make_unique<OperatorNode>(type, ' ');
+      auto op = gd::make_unique<OperatorNode>(inferredType, ' ');
       op->leftHandSide = std::move(expression);
       op->rightHandSide = ReadUntilEnd("unknown");
 
@@ -101,27 +103,29 @@ class GD_CORE_API ExpressionParser2 {
     size_t expressionStartPosition = GetCurrentPosition();
     std::unique_ptr<ExpressionNode> leftHandSide = Term(type, objectName);
 
+    const gd::String &inferredType = leftHandSide->type;
+
     SkipAllWhitespaces();
 
     if (IsEndReached()) return leftHandSide;
     if (CheckIfChar(IsExpressionEndingChar)) return leftHandSide;
     if (CheckIfChar(IsExpressionOperator)) {
-      auto op = gd::make_unique<OperatorNode>(type, GetCurrentChar());
+      auto op = gd::make_unique<OperatorNode>(inferredType, GetCurrentChar());
       op->leftHandSide = std::move(leftHandSide);
-      op->diagnostic = ValidateOperator(type, GetCurrentChar());
+      op->diagnostic = ValidateOperator(inferredType, GetCurrentChar());
       SkipChar();
-      op->rightHandSide = Expression(type, objectName);
+      op->rightHandSide = Expression(inferredType, objectName);
 
       op->location = ExpressionParserLocation(expressionStartPosition,
                                               GetCurrentPosition());
       return std::move(op);
     }
 
-    if (type == "string") {
+    if (inferredType == "string") {
       leftHandSide->diagnostic = RaiseSyntaxError(
           "You must add the operator + between texts or expressions. For "
           "example: \"Your name: \" + VariableString(PlayerName).");
-    } else if (type == "number") {
+    } else if (inferredType == "number") {
       leftHandSide->diagnostic = RaiseSyntaxError(
           "No operator found. Did you forget to enter an operator (like +, -, "
           "* or /) between numbers or expressions?");
@@ -131,9 +135,9 @@ class GD_CORE_API ExpressionParser2 {
           "properly written.");
     }
 
-    auto op = gd::make_unique<OperatorNode>(type, ' ');
+    auto op = gd::make_unique<OperatorNode>(inferredType, ' ');
     op->leftHandSide = std::move(leftHandSide);
-    op->rightHandSide = Expression(type, objectName);
+    op->rightHandSide = Expression(inferredType, objectName);
     op->location =
         ExpressionParserLocation(expressionStartPosition, GetCurrentPosition());
     return std::move(op);
@@ -146,17 +150,19 @@ class GD_CORE_API ExpressionParser2 {
     size_t expressionStartPosition = GetCurrentPosition();
     std::unique_ptr<ExpressionNode> factor = Factor(type, objectName);
 
+    const gd::String &inferredType = factor->type;
+
     SkipAllWhitespaces();
 
     // This while loop is used instead of a recursion (like in Expression)
     // to guarantee the proper operator precedence. (Expression could also
     // be reworked to use a while loop).
     while (CheckIfChar(IsTermOperator)) {
-      auto op = gd::make_unique<OperatorNode>(type, GetCurrentChar());
+      auto op = gd::make_unique<OperatorNode>(inferredType, GetCurrentChar());
       op->leftHandSide = std::move(factor);
-      op->diagnostic = ValidateOperator(type, GetCurrentChar());
+      op->diagnostic = ValidateOperator(inferredType, GetCurrentChar());
       SkipChar();
-      op->rightHandSide = Factor(type, objectName);
+      op->rightHandSide = Factor(inferredType, objectName);
       op->location = ExpressionParserLocation(expressionStartPosition,
                                               GetCurrentPosition());
       SkipAllWhitespaces();
@@ -170,43 +176,51 @@ class GD_CORE_API ExpressionParser2 {
   std::unique_ptr<ExpressionNode> Factor(const gd::String &type,
                                          const gd::String &objectName) {
     SkipAllWhitespaces();
-
     size_t expressionStartPosition = GetCurrentPosition();
-    std::unique_ptr<ExpressionNode> factor;
 
     if (CheckIfChar(IsQuote)) {
-      factor = ReadText();
+      std::unique_ptr<ExpressionNode> factor = ReadText();
       if (type == "number")
         factor->diagnostic =
             RaiseTypeError(_("You entered a text, but a number was expected."),
                            expressionStartPosition);
-      else if (type != "string")
+      else if (type != "string" && type != "number|string")
         factor->diagnostic = RaiseTypeError(
             _("You entered a text, but this type was expected:") + type,
             expressionStartPosition);
-    } else if (CheckIfChar(IsUnaryOperator)) {
-      auto unaryOperator =
-          gd::make_unique<UnaryOperatorNode>(type, GetCurrentChar());
-      unaryOperator->diagnostic = ValidateUnaryOperator(type, GetCurrentChar());
-      SkipChar();
-      unaryOperator->factor = Factor(type, objectName);
 
+      return factor;
+    } else if (CheckIfChar(IsUnaryOperator)) {
+      auto unaryOperatorCharacter = GetCurrentChar();
+      SkipChar();
+
+      auto operatorOperand = Factor(type, objectName);
+      const gd::String &inferredType = operatorOperand->type;
+
+      auto unaryOperator = gd::make_unique<UnaryOperatorNode>(
+          inferredType, unaryOperatorCharacter);
+      unaryOperator->diagnostic = ValidateUnaryOperator(
+          inferredType, unaryOperatorCharacter, expressionStartPosition);
+      unaryOperator->factor = std::move(operatorOperand);
       unaryOperator->location = ExpressionParserLocation(
           expressionStartPosition, GetCurrentPosition());
-      factor = std::move(unaryOperator);
+
+      return std::move(unaryOperator);
     } else if (CheckIfChar(IsNumberFirstChar)) {
-      factor = ReadNumber();
+      std::unique_ptr<ExpressionNode> factor = ReadNumber();
       if (type == "string")
         factor->diagnostic = RaiseTypeError(
             _("You entered a number, but a text was expected (in quotes)."),
             expressionStartPosition);
-      else if (type != "number")
+      else if (type != "number" && type != "number|string")
         factor->diagnostic = RaiseTypeError(
             _("You entered a number, but this type was expected:") + type,
             expressionStartPosition);
+
+      return factor;
     } else if (CheckIfChar(IsOpeningParenthesis)) {
       SkipChar();
-      factor = SubExpression(type, objectName);
+      std::unique_ptr<ExpressionNode> factor = SubExpression(type, objectName);
 
       if (!CheckIfChar(IsClosingParenthesis)) {
         factor->diagnostic =
@@ -214,27 +228,31 @@ class GD_CORE_API ExpressionParser2 {
                                "parenthesis for each opening parenthesis."));
       }
       SkipIfChar(IsClosingParenthesis);
+      return factor;
     } else if (IsIdentifierAllowedChar()) {
       // This is a place where the grammar differs according to the
       // type being expected.
       if (gd::ParameterMetadata::IsExpression("variable", type)) {
-        factor = Variable(type, objectName);
+        return Variable(type, objectName);
       } else {
-        factor = Identifier(type);
+        return Identifier(type);
       }
-    } else {
-      factor = ReadUntilWhitespace(type);
-      factor->diagnostic = RaiseEmptyError(type, expressionStartPosition);
     }
 
+    std::unique_ptr<ExpressionNode> factor = ReadUntilWhitespace(type);
+    factor->diagnostic = RaiseEmptyError(type, expressionStartPosition);
     return factor;
   }
 
   std::unique_ptr<SubExpressionNode> SubExpression(
       const gd::String &type, const gd::String &objectName) {
     size_t expressionStartPosition = GetCurrentPosition();
+
+    auto expression = Expression(type, objectName);
+    const gd::String &inferredType = expression->type;
+
     auto subExpression =
-        gd::make_unique<SubExpressionNode>(type, Expression(type, objectName));
+        gd::make_unique<SubExpressionNode>(inferredType, std::move(expression));
     subExpression->location =
         ExpressionParserLocation(expressionStartPosition, GetCurrentPosition());
 
@@ -285,6 +303,11 @@ class GD_CORE_API ExpressionParser2 {
       } else if (type == "number") {
         identifier->diagnostic = RaiseTypeError(
             _("You must enter a number."), nameLocation.GetStartPosition());
+      } else if (type == "number|string") {
+        identifier->diagnostic = RaiseTypeError(
+            _("You must enter a number or a text, wrapped inside double quotes "
+              "(example: \"Hello world\")."),
+            nameLocation.GetStartPosition());
       } else if (!gd::ParameterMetadata::IsObject(type)) {
         identifier->diagnostic = RaiseTypeError(
             _("You've entered a name, but this type was expected:") + type,
@@ -319,8 +342,8 @@ class GD_CORE_API ExpressionParser2 {
     SkipAllWhitespaces();
     if (CheckIfChar(IsOpeningSquareBracket)) {
       SkipChar();
-      auto child =
-          gd::make_unique<VariableBracketAccessorNode>(Expression("string"));
+      auto child = gd::make_unique<VariableBracketAccessorNode>(
+          Expression("number|string"));
 
       if (!CheckIfChar(IsClosingSquareBracket)) {
         child->diagnostic =
@@ -361,21 +384,19 @@ class GD_CORE_API ExpressionParser2 {
     // TODO: error if trying to use function for type != "number" && != "string"
     // + Test for it
 
-    // This could be improved to have the type passed to a single
-    // GetExpressionMetadata function.
     const gd::ExpressionMetadata &metadata =
-        type == "number" ? MetadataProvider::GetExpressionMetadata(
-                               platform, functionFullName)
-                         : MetadataProvider::GetStrExpressionMetadata(
-                               platform, functionFullName);
+        MetadataProvider::GetAnyExpressionMetadata(platform, functionFullName);
 
     auto parametersNode = Parameters(metadata.parameters);
-    auto function = gd::make_unique<FunctionCallNode>(
-        type, std::move(parametersNode.parameters), metadata, functionFullName);
+    auto function =
+        gd::make_unique<FunctionCallNode>(metadata.GetReturnType(),
+                                          std::move(parametersNode.parameters),
+                                          metadata,
+                                          functionFullName);
     function->diagnostic = std::move(parametersNode.diagnostic);
-    if (!function->diagnostic)
-      function->diagnostic =
-          ValidateFunction(*function, identifierLocation.GetStartPosition());
+    if (!function->diagnostic)  // TODO: reverse the order of diagnostic?
+      function->diagnostic = ValidateFunction(
+          type, *function, identifierLocation.GetStartPosition());
 
     function->location = ExpressionParserLocation(
         identifierLocation.GetStartPosition(), GetCurrentPosition());
@@ -383,6 +404,7 @@ class GD_CORE_API ExpressionParser2 {
     function->openingParenthesisLocation = openingParenthesisLocation;
     function->closingParenthesisLocation =
         parametersNode.closingParenthesisLocation;
+
     return std::move(function);
   }
 
@@ -416,26 +438,21 @@ class GD_CORE_API ExpressionParser2 {
       gd::String objectType =
           GetTypeOfObject(globalObjectsContainer, objectsContainer, objectName);
 
-      // This could be improved to have the type passed to a single
-      // GetExpressionMetadata function.
       const gd::ExpressionMetadata &metadata =
-          type == "number"
-              ? MetadataProvider::GetObjectExpressionMetadata(
-                    platform, objectType, objectFunctionOrBehaviorName)
-              : MetadataProvider::GetObjectStrExpressionMetadata(
-                    platform, objectType, objectFunctionOrBehaviorName);
+          MetadataProvider::GetObjectAnyExpressionMetadata(
+              platform, objectType, objectFunctionOrBehaviorName);
 
       auto parametersNode = Parameters(metadata.parameters, objectName);
       auto function = gd::make_unique<FunctionCallNode>(
-          type,
+          metadata.GetReturnType(),
           objectName,
           std::move(parametersNode.parameters),
           metadata,
           objectFunctionOrBehaviorName);
       function->diagnostic = std::move(parametersNode.diagnostic);
-      if (!function->diagnostic)
-        function->diagnostic =
-            ValidateFunction(*function, objectNameLocation.GetStartPosition());
+      if (!function->diagnostic)  // TODO: reverse the order of diagnostic?
+        function->diagnostic = ValidateFunction(
+            type, *function, objectNameLocation.GetStartPosition());
 
       function->location = ExpressionParserLocation(
           objectNameLocation.GetStartPosition(), GetCurrentPosition());
@@ -483,27 +500,23 @@ class GD_CORE_API ExpressionParser2 {
       gd::String behaviorType = GetTypeOfBehavior(
           globalObjectsContainer, objectsContainer, behaviorName);
 
-      // This could be improved to have the type passed to a single
-      // GetExpressionMetadata function.
       const gd::ExpressionMetadata &metadata =
-          type == "number" ? MetadataProvider::GetBehaviorExpressionMetadata(
-                                 platform, behaviorType, functionName)
-                           : MetadataProvider::GetBehaviorStrExpressionMetadata(
-                                 platform, behaviorType, functionName);
+          MetadataProvider::GetBehaviorAnyExpressionMetadata(
+              platform, behaviorType, functionName);
 
       auto parametersNode =
           Parameters(metadata.parameters, objectName, behaviorName);
       auto function = gd::make_unique<FunctionCallNode>(
-          type,
+          metadata.GetReturnType(),
           objectName,
           behaviorName,
           std::move(parametersNode.parameters),
           metadata,
           functionName);
       function->diagnostic = std::move(parametersNode.diagnostic);
-      if (!function->diagnostic)
-        function->diagnostic =
-            ValidateFunction(*function, objectNameLocation.GetStartPosition());
+      if (!function->diagnostic)  // TODO: reverse the order of diagnostic?
+        function->diagnostic = ValidateFunction(
+            type, *function, objectNameLocation.GetStartPosition());
 
       function->location = ExpressionParserLocation(
           objectNameLocation.GetStartPosition(), GetCurrentPosition());
@@ -641,7 +654,9 @@ class GD_CORE_API ExpressionParser2 {
    */
   ///@{
   std::unique_ptr<ExpressionParserDiagnostic> ValidateFunction(
-      const gd::FunctionCallNode &function, size_t functionStartPosition);
+      const gd::String &type,
+      const gd::FunctionCallNode &function,
+      size_t functionStartPosition);
 
   std::unique_ptr<ExpressionParserDiagnostic> ValidateOperator(
       const gd::String &type, gd::String::value_type operatorChar) {
@@ -684,7 +699,9 @@ class GD_CORE_API ExpressionParser2 {
   }
 
   std::unique_ptr<ExpressionParserDiagnostic> ValidateUnaryOperator(
-      const gd::String &type, gd::String::value_type operatorChar) {
+      const gd::String &type,
+      gd::String::value_type operatorChar,
+      size_t position) {
     if (type == "number") {
       if (operatorChar == '+' || operatorChar == '-') {
         return gd::make_unique<ExpressionParserDiagnostic>();
@@ -695,26 +712,26 @@ class GD_CORE_API ExpressionParser2 {
           _("You've used an \"unary\" operator that is not supported. Operator "
             "should be "
             "either + or -."),
-          GetCurrentPosition());
+          position);
     } else if (type == "string") {
       return gd::make_unique<ExpressionParserError>(
           "invalid_operator",
           _("You've used an operator that is not supported. Only + can be used "
             "to concatenate texts, and must be placed between two texts (or "
             "expressions)."),
-          GetCurrentPosition());
+          position);
     } else if (gd::ParameterMetadata::IsObject(type)) {
       return gd::make_unique<ExpressionParserError>(
           "invalid_operator",
           _("Operators (+, -) can't be used with an object name. Remove the "
             "operator."),
-          GetCurrentPosition());
+          position);
     } else if (gd::ParameterMetadata::IsExpression("variable", type)) {
       return gd::make_unique<ExpressionParserError>(
           "invalid_operator",
           _("Operators (+, -) can't be used in variable names. Remove "
             "the operator from the variable name."),
-          GetCurrentPosition());
+          position);
     }
 
     return gd::make_unique<ExpressionParserDiagnostic>();

Core/GDCore/Events/Parsers/ExpressionParser2Node.h

@@ -8,6 +8,7 @@
 
 #include <memory>
 #include <vector>
+
 #include "ExpressionParser2NodeWorker.h"
 #include "GDCore/String.h"
 namespace gd {
@@ -84,30 +85,33 @@ 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...
+                                      /// 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_)
-      : type(type_), expression(std::move(expression_)){};
+      : ExpressionNode(type_), expression(std::move(expression_)){};
   virtual ~SubExpressionNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitSubExpressionNode(*this);
   };
 
-  gd::String type;  // "string", "number", type supported by
-                    // gd::ParameterMetadata::IsObject, types supported by
-                    // gd::ParameterMetadata::IsExpression or "unknown".
   std::unique_ptr<ExpressionNode> expression;
 };
 
@@ -116,7 +120,7 @@ struct SubExpressionNode : public ExpressionNode {
  */
 struct OperatorNode : public ExpressionNode {
   OperatorNode(const gd::String &type_, gd::String::value_type op_)
-      : type(type_), op(op_){};
+      : ExpressionNode(type_), op(op_){};
   virtual ~OperatorNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitOperatorNode(*this);
@@ -124,9 +128,6 @@ struct OperatorNode : public ExpressionNode {
 
   std::unique_ptr<ExpressionNode> leftHandSide;
   std::unique_ptr<ExpressionNode> rightHandSide;
-  gd::String type;  // "string", "number", type supported by
-                    // gd::ParameterMetadata::IsObject, types supported by
-                    // gd::ParameterMetadata::IsExpression or "unknown".
   gd::String::value_type op;
 };
 
@@ -135,37 +136,38 @@ struct OperatorNode : public ExpressionNode {
  */
 struct UnaryOperatorNode : public ExpressionNode {
   UnaryOperatorNode(const gd::String &type_, gd::String::value_type op_)
-      : type(type_), op(op_){};
+      : ExpressionNode(type_), op(op_){};
   virtual ~UnaryOperatorNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitUnaryOperatorNode(*this);
   };
 
   std::unique_ptr<ExpressionNode> factor;
-  gd::String type;  // "string", "number", type supported by
-                    // gd::ParameterMetadata::IsObject, types supported by
-                    // gd::ParameterMetadata::IsExpression or "unknown".
   gd::String::value_type op;
 };
 
 /**
  * \brief A number node. For example: "123".
+ * Its `type` is always "number".
  */
 struct NumberNode : public ExpressionNode {
-  NumberNode(const gd::String &number_) : number(number_){};
+  NumberNode(const gd::String &number_)
+      : ExpressionNode("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_) : text(text_){};
+  TextNode(const gd::String &text_) : ExpressionNode("string"), text(text_){};
   virtual ~TextNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitTextNode(*this);
@@ -175,6 +177,8 @@ struct TextNode : public ExpressionNode {
 };
 
 struct VariableAccessorOrVariableBracketAccessorNode : public ExpressionNode {
+  VariableAccessorOrVariableBracketAccessorNode() : ExpressionNode(""){};
+
   std::unique_ptr<VariableAccessorOrVariableBracketAccessorNode> child;
 };
 
@@ -190,13 +194,12 @@ struct VariableNode : public ExpressionNode {
   VariableNode(const gd::String &type_,
                const gd::String &name_,
                const gd::String &objectName_)
-      : type(type_), name(name_), objectName(objectName_){};
+      : ExpressionNode(type_), name(name_), objectName(objectName_){};
   virtual ~VariableNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitVariableNode(*this);
   };
 
-  gd::String type;
   gd::String name;
   gd::String objectName;
 
@@ -240,7 +243,11 @@ struct VariableBracketAccessorNode
 };
 
 struct IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode
-    : public ExpressionNode {};
+    : public ExpressionNode {
+  IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode(
+      const gd::String &type)
+      : ExpressionNode(type){};
+};
 
 /**
  * \brief An identifier node, usually representing an object or a function name.
@@ -248,18 +255,20 @@ struct IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode
 struct IdentifierNode
     : public IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode {
   IdentifierNode(const gd::String &identifierName_, const gd::String &type_)
-      : identifierName(identifierName_), type(type_){};
+      : IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode(type_),
+        identifierName(identifierName_){};
   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(){};
   void Visit(ExpressionParser2NodeWorker &worker) override{};
 };
@@ -274,14 +283,14 @@ struct ObjectFunctionNameNode
   ObjectFunctionNameNode(const gd::String &type_,
                          const gd::String &objectName_,
                          const gd::String &objectFunctionOrBehaviorName_)
-      : type(type_),
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_),
         objectName(objectName_),
         objectFunctionOrBehaviorName(objectFunctionOrBehaviorName_) {}
   ObjectFunctionNameNode(const gd::String &type_,
                          const gd::String &objectName_,
                          const gd::String &behaviorName_,
                          const gd::String &behaviorFunctionName_)
-      : type(type_),
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_),
         objectName(objectName_),
         objectFunctionOrBehaviorName(behaviorName_),
         behaviorFunctionName(behaviorFunctionName_) {}
@@ -290,34 +299,30 @@ struct ObjectFunctionNameNode
     worker.OnVisitObjectFunctionNameNode(*this);
   };
 
-  gd::String type;  // This could be removed if the type ("string", "number",
-                    // type supported by gd::ParameterMetadata::IsObject, types
-                    // supported by gd::ParameterMetadata::IsExpression or
-                    // "unknown") was stored in ExpressionMetadata.
   gd::String objectName;
   gd::String objectFunctionOrBehaviorName;  ///< Behavior name if
                                             ///`behaviorFunctionName` is not
-                                            ///empty.
+                                            /// empty.
   gd::String behaviorFunctionName;          ///< If empty, then
-                                    ///objectFunctionOrBehaviorName is filled
-                                    ///with the behavior name.
+                                    /// 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.
+                                                                  /// of object
+                                                                  /// function
+                                                                  /// name or
+                                                                  /// behavior
+                                                                  /// name.
   ExpressionParserLocation
       behaviorNameNamespaceSeparatorLocation;  ///< Location of the "::"
-                                               ///separator, if any.
+                                               /// separator, if any.
   ExpressionParserLocation behaviorFunctionNameLocation;  ///< Location of the
-                                                          ///behavior function
-                                                          ///name, if any.
+                                                          /// behavior function
+                                                          /// name, if any.
 };
 
 /**
@@ -327,31 +332,36 @@ struct ObjectFunctionNameNode
  * "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_)
-      : type(type_),
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(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_)
-      : type(type_),
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(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_)
-      : type(type_),
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_),
         objectName(objectName_),
         behaviorName(behaviorName_),
         parameters(std::move(parameters_)),
@@ -362,10 +372,6 @@ struct FunctionCallNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
     worker.OnVisitFunctionCallNode(*this);
   };
 
-  gd::String type;  // This could be removed if the type ("string", "number",
-                    // type supported by gd::ParameterMetadata::IsObject, types
-                    // supported by gd::ParameterMetadata::IsExpression or
-                    // "unknown") was stored in ExpressionMetadata.
   gd::String objectName;
   gd::String behaviorName;
   std::vector<std::unique_ptr<ExpressionNode>> parameters;
@@ -382,7 +388,7 @@ struct FunctionCallNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
       behaviorNameLocation;  ///< Location of the behavior name, if any.
   ExpressionParserLocation
       behaviorNameNamespaceSeparatorLocation;  ///< Location of the "::"
-                                               ///separator, if any.
+                                               /// separator, if any.
   ExpressionParserLocation
       openingParenthesisLocation;  ///< Location of the "(".
   ExpressionParserLocation
@@ -395,15 +401,12 @@ struct FunctionCallNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
  */
 struct EmptyNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
   EmptyNode(const gd::String &type_, const gd::String &text_ = "")
-      : type(type_), text(text_){};
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_), text(text_){};
   virtual ~EmptyNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitEmptyNode(*this);
   };
 
-  gd::String type;  // "string", "number", type supported by
-                    // gd::ParameterMetadata::IsObject, types supported by
-                    // gd::ParameterMetadata::IsExpression or "unknown".
   gd::String text;
 };
 

Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp

@@ -14,7 +14,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
   extension.SetExtensionInformation(
       "BuiltinAdvanced",
       _("Advanced control features"),
-      _("Built-in extension providing advanced control features."),
+      _("Advanced control features to be used in events."),
       "Florian Rival",
       "Open source (MIT License)");
 

Core/GDCore/Extensions/Builtin/AudioExtension.cpp

@@ -12,11 +12,13 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation("BuiltinAudio",
-                               _("Audio"),
-                               _("Builtin audio extension"),
-                               "Florian Rival",
-                               "Open source (MIT License)")
+      .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)")
       .SetExtensionHelpPath("/all-features/audio");
 
 #if defined(GD_IDE_ONLY)
@@ -275,6 +277,74 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
       .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"),

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -6,6 +6,7 @@
 #include "AllBuiltinExtensions.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Tools/Localization.h"
+#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
 
 using namespace std;
 namespace gd {
@@ -26,7 +27,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
 #if defined(GD_IDE_ONLY)
   obj.AddCondition("PosX",
-                   _("Compare X position of an object"),
+                   _("X position"),
                    _("Compare the X position of the object."),
                    _("the X position"),
                    _("Position"),
@@ -38,7 +39,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsSimple();
 
   obj.AddAction("MettreX",
-                _("X position of an object"),
+                _("X position"),
                 _("Change the X position of an object."),
                 _("the X position"),
                 _("Position"),
@@ -50,7 +51,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsSimple();
 
   obj.AddCondition("PosY",
-                   _("Compare Y position of an object"),
+                   _("Y position"),
                    _("Compare the Y position of an object."),
                    _("the Y position"),
                    _("Position"),
@@ -62,7 +63,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsSimple();
 
   obj.AddAction("MettreY",
-                _("Y position of an object"),
+                _("Y position"),
                 _("Change the Y position of an object."),
                 _("the Y position"),
                 _("Position"),
@@ -74,7 +75,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsSimple();
 
   obj.AddAction("MettreXY",
-                _("Position of an object"),
+                _("Position"),
                 _("Change the position of an object."),
                 _("Change the position of _PARAM0_: _PARAM1_ _PARAM2_ (x "
                   "axis), _PARAM3_ _PARAM4_ (y axis)"),
@@ -89,8 +90,41 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("expression", _("Y position"))
       .MarkAsSimple();
 
+  obj.AddAction("SetCenter",
+                _("Center position"),
+                _("Change the position of an object, using its center."),
+                _("Change the position of the center of _PARAM0_: _PARAM1_ _PARAM2_ (x "
+                  "axis), _PARAM3_ _PARAM4_ (y axis)"),
+                _("Position/Center"),
+                "res/actions/position24.png",
+                "res/actions/position.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("X position"))
+      .AddParameter("operator", _("Modification's sign"))
+      .AddParameter("expression", _("Y position"))
+      .MarkAsSimple();
+
+  obj.AddExpressionAndConditionAndAction("number", "CenterX",
+          _("Center X position"),
+          _("the X position of the center"),
+          _("the X position of the center"),
+          _("Position/Center"),
+          "res/actions/position24.png")
+      .AddParameter("object", _("Object"))
+      .UseStandardParameters("number");
+
+  obj.AddExpressionAndConditionAndAction("number", "CenterY",
+          _("Center Y position"),
+          _("the Y position of the center"),
+          _("the Y position of the center"),
+          _("Position/Center"),
+          "res/actions/position24.png")
+      .AddParameter("object", _("Object"))
+      .UseStandardParameters("number");
+
   obj.AddAction("MettreAutourPos",
-                _("Put an object around a position"),
+                _("Put around a position"),
                 _("Position the center of the given object around a position, "
                   "using the specified angle "
                   "and distance."),
@@ -202,7 +236,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          "AddForceVersPos",
          _("Add a force to move toward a position"),
          _("Add a force to an object to make it move toward a position."),
-         _("Move _PARAM0_ to _PARAM1_;_PARAM2_ with _PARAM4_ force of _PARAM3_ "
+         _("Move _PARAM0_ toward _PARAM1_;_PARAM2_ with _PARAM4_ force of _PARAM3_ "
            "pixels"),
          _("Movement"),
          "res/actions/force24.png",
@@ -248,7 +282,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   obj.AddAction("Delete",
-                _("Delete an object"),
+                _("Delete the object"),
                 _("Delete the specified object."),
                 _("Delete _PARAM0_"),
                 _("Objects"),
@@ -284,8 +318,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   obj.AddAction("ModVarObjet",
-                _("Modify a variable of an object"),
-                _("Modify the value of a variable of an object"),
+                _("Value of an object variable"),
+                _("Change the value of an object variable."),
                 _("the variable _PARAM1_"),
                 _("Variables"),
                 "res/actions/var24.png",
@@ -296,8 +330,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .UseStandardOperatorParameters("number");
 
   obj.AddAction("ModVarObjetTxt",
-                _("Modify the text of a variable of an object"),
-                _("Modify the text of a variable of an object"),
+                _("Text of an object variable"),
+                _("Change the text of an object variable."),
                 _("the text of variable _PARAM1_"),
                 _("Variables"),
                 "res/actions/var24.png",
@@ -307,11 +341,39 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectvar", _("Variable"))
       .UseStandardOperatorParameters("string");
 
+  obj.AddAction("SetObjectVariableAsBoolean",
+                _("Boolean value of an object variable"),
+                _("Change the boolean value of an object variable."),
+                _("Set the boolean value of the variable _PARAM1_ of object "
+                  "_PARAM0_ to _PARAM2_"),
+                _("Variables"),
+                "res/actions/var24.png",
+                "res/actions/var.png")
+
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Variable"))
+      .AddParameter("trueorfalse", _("New Value:"));
+
+  obj.AddAction(
+         "ToggleObjectVariableAsBoolean",
+         _("Toggle the boolean value of an object variable"),
+         _("Toggles the boolean value of an object variable.") + "\n" +
+             _("If it was true, it will become false, and if it was false "
+               "it will become true."),
+         _("Toggle the boolean value of the variable _PARAM1_ of object "
+           "_PARAM0_"),
+         _("Variables"),
+         "res/actions/var24.png",
+         "res/actions/var.png")
+
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Variable"));
+
   obj.AddCondition("ObjectVariableChildExists",
                    _("Child existence"),
                    _("Check if the specified child of the variable exists."),
                    _("Child _PARAM2_ of variable _PARAM1_ of _PARAM0_ exists"),
-                   _("Variables/Structures"),
+                   _("Variables/Collections/Structures"),
                    "res/conditions/var24.png",
                    "res/conditions/var.png")
       .AddParameter("object", _("Object"))
@@ -321,9 +383,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddAction("ObjectVariableRemoveChild",
                 _("Remove a child"),
-                _("Remove a child from a variable of an object."),
+                _("Remove a child from an object variable."),
                 _("Remove child _PARAM2_ from variable _PARAM1_ of _PARAM0_"),
-                _("Variables/Structure"),
+                _("Variables/Collections/Structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
       .AddParameter("object", _("Object"))
@@ -335,7 +397,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Clear variable"),
                 _("Remove all the children from the object variable."),
                 _("Clear children from variable _PARAM1_ of _PARAM0_"),
-                _("Variables/Structure"),
+                _("Variables/Collections"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
       .AddParameter("object", _("Object"))
@@ -355,7 +417,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddAction("Montre",
                 _("Show"),
-                _("Show the specified object"),
+                _("Show the specified object."),
                 _("Show _PARAM0_"),
                 _("Visibility"),
                 "res/actions/visibilite24.png",
@@ -378,10 +440,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   obj.AddCondition("Plan",
-                   _("Compare Z order"),
+                   _("Z-order"),
                    _("Compare the Z-order of the specified object."),
-                   _("the z Order"),
-                   _("Z order"),
+                   _("the Z-order"),
+                   _("Z-order"),
                    "res/conditions/planicon24.png",
                    "res/conditions/planicon.png")
 
@@ -390,7 +452,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   obj.AddCondition("Layer",
-                   _("Compare layer"),
+                   _("Current layer"),
                    _("Check if the object is on the specified layer."),
                    _("_PARAM0_ is on layer _PARAM1_"),
                    _("Layer"),
@@ -402,7 +464,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   obj.AddCondition("Visible",
-                   _("Visibility of an object"),
+                   _("Visibility"),
                    _("Check if an object is visible."),
                    _("_PARAM0_ is visible (not marked as hidden)"),
                    _("Visibility"),
@@ -461,8 +523,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   obj.AddCondition("VarObjet",
-                   _("Value of an object's variable"),
-                   _("Compare the value of a variable of an object."),
+                   _("Value of an object variable"),
+                   _("Compare the value of an object variable."),
                    _("the variable _PARAM1_"),
                    _("Variables"),
                    "res/conditions/var24.png",
@@ -473,8 +535,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .UseStandardRelationalOperatorParameters("number");
 
   obj.AddCondition("VarObjetTxt",
-                   _("Text of an object's variable"),
-                   _("Compare the text of a variable of an object."),
+                   _("Text of an object variable"),
+                   _("Compare the text of an object variable."),
                    _("the text of variable _PARAM1_"),
                    _("Variables"),
                    "res/conditions/var24.png",
@@ -484,6 +546,19 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectvar", _("Variable"))
       .UseStandardRelationalOperatorParameters("string");
 
+  obj.AddCondition("ObjectVariableAsBoolean",
+                   _("Boolean value of an object variable"),
+                   _("Compare the boolean value of an object variable."),
+                   _("The boolean value of variable _PARAM1_ of object "
+                     "_PARAM0_ is _PARAM2_"),
+                   _("Variables"),
+                   "res/conditions/var24.png",
+                   "res/conditions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Variable"))
+      .AddParameter("trueorfalse", _("Check if the value is"))
+      .SetDefaultValue("true");
+
   obj.AddCondition("VarObjetDef",
                    _("Variable defined"),
                    _("Check if the variable is defined."),
@@ -496,6 +571,76 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("string", _("Variable"))
       .SetHidden();
 
+  obj.AddAction(
+         "ObjectVariablePush",
+         _("Append variable to an object array"),
+         _("Appends a variable to the end of an object array variable."),
+         _("Append variable _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+         _("Variables/Collections/Arrays"),
+         "res/actions/var24.png",
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("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();
+
+  obj.AddAction(
+         "ObjectVariablePushString",
+         _("Append a string to an object array"),
+         _("Appends a string to the end of an object array variable."),
+         _("Append string _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+         _("Variables/Collections/Arrays"),
+         "res/actions/var24.png",
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Array variable"))
+      .AddParameter("string", _("String to append"))
+      .MarkAsAdvanced();
+
+  obj.AddAction(
+         "ObjectVariablePushNumber",
+         _("Append a number to an object array"),
+         _("Appends a number to the end of an object array variable."),
+         _("Append number _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+         _("Variables/Collections/Arrays"),
+         "res/actions/var24.png",
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Array variable"))
+      .AddParameter("expression", _("Number to append"))
+      .MarkAsAdvanced();
+
+  obj.AddAction(
+         "ObjectVariablePushBool",
+         _("Append a boolean to an object array"),
+         _("Appends a boolean to the end of an object array variable."),
+         _("Append boolean _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+         _("Variables/Collections/Arrays"),
+         "res/actions/var24.png",
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Array variable"))
+      .AddParameter("trueorfalse", _("Boolean to append"))
+      .MarkAsAdvanced();
+
+  obj.AddAction(
+         "ObjectVariableRemoveAt",
+         _("Remove variable from an object array (by index)"),
+         _("Removes a variable at the specified index of an object array "
+           "variable."),
+         _("Remove variable at index _PARAM2_ from array variable _PARAM1_ of "
+           "object _PARAM0_"),
+         _("Variables/Collections/Arrays"),
+         "res/actions/var24.png",
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Variable"))
+      .AddParameter("expression", _("Index to remove"))
+      .MarkAsAdvanced();
+
   obj.AddCondition("BehaviorActivated",
                    _("Behavior activated"),
                    _("Check if the behavior is activated for the object."),
@@ -525,7 +670,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          "AddForceVers",
          _("Add a force to move toward an object"),
          _("Add a force to an object to make it move toward another."),
-         _("Move _PARAM0_ to _PARAM1_ with _PARAM3_ force of _PARAM2_ pixels"),
+         _("Move _PARAM0_ toward _PARAM1_ with _PARAM3_ force of _PARAM2_ pixels"),
          _("Movement"),
          "res/actions/forceVers24.png",
          "res/actions/forceVers.png")
@@ -557,7 +702,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   obj.AddAction("MettreAutour",
-                _("Put an object around another"),
+                _("Put the object around another"),
                 _("Position an object around another, with the specified angle "
                   "and distance. The center of the objects are used for "
                   "positioning them."),
@@ -600,7 +745,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectList", _("Object 2 (won't move)"));
 
   obj.AddAction("SeparateFromObjects",
-                _("Separate two objects"),
+                _("Separate objects"),
                 _("Move an object away from another using their collision "
                   "masks.\nBe sure to call this action on a reasonable number "
                   "of objects\nto avoid slowing down the game."),
@@ -803,15 +948,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .SetHidden();
 
   obj.AddExpression("ZOrder",
-                    _("Z order"),
-                    _("Z order of an object"),
+                    _("Z-order"),
+                    _("Z-order of an object"),
                     _("Visibility"),
                     "res/actions/planicon.png")
       .AddParameter("object", _("Object"));
 
   obj.AddExpression("Plan",
-                    _("Z order"),
-                    _("Z order of an object"),
+                    _("Z-order"),
+                    _("Z-order of an object"),
                     _("Visibility"),
                     "res/actions/planicon.png")
       .AddParameter("object", _("Object"))
@@ -852,24 +997,24 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("expression", _("Target Y position"));
 
   obj.AddExpression("Variable",
-                    _("Object's variable"),
-                    _("Object's variable"),
+                    _("Object variable"),
+                    _("Value of an object variable"),
                     _("Variables"),
                     "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"));
 
   obj.AddExpression("VariableChildCount",
-                    _("Object's variable number of children"),
-                    _("Get the number of children from an object"),
+                    _("Number of children of an object variable"),
+                    _("Number of children of an object variable"),
                     _("Variables"),
                     "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"));
 
   obj.AddStrExpression("VariableString",
-                       _("Object's variable"),
-                       _("Text of variable of an object"),
+                       _("Object variable"),
+                       _("Text of an object variable"),
                        _("Variables"),
                        "res/actions/var.png")
       .AddParameter("object", _("Object"))
@@ -887,17 +1032,41 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                     _("Angle between two objects"),
                     _("Compute the angle between two objects. If you need the "
                       "angle to an arbitrary position, use AngleToPosition."),
-                    _("Position"),
+                    _("Angle"),
                     "res/actions/position.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectPtr", _("Object"));
 
+   obj.AddExpression("XFromAngleAndDistance",
+                    _("X position from angle and distance"),
+                    _("Compute the X position when given an angle and distance "
+                      "relative to the starting object. This is also known as "
+                      "getting the cartesian coordinates of a 2D vector, using "
+                      "its polar coordinates."),
+                    _("Position"),
+                    "res/actions/position.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("expression", _("Angle, in degrees"))
+      .AddParameter("expression", _("Distance"));
+
+   obj.AddExpression("YFromAngleAndDistance",
+                    _("Y position from angle and distance"),
+                    _("Compute the Y position when given an angle and distance "
+                      "relative to the starting object. This is also known as "
+                      "getting the cartesian coordinates of a 2D vector, using "
+                      "its polar coordinates."),
+                    _("Position"),
+                    "res/actions/position.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("expression", _("Angle, in degrees"))
+      .AddParameter("expression", _("Distance"));
+
   obj.AddExpression("AngleToPosition",
                     _("Angle between an object and a position"),
                     _("Compute the angle between the object center and a "
                       "\"target\" position. If you need the angle between two "
                       "objects, use AngleToObject."),
-                    _("Position"),
+                    _("Angle"),
                     "res/actions/position.png")
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Target X position"))
@@ -1121,18 +1290,20 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   extension
-      .AddCondition("Raycast",
-                    _("Raycast"),
-                    _("Sends a ray from the given source position and angle, "
-                      "intersecting the closest object.\nThe instersected "
-                      "object will become the only one taken into account.\nIf "
-                      "the condition is inverted, the object to be intersected "
-                      "will be the farthest one within the ray radius."),
-                    _("Raycast _PARAM0_ from _PARAM1_;_PARAM2_, and save the "
-                      "result in _PARAM5_, _PARAM6_"),
-                    _("Collision"),
-                    "res/conditions/raycast24.png",
-                    "res/conditions/raycast.png")
+      .AddCondition(
+          "Raycast",
+          _("Raycast"),
+          _("Sends a ray from the given source position and angle, "
+            "intersecting the closest object.\nThe instersected "
+            "object will become the only one taken into account.\nIf "
+            "the condition is inverted, the object to be intersected "
+            "will be the farthest one within the ray radius."),
+          _("Cast a ray from _PARAM1_;_PARAM2_, angle: _PARAM3_ and max "
+            "distance: _PARAM4_px, against _PARAM0_, and save the "
+            "result in _PARAM5_, _PARAM6_"),
+          _("Collision"),
+          "res/conditions/raycast24.png",
+          "res/conditions/raycast.png")
       .AddParameter("objectList", _("Objects to test against the ray"))
       .AddParameter("expression", _("Ray source X position"))
       .AddParameter("expression", _("Ray source Y position"))
@@ -1158,7 +1329,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
             "object will become the only one taken into account.\nIf "
             "the condition is inverted, the object to be intersected "
             "will be the farthest one within the ray radius."),
-          _("Raycast _PARAM0_ from _PARAM1_;_PARAM2_, and save the "
+          _("Cast a ray from from _PARAM1_;_PARAM2_ to _PARAM3_;_PARAM4_ "
+            "against _PARAM0_, and save the "
             "result in _PARAM5_, _PARAM6_"),
           _("Collision"),
           "res/conditions/raycast24.png",

Core/GDCore/Extensions/Builtin/CameraExtension.cpp

@@ -4,6 +4,7 @@
  * 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;
@@ -12,142 +13,115 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation("BuiltinCamera",
-                               _("Cameras and layers features"),
-                               _("Built-in camera extension"),
-                               "Florian Rival",
-                               "Open source (MIT License)")
+      .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)")
       .SetExtensionHelpPath("/interface/scene-editor/layers-and-cameras");
 
 #if defined(GD_IDE_ONLY)
   extension
-      .AddCondition("CameraX",
-                    _("Camera center X position"),
-                    _("Compare the X position of the center of a camera."),
-                    _("the X position of camera _PARAM4_ (layer: _PARAM3_)"),
-                    _("Layers and cameras"),
-                    "res/conditions/camera24.png",
-                    "res/conditions/camera.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardRelationalOperatorParameters("number")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0")
-      .MarkAsAdvanced();
-
-  extension
-      .AddCondition("CameraY",
-                    _("Camera center Y position"),
-                    _("Compare the Y position of the center of a camera."),
-                    _("the Y position of camera _PARAM4_ (layer: _PARAM3_)"),
-                    _("Layers and cameras"),
-                    "res/conditions/camera24.png",
-                    "res/conditions/camera.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardRelationalOperatorParameters("number")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"))
-      .SetDefaultValue("0")
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction(
+      .AddExpressionAndConditionAndAction(
+          "number",
           "CameraX",
           _("Camera center X position"),
-          _("Change the X position of the center of the specified camera."),
+          _("the X position of the center of a camera"),
           _("the X position of camera _PARAM4_ (layer: _PARAM3_)"),
           _("Layers and cameras"),
-          "res/conditions/camera24.png",
-          "res/conditions/camera.png")
+          "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardOperatorParameters("number")
+      .UseStandardParameters("number")
       .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
+
   extension
-      .AddAction(
+      .AddExpressionAndConditionAndAction(
+          "number",
           "CameraY",
           _("Camera center Y position"),
-          _("Change the Y position of the center of the specified camera."),
+          _("the Y position of the center of a camera"),
           _("the Y position of camera _PARAM4_ (layer: _PARAM3_)"),
           _("Layers and cameras"),
-          "res/conditions/camera24.png",
-          "res/conditions/camera.png")
+          "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardOperatorParameters("number")
+      .UseStandardParameters("number")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
       .MarkAsAdvanced();
 
-  extension
-      .AddCondition("CameraWidth",
-                    _("Width of a camera"),
-                    _("Test the width of a camera of a layer"),
-                    _("the width of camera _PARAM2_ of layer _PARAM1_"),
-                    _("Layers and cameras"),
-                    "res/conditions/camera24.png",
-                    "res/conditions/camera.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"))
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number"))
-      .UseStandardRelationalOperatorParameters("number")
-      .MarkAsAdvanced();
+  extension.AddDuplicatedAction("CameraY", "SetCameraY")
+      .SetHidden();  // Deprecated
+  extension.AddDuplicatedExpression("VueY", "CameraY")
+      .SetHidden();  // Deprecated
 
   extension
-      .AddCondition("CameraHeight",
-                    _("Height of a camera"),
-                    _("Test the height of a camera of a layer"),
-                    _("the height of camera _PARAM2_ of layer _PARAM1_"),
-                    _("Layers and cameras"),
-                    "res/conditions/camera24.png",
-                    "res/conditions/camera.png")
+      .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")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"))
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardParameters("number")
       .MarkAsAdvanced();
 
   extension
-      .AddCondition(
+      .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")
+      .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"),
-          _("Test a camera angle."),
+          _("the angle of rotation of a camera"),
           _("the angle of camera (layer: _PARAM3_, camera: _PARAM4_)"),
           _("Layers and cameras"),
-          "res/conditions/camera24.png",
-          "res/conditions/camera.png")
+          "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardParameters("number")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
       .MarkAsAdvanced();
 
-  extension
-      .AddAction("RotateCamera",
-                 _("Change camera angle"),
-                 _("This action modifies the angle of a camera in the "
-                   "specified layer."),
-                 _("the angle of camera (layer: _PARAM3_, camera: _PARAM4_)"),
-                 _("Layers and cameras"),
-                 "res/actions/camera24.png",
-                 "res/actions/camera.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardOperatorParameters("number")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0");
+  extension.AddDuplicatedAction("RotateCamera", "SetCameraAngle").SetHidden();
+  extension.AddDuplicatedExpression("CameraRotation", "CameraAngle")
+      .SetHidden();
+  extension.AddDuplicatedExpression("VueRotation", "CameraAngle").SetHidden();
 
   extension
       .AddAction("AddCamera",
@@ -516,28 +490,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("color", _("Color"))
       .MarkAsAdvanced();
 
-  extension
-      .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"))
-      .AddParameter("expression", _("Camera number (default : 0)"))
-      .SetDefaultValue("0");
-
-  extension
-      .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"))
-      .AddParameter("expression", _("Camera number (default : 0)"))
-      .SetDefaultValue("0");
-
   extension
       .AddExpression(
           "CameraViewportLeft",
@@ -586,68 +538,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("expression", _("Camera number (default : 0)"))
       .SetDefaultValue("0");
 
-  extension
-      .AddExpression("CameraX",
-                     _("Camera X position"),
-                     _("Camera X 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("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("CameraZoom",
                      _("Zoom of a camera of a layer"),
@@ -660,19 +550,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .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"),

Core/GDCore/Extensions/Builtin/CommonConversionsExtension.cpp

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

Core/GDCore/Extensions/Builtin/CommonInstructionsExtension.cpp

@@ -7,8 +7,8 @@
 #include "GDCore/Tools/Localization.h"
 #if defined(GD_IDE_ONLY)
 #include "GDCore/Events/Builtin/CommentEvent.h"
-#include "GDCore/Events/Builtin/ForEachEvent.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"
 #include "GDCore/Events/Builtin/RepeatEvent.h"
@@ -26,8 +26,9 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
   extension
       .SetExtensionInformation(
           "BuiltinCommonInstructions",
-          _("Standard events"),
-          _("Built-in extension providing standard events."),
+          _("Builtin events"),
+          "GDevelop comes with a set of events and conditions that allow to "
+          "express the game logic and rules.",
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/advanced-conditions");
@@ -119,12 +120,13 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                      "res/foreach.png",
                      std::make_shared<gd::ForEachEvent>());
 
-  extension.AddEvent("ForEachChildVariable",
-                     _("For each child variable (of a structure)"),
-                     _("Repeat the event for each child variable of a structure."),
-                     "",
-                     "res/foreach.png",
-                     std::make_shared<gd::ForEachChildVariableEvent>());
+  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"),

Core/GDCore/Extensions/Builtin/ExternalLayoutsExtension.cpp

@@ -13,13 +13,12 @@ void GD_CORE_API
 BuiltinExtensionsImplementer::ImplementsExternalLayoutsExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation(
-          "BuiltinExternalLayouts",
-          _("External layouts"),
-          _("Built-in extension providing actions and conditions related to "
-            "external layouts"),
-          "Florian Rival",
-          "Open source (MIT License)")
+      .SetExtensionInformation("BuiltinExternalLayouts",
+                               _("External layouts"),
+                               "Provides 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,12 +12,14 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation("BuiltinFile",
-                               _("Storage"),
-                               _("Built-in extension providing functions "
-                                 "to store data."),
-                               "Florian Rival",
-                               "Open source (MIT License)")
+      .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)")
       .SetExtensionHelpPath("/all-features/storage");
 
 #if defined(GD_IDE_ONLY)
@@ -98,7 +100,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
       .AddAction(
           "LireFichierExp",
           _("Read a value"),
-          _("Read the value saved in the specified element and store it in a scene "
+          _("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."),
@@ -115,7 +118,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
       .AddAction(
           "LireFichierTxt",
           _("Read a text"),
-          _("Read the text saved in the specified element and store it in a scene "
+          _("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 */);

Core/GDCore/Extensions/Builtin/KeyboardExtension.cpp

@@ -15,7 +15,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
       .SetExtensionInformation(
           "BuiltinKeyboard",
           _("Keyboard features"),
-          _("Built-in extension that enables the use of a keyboard"),
+          _("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."),
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/keyboard");
@@ -79,6 +82,16 @@ 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,12 +15,22 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
   extension.SetExtensionInformation(
       "BuiltinMathematicalTools",
       _("Mathematical tools"),
-      _("Built-in extension providing mathematical tools"),
+      "A set of mathematical functions that can be used in expressions.",
       "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)"),
@@ -369,6 +379,30 @@ 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,6 +4,7 @@
  * 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;
@@ -14,8 +15,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
   extension
       .SetExtensionInformation(
           "BuiltinMouse",
-          _("Mouse features"),
-          _("Built-in extension that enables the use of a mouse"),
+          _("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.",
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/mouse-touch");
@@ -144,37 +149,47 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .MarkAsAdvanced();
 
   extension
-      .AddCondition("SourisX",
-                    _("Cursor X position"),
-                    _("Compare the X position of the cursor or of a touch."),
-                    _("the cursor X position"),
-                    _("Mouse and touch"),
-                    "res/conditions/mouse24.png",
-                    "res/conditions/mouse.png")
+      .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")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardParameters("number")
       .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();
+
   extension
-      .AddCondition("SourisY",
-                    _("Cursor Y position"),
-                    _("Compare the Y position of the cursor or of a touch."),
-                    _("the cursor Y position"),
-                    _("Mouse and touch"),
-                    "res/conditions/mouse24.png",
-                    "res/conditions/mouse.png")
+      .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")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardParameters("number")
       .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();
+
   extension
-      .AddCondition("SourisBouton",
+      .AddCondition("MouseButtonPressed",
                     _("Mouse button pressed or touch held"),
                     _("Check if the specified mouse button is pressed or "
                       "if a touch is in contact with the screen."),
@@ -183,49 +198,52 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                     "res/conditions/mouse24.png",
                     "res/conditions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("mouse", _("Button to test"))
+      .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")
+      .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 test"))
+      .AddParameter("mouse", _("Button to check"))
       .MarkAsSimple();
 
   extension
-      .AddCondition("TouchX",
-                    _("Touch X position"),
-                    _("Compare the X position of a specific touch."),
-                    _("the touch #_PARAM1_ X position"),
-                    _("Mouse and touch/Multitouch"),
-                    "res/conditions/touch24.png",
-                    "res/conditions/touch.png")
+      .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")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch identifier"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardParameters("number")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
 
   extension
-      .AddCondition("TouchY",
-                    _("Touch Y position"),
-                    _("Compare the Y position of a specific touch."),
-                    _("the touch #_PARAM1_ Y position"),
-                    _("Mouse and touch/Multitouch"),
-                    "res/conditions/touch24.png",
-                    "res/conditions/touch.png")
+      .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")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch identifier"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardParameters("number")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
@@ -261,95 +279,19 @@ 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 cursor"),
+                     _("Mouse and touch"),
                      "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"),
-                     _("Multitouch"),
+                     _("Mouse and touch/Multitouch"),
                      "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "");
 
@@ -357,7 +299,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .AddExpression("LastEndedTouchId",
                      _("Identifier of the last ended touch"),
                      _("Identifier of the last ended touch"),
-                     _("Multitouch"),
+                     _("Mouse and touch/Multitouch"),
                      "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "");
 

Core/GDCore/Extensions/Builtin/NetworkExtension.cpp

@@ -15,7 +15,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(
       .SetExtensionInformation(
           "BuiltinNetwork",
           _("Basic internet features"),
-          _("Built-in extension providing network features."),
+          _("Features to send web requests, communicate with external \"APIs\" and other network related tasks."),
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/network");

Core/GDCore/Extensions/Builtin/SceneExtension.cpp

@@ -15,7 +15,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
       .SetExtensionInformation(
           "BuiltinScene",
           _("Scene management features"),
-          _("Built-in extension allowing to manipulate scenes and providing common features"),
+          _("Actions and conditions to manipulate the scenes during the game."),
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("" /*TODO: Add a documentation page for this */);

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

@@ -21,7 +21,7 @@ Direction::~Direction(){};
 
 void Direction::SetLoop(bool loop_) { loop = loop_; }
 
-void Direction::SetTimeBetweenFrames(float time) { timeBetweenFrame = time; }
+void Direction::SetTimeBetweenFrames(double 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 float GetTimeBetweenFrames() const { return timeBetweenFrame; }
+  inline double GetTimeBetweenFrames() const { return timeBetweenFrame; }
 
   /**
    * \brief Set the time between each sprite
    *
    * \param time Time between each sprite, in seconds.
    */
-  void SetTimeBetweenFrames(float time);
+  void SetTimeBetweenFrames(double 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.
-  float timeBetweenFrame;  ///< The time between each sprite of the animation.
+  double 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/SpriteObject.cpp

@@ -143,10 +143,7 @@ SpriteObject::GetInitialInstanceProperties(const gd::InitialInstance& position,
                                            gd::Project& project,
                                            gd::Layout& scene) {
   std::map<gd::String, gd::PropertyDescriptor> properties;
-  properties[_("Animation")] =
-      position.floatInfos.find("animation") != position.floatInfos.end()
-          ? gd::String::From(position.floatInfos.find("animation")->second)
-          : gd::String("0");
+  properties[_("Animation")] = gd::String::From(position.GetRawDoubleProperty("animation"));
 
   return properties;
 }
@@ -157,7 +154,7 @@ bool SpriteObject::UpdateInitialInstanceProperty(gd::InitialInstance& position,
                                                  gd::Project& project,
                                                  gd::Layout& scene) {
   if (name == _("Animation"))
-    position.floatInfos["animation"] = value.To<int>();
+    position.SetRawDoubleProperty("animation", value.To<int>());
 
   return true;
 }

Core/GDCore/Extensions/Builtin/StringInstructionsExtension.cpp

@@ -16,8 +16,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
       .SetExtensionInformation(
           "BuiltinStringInstructions",
           _("Text manipulation"),
-          _("Built-in extension providing expressions for manipulating text "
-            "objects."),
+          "Provides expressions to manipulate strings (also called texts).",
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("" /*TODO: Add a documentation page for this */);
@@ -121,15 +120,17 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
 
       .AddParameter("string", _("Text"))
       .AddParameter("string", _("Text to search for"))
-      .SetHidden(); // Deprecated, see StrFindLast instead.
+      .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")
+      .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"));
@@ -162,14 +163,16 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
       .AddParameter("expression",
                     _("Position of the last character in the string to be "
                       "considered in the search"))
-      .SetHidden(); // Deprecated, see StrFindLastFrom instead.
+      .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 the last occurence, starting from a position "
+            "(return "
+            " the position of the result, from the beginning of the string, or "
+            "-1 if not found)"),
           _("Manipulation of text"),
           "res/conditions/toujours24.png")
 

Core/GDCore/Extensions/Builtin/TimeExtension.cpp

@@ -12,12 +12,14 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation("BuiltinTime",
-                               _("Time"),
-                               _("Built-in extension providing actions and "
-                                 "conditions related to time."),
-                               "Florian Rival",
-                               "Open source (MIT License)")
+      .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)")
       .SetExtensionHelpPath("/all-features/timers");
 
 #if defined(GD_IDE_ONLY)

Core/GDCore/Extensions/Builtin/VariablesExtension.cpp

@@ -15,7 +15,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .SetExtensionInformation(
           "BuiltinVariables",
           _("Variable features"),
-          _("Built-in extension allowing to manipulate variables"),
+          "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.",
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/variables");
@@ -43,13 +46,26 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .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");
+
   extension
       .AddCondition(
           "VariableChildExists",
           _("Child existence"),
           _("Check if the specified child of the scene variable exists."),
           _("Child _PARAM1_ of scene variable _PARAM0_ exists"),
-          _("Variables/Structures"),
+          _("Variables/Collections/Structures"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
@@ -62,7 +78,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("Check if the specified child of the global "
                       "variable exists."),
                     _("Child _PARAM1_ of global variable _PARAM0_ exists"),
-                    _("Variables/Global variables/Structures"),
+                    _("Variables/Global variables/Collections/Structures"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
@@ -93,18 +109,30 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .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();
+
   extension
       .AddCondition(
-          "VarGlobalTxt",
-          _("Text of a global variable"),
-          _("Compare the text of a global variable."),
-          _("the text of the global variable _PARAM0_"),
+          "GlobalVariableAsBoolean",
+          _("Boolean value of a global variable"),
+          _("Compare the boolean value of a global variable."),
+          _("The boolean value of global variable _PARAM0_ is _PARAM1_"),
           _("Variables/Global variables"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .UseStandardRelationalOperatorParameters("string")
-      .MarkAsAdvanced();
+      .AddParameter("trueorfalse", _("Check if the value is"))
+      .SetDefaultValue("true");
 
   extension
       .AddCondition("VarGlobalDef",
@@ -122,7 +150,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
   extension
       .AddAction("ModVarScene",
                  _("Value of a scene variable"),
-                 _("Modify the value of a scene variable."),
+                 _("Change the value of a scene variable."),
                  _("the scene variable _PARAM0_"),
                  _("Variables"),
                  "res/actions/var24.png",
@@ -141,10 +169,34 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .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"));
+
   extension
       .AddAction("ModVarGlobal",
                  _("Value of a global variable"),
-                 _("Modify the value of a global variable"),
+                 _("Change the value of a global variable"),
                  _("the global variable _PARAM0_"),
                  _("Variables/Global variables"),
                  "res/actions/var24.png",
@@ -154,24 +206,47 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .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")
+      .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();
 
+  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_"),
+          _("Variables/Global variables"),
+          "res/conditions/var24.png",
+          "res/conditions/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"));
+
   extension
       .AddAction("VariableRemoveChild",
                  _("Remove a child"),
                  _("Remove a child from a scene variable."),
                  _("Remove child _PARAM1_ from scene variable _PARAM0_"),
-                 _("Variables/Structure"),
+                 _("Variables/Collections/Structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
@@ -183,7 +258,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/Structure"),
+                 _("Variables/Global variables/Collections/Structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
@@ -195,7 +270,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/Structure"),
+                 _("Variables/Collections"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
@@ -206,16 +281,140 @@ 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/Structure"),
+                 _("Variables/Global variables/Collections"),
                  "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 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 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"),
-                     _("Get the number of children of a global variable"),
+                     _("Number of children of a global variable"),
                      _("Variables"),
                      "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"));
@@ -223,7 +422,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
   extension
       .AddExpression("VariableChildCount",
                      _("Number of children of a scene variable"),
-                     _("Get the number of children of a scene variable"),
+                     _("Number of children of a scene variable"),
                      _("Variables"),
                      "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"));

Core/GDCore/Extensions/Builtin/WindowExtension.cpp

@@ -12,12 +12,14 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation("BuiltinWindow",
-                               _("Window features"),
-                               _("Built-in extension allowing to manipulate "
-                                 "the game window and canvas"),
-                               "Florian Rival",
-                               "Open source (MIT License)")
+      .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)")
       .SetExtensionHelpPath("/all-features/window");
 
 #if defined(GD_IDE_ONLY)
@@ -39,14 +41,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
       .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")
+      .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

Core/GDCore/Extensions/Metadata/BehaviorMetadata.cpp

@@ -4,12 +4,16 @@
  * 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 {
 
@@ -147,12 +151,16 @@ 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 auomatism name in the expression )
-  expressionsInfos[name] =
-      ExpressionMetadata(
-          extensionNamespace, name, fullname, description, group, smallicon)
-          .SetHelpPath(GetHelpPath());
+  // 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());
   return expressionsInfos[name];
 #endif
 }
@@ -164,16 +172,109 @@ 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 auomatism name in the expression )
-  strExpressionsInfos[name] =
-      ExpressionMetadata(
-          extensionNamespace, name, fullname, description, group, smallicon)
-          .SetHelpPath(GetHelpPath());
+  // 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());
   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);
+}
+
 BehaviorMetadata& BehaviorMetadata::SetFullName(const gd::String& fullname_) {
 #if defined(GD_IDE_ONLY)
   fullname = fullname_;

Core/GDCore/Extensions/Metadata/BehaviorMetadata.h

@@ -6,12 +6,14 @@
 #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
@@ -41,7 +43,8 @@ class GD_CORE_API BehaviorMetadata {
 
   /**
    * Declare a new condition as being part of the behavior.
-   * \deprecated Prefer using `AddScopedCondition`.
+   * \deprecated Prefer using `AddScopedCondition`, to properly namespace
+   * the condition.
    */
   gd::InstructionMetadata& AddCondition(const gd::String& name_,
                                         const gd::String& fullname_,
@@ -53,7 +56,8 @@ class GD_CORE_API BehaviorMetadata {
 
   /**
    * Declare a new action as being part of the behavior.
-   * \deprecated Prefer using `AddScopedAction`.
+   * \deprecated Prefer using `AddScopedAction`, to properly namespace
+   * the action.
    */
   gd::InstructionMetadata& AddAction(const gd::String& name_,
                                      const gd::String& fullname_,
@@ -67,23 +71,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.
    */
@@ -102,6 +106,38 @@ 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);
+
   BehaviorMetadata& SetFullName(const gd::String& fullname_);
   BehaviorMetadata& SetDefaultName(const gd::String& defaultName_);
   BehaviorMetadata& SetDescription(const gd::String& description_);
@@ -120,12 +156,14 @@ 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 GDevelop 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 GDevelop 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

@@ -19,6 +19,14 @@ namespace gd {
  */
 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.
    */
@@ -77,24 +85,38 @@ class GD_CORE_API DependencyMetadata {
   };
 
   /**
-   * \brief Mark the dependency to be included in the export only if the
-   * specified setting is not empty.
-   *
-   * If this is called for multiple settings, all settings must be fulfilled for
-   * the dependency to be exported.
+   * \brief Mark the dependency to be included in the export only if at least
+   * one of the extra settings is set.
    */
-  DependencyMetadata& OnlyIfExtraSettingIsNonEmpty(
-      const gd::String& settingName) {
-    nonEmptyExtraSettingsForExport.insert(settingName);
+  DependencyMetadata& OnlyIfSomeExtraSettingsNonEmpty() {
+    onlyIfSomeExtraSettingsNonEmpty = true;
     return *this;
   };
 
   /**
-   * \brief Get the list of extra settings that must be fulfilled for the
-   * dependency to be exported.
+   * \brief Check if at least one of the extra settings must be set for the
+   * dependency to be included in the export.
    */
-  const std::set<gd::String>& GetRequiredExtraSettingsForExport() const {
-    return nonEmptyExtraSettingsForExport;
+  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; };
@@ -111,6 +133,10 @@ class GD_CORE_API DependencyMetadata {
     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:
@@ -120,10 +146,10 @@ class GD_CORE_API DependencyMetadata {
   std::map<gd::String, gd::PropertyDescriptor>
       extraData;  ///< Contains dependency type specific additional parameters
                   ///< for the dependency.
-  std::set<gd::String>
-      nonEmptyExtraSettingsForExport;  ///< The set of extra settings that must
-                                       ///< be non empty for this dependency to
-                                       ///< be included by the exporter.
+  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/ExpressionMetadata.cpp

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

Core/GDCore/Extensions/Metadata/ExpressionMetadata.h

@@ -8,6 +8,7 @@
 #if defined(GD_IDE_ONLY)
 #include <functional>
 #include <memory>
+
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/String.h"
@@ -122,7 +123,8 @@ class GD_CORE_API ExpressionMetadata {
   /**
    * Construct a new expression metadata.
    */
-  ExpressionMetadata(const gd::String& extensionNamespace,
+  ExpressionMetadata(const gd::String& returnType,
+                     const gd::String& extensionNamespace,
                      const gd::String& name,
                      const gd::String& fullname,
                      const gd::String& description,
@@ -131,9 +133,11 @@ class GD_CORE_API ExpressionMetadata {
 
   /**
    * Construct an empty ExpressionMetadata.
-   * \warning Don't use this - only here to fullfil std::map requirements.
+   * \warning Don't use this - only here to construct a "bad" ExpressionData and
+   * to fulfill std::map requirements.
    */
-  ExpressionMetadata() : shown(false), isPrivate(false){};
+  ExpressionMetadata()
+      : returnType("unknown"), shown(false), isPrivate(false){};
 
   virtual ~ExpressionMetadata(){};
 
@@ -151,14 +155,16 @@ 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 GDevelop 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 GDevelop documentation
+   * root.
    */
-  ExpressionMetadata &SetHelpPath(const gd::String &path) {
+  ExpressionMetadata& SetHelpPath(const gd::String& path) {
     helpPath = path;
     return *this;
   }
@@ -205,12 +211,14 @@ class GD_CORE_API ExpressionMetadata {
   };
 
   /**
-   * \brief Set the long description shown in the editor for the last added parameter.
+   * \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);
+  ExpressionMetadata& SetParameterLongDescription(gd::String longDescription) {
+    if (!parameters.empty())
+      parameters.back().SetLongDescription(longDescription);
     return *this;
   };
 
@@ -236,6 +244,7 @@ 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; }
@@ -254,6 +263,7 @@ 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

@@ -4,10 +4,13 @@
  * 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"
 
 namespace gd {
 InstructionMetadata::InstructionMetadata()
@@ -45,8 +48,6 @@ InstructionMetadata::InstructionMetadata(const gd::String& extensionNamespace_,
       isObjectInstruction(false),
       isBehaviorInstruction(false) {}
 
-ParameterMetadata::ParameterMetadata() : optional(false), codeOnly(false) {}
-
 InstructionMetadata& InstructionMetadata::AddParameter(
     const gd::String& type,
     const gd::String& description,
@@ -158,26 +159,4 @@ InstructionMetadata::UseStandardRelationalOperatorParameters(
   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("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

Core/GDCore/Extensions/Metadata/InstructionMetadata.h

@@ -10,8 +10,10 @@
 #include <functional>
 #include <map>
 #include <memory>
+
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/String.h"
+#include "ParameterMetadata.h"
 namespace gd {
 class Project;
 class Layout;
@@ -22,212 +24,6 @@ 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 Get the user friendly, long description for the parameter.
-   */
-  const gd::String &GetLongDescription() const { return longDescription; }
-
-  /**
-   * \brief Set the user friendly, long description for the parameter.
-   */
-  ParameterMetadata &SetLongDescription(const gd::String &longDescription_) {
-    longDescription = longDescription_;
-    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
- private:
-  gd::String longDescription;  ///< Long description shown in the editor.
-  gd::String defaultValue;     ///< Used as a default value in editor or if an
-                               ///< optional parameter is empty.
-  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
@@ -274,12 +70,14 @@ 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 GDevelop
+   * 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 GDevelop
+   * documentation root.
    */
   InstructionMetadata &SetHelpPath(const gd::String &path) {
     helpPath = path;
@@ -421,7 +219,21 @@ class GD_CORE_API InstructionMetadata {
   }
 
   /**
-   * \brief Consider that the instruction is easy for an user to understand.
+   * \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.
    */
   InstructionMetadata &MarkAsSimple() {
     usageComplexity = 2;
@@ -429,7 +241,7 @@ class GD_CORE_API InstructionMetadata {
   }
 
   /**
-   * \brief Consider that the instruction is harder for an user to understand
+   * \brief Consider that the instruction is harder for a user to understand
    * than a normal instruction.
    */
   InstructionMetadata &MarkAsAdvanced() {
@@ -438,7 +250,7 @@ class GD_CORE_API InstructionMetadata {
   }
 
   /**
-   * \brief Consider that the instruction is complex for an user to understand.
+   * \brief Consider that the instruction is complex for a user to understand.
    */
   InstructionMetadata &MarkAsComplex() {
     usageComplexity = 9;

Core/GDCore/Extensions/Metadata/MetadataProvider.cpp

@@ -4,11 +4,13 @@
  * 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/Metadata/EffectMetadata.h"
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/String.h"
@@ -22,7 +24,6 @@ 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>
@@ -276,7 +277,7 @@ MetadataProvider::GetExtensionAndObjectStrExpressionMetadata(
   }
 
   return ExtensionAndMetadata<ExpressionMetadata>(badExtension,
-                                                  badStrExpressionMetadata);
+                                                  badExpressionMetadata);
 }
 
 const gd::ExpressionMetadata& MetadataProvider::GetObjectStrExpressionMetadata(
@@ -313,7 +314,7 @@ MetadataProvider::GetExtensionAndBehaviorStrExpressionMetadata(
   }
 
   return ExtensionAndMetadata<ExpressionMetadata>(badExtension,
-                                                  badStrExpressionMetadata);
+                                                  badExpressionMetadata);
 }
 
 const gd::ExpressionMetadata&
@@ -337,7 +338,7 @@ MetadataProvider::GetExtensionAndStrExpressionMetadata(
   }
 
   return ExtensionAndMetadata<ExpressionMetadata>(badExtension,
-                                                  badStrExpressionMetadata);
+                                                  badExpressionMetadata);
 }
 
 const gd::ExpressionMetadata& MetadataProvider::GetStrExpressionMetadata(
@@ -345,197 +346,48 @@ const gd::ExpressionMetadata& MetadataProvider::GetStrExpressionMetadata(
   return GetExtensionAndStrExpressionMetadata(platform, exprType).GetMetadata();
 }
 
-bool MetadataProvider::HasAction(const gd::Platform& platform,
-                                 gd::String name) {
-  auto& extensions = platform.GetAllPlatformExtensions();
+const gd::ExpressionMetadata& MetadataProvider::GetAnyExpressionMetadata(
+    const gd::Platform& platform, gd::String exprType) {
+  const auto& numberExpressionMetadata =
+      GetExpressionMetadata(platform, exprType);
+  const auto& stringExpressionMetadata =
+      GetStrExpressionMetadata(platform, exprType);
 
-  for (auto& extension : extensions) {
-    const auto& actions = extension->GetAllActions();
-    if (actions.find(name) != actions.end()) return true;
-  }
-
-  return false;
+  return &numberExpressionMetadata != &badExpressionMetadata
+             ? numberExpressionMetadata
+             : &stringExpressionMetadata != &badExpressionMetadata
+                   ? stringExpressionMetadata
+                   : badExpressionMetadata;
 }
 
-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;
-  }
+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);
 
-  // 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;
+  return &numberExpressionMetadata != &badExpressionMetadata
+             ? numberExpressionMetadata
+             : &stringExpressionMetadata != &badExpressionMetadata
+                   ? stringExpressionMetadata
+                   : badExpressionMetadata;
 }
 
-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;
-  }
+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);
 
-  // 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;
+  return &numberExpressionMetadata != &badExpressionMetadata
+             ? numberExpressionMetadata
+             : &stringExpressionMetadata != &badExpressionMetadata
+                   ? stringExpressionMetadata
+                   : badExpressionMetadata;
 }
 
 MetadataProvider::~MetadataProvider() {}

Core/GDCore/Extensions/Metadata/MetadataProvider.h

@@ -96,7 +96,7 @@ class GD_CORE_API MetadataProvider {
 
   /**
    * Get information about an expression, and its associated extension.
-   * Works for static expressions.
+   * Works for free expressions.
    */
   static ExtensionAndMetadata<ExpressionMetadata>
   GetExtensionAndExpressionMetadata(const gd::Platform& platform,
@@ -122,7 +122,7 @@ class GD_CORE_API MetadataProvider {
 
   /**
    * Get information about a string expression, and its associated extension.
-   * Works for static expressions.
+   * Works for free expressions.
    */
   static ExtensionAndMetadata<ExpressionMetadata>
   GetExtensionAndStrExpressionMetadata(const gd::Platform& platform,
@@ -180,7 +180,7 @@ class GD_CORE_API MetadataProvider {
 
   /**
    * Get information about an expression from its type
-   * Works for static expressions.
+   * Works for free expressions.
    */
   static const gd::ExpressionMetadata& GetExpressionMetadata(
       const gd::Platform& platform, gd::String exprType);
@@ -201,7 +201,7 @@ class GD_CORE_API MetadataProvider {
 
   /**
    * Get information about a string expression from its type
-   * Works for static expressions.
+   * Works for free expressions.
    */
   static const gd::ExpressionMetadata& GetStrExpressionMetadata(
       const gd::Platform& platform, gd::String exprType);
@@ -221,96 +221,28 @@ class GD_CORE_API MetadataProvider {
       const gd::Platform& platform, gd::String autoType, gd::String exprType);
 
   /**
-   * \brief Check if a (static) condition exists
-   * @return true if the (static) condition exists
+   * Get information about an expression from its type.
+   * Works for free expressions.
    */
-  static bool HasCondition(const gd::Platform& platform, gd::String name);
+  static const gd::ExpressionMetadata& GetAnyExpressionMetadata(
+      const gd::Platform& platform, gd::String exprType);
 
   /**
-   * \brief Check if a (static) action exists
-   * @return true if the (static) action exists
+   * Get information about an expression from its type.
+   * Works for object expressions.
    */
-  static bool HasAction(const gd::Platform& platform, gd::String name);
+  static const gd::ExpressionMetadata& GetObjectAnyExpressionMetadata(
+      const gd::Platform& platform, gd::String objectType, gd::String exprType);
 
   /**
-   * \brief Check if a (object) action exists
-   * @return true if the (object) action exists
+   * Get information about an expression from its type.
+   * Works for behavior expressions.
    */
-  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 const gd::ExpressionMetadata& GetBehaviorAnyExpressionMetadata(
+      const gd::Platform& platform, gd::String autoType, gd::String exprType);
 
   static bool IsBadExpressionMetadata(const gd::ExpressionMetadata& metadata) {
-    return &metadata == &badExpressionMetadata ||
-           &metadata == &badStrExpressionMetadata;
+    return &metadata == &badExpressionMetadata;
   }
 
   virtual ~MetadataProvider();
@@ -324,7 +256,6 @@ class GD_CORE_API MetadataProvider {
   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

@@ -0,0 +1,12 @@
+/*
+ * 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

@@ -0,0 +1,216 @@
+/*
+ * 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,11 +4,16 @@
  * 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 {
 
@@ -108,6 +113,62 @@ gd::InstructionMetadata& ObjectMetadata::AddAction(
 #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();
+  return actionsInfos[nameWithNamespace];
+#endif
+}
+
 gd::ExpressionMetadata& ObjectMetadata::AddExpression(
     const gd::String& name,
     const gd::String& fullname,
@@ -115,12 +176,16 @@ 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(
-          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("number",
+                                              extensionNamespace,
+                                              name,
+                                              fullname,
+                                              description,
+                                              group,
+                                              smallicon)
+                               .SetHelpPath(GetHelpPath());
 
   return expressionsInfos[name];
 #endif
@@ -133,17 +198,110 @@ 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(
-          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("string",
+                                                 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,19 +5,22 @@
  */
 #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 {
 
@@ -31,7 +34,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 asked.
+   * be copied when a new object is requested.
    */
   ObjectMetadata(const gd::String& extensionNamespace_,
                  const gd::String& name_,
@@ -55,7 +58,8 @@ class GD_CORE_API ObjectMetadata {
 
   /**
    * \brief Declare a new condition as being part of the extension.
-   * \note This method does nothing when used for GD C++ runtime.
+   * \deprecated Prefer using `AddScopedCondition`, to properly namespace the
+   * condition.
    */
   gd::InstructionMetadata& AddCondition(const gd::String& name_,
                                         const gd::String& fullname_,
@@ -67,7 +71,8 @@ class GD_CORE_API ObjectMetadata {
 
   /**
    * \brief Declare a new action as being part of the extension.
-   * \note This method does nothing when used for GD C++ runtime.
+   * \deprecated Prefer using `AddScopedAction`, to properly namespace the
+   * action.
    */
   gd::InstructionMetadata& AddAction(const gd::String& name_,
                                      const gd::String& fullname_,
@@ -76,9 +81,31 @@ 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_,
@@ -87,7 +114,6 @@ 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_,
@@ -95,30 +121,62 @@ 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_);
 
   /**
-   * Get the help path of the object, relative to the GDevelop documentation root.
+   * \brief Get the help path of the object, relative to the GDevelop
+   * documentation root.
    */
-  const gd::String &GetHelpPath() const { return helpPath; }
+  const gd::String& GetHelpPath() const { return helpPath; }
 
   /**
-   * Set the help path of the object, relative to the GDevelop documentation root.
+   * \brief Set the help path of the object, relative to the GDevelop
+   * 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;
   }
@@ -166,7 +224,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

@@ -0,0 +1,38 @@
+/*
+ * 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

Core/GDCore/Extensions/Metadata/ParameterMetadata.h

@@ -0,0 +1,232 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#ifndef PARAMETER_METADATA_H
+#define PARAMETER_METADATA_H
+#if defined(GD_IDE_ONLY)
+#include <map>
+#include <memory>
+#include "GDCore/String.h"
+namespace gd {
+class Project;
+class Layout;
+class EventsCodeGenerator;
+class EventsCodeGenerationContext;
+class SerializerElement;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Describe a parameter of an instruction (action, condition) or of an
+ * expression: type, user-friendly description, etc...
+ *
+ * \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 Get the user friendly, long description for the parameter.
+   */
+  const gd::String &GetLongDescription() const { return longDescription; }
+
+  /**
+   * \brief Set the user friendly, long description for the parameter.
+   */
+  ParameterMetadata &SetLongDescription(const gd::String &longDescription_) {
+    longDescription = longDescription_;
+    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 usage 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
+ private:
+  gd::String longDescription;  ///< Long description shown in the editor.
+  gd::String defaultValue;     ///< Used as a default value in editor or if an
+                               ///< optional parameter is empty.
+  gd::String name;             ///< The name of the parameter to be used in code
+                               ///< generation. Optional.
+};
+
+}  // namespace gd
+
+#endif
+#endif  // PARAMETER_METADATA_H

Core/GDCore/Extensions/Platform.cpp

@@ -14,7 +14,7 @@ using namespace std;
 
 namespace gd {
 
-Platform::Platform(): enableExtensionLoadingLogs(true) {}
+Platform::Platform(): enableExtensionLoadingLogs(false) {}
 
 Platform::~Platform() {}
 

Core/GDCore/Extensions/PlatformExtension.cpp

@@ -13,11 +13,13 @@
 #include "GDCore/Extensions/Metadata/EventMetadata.h"
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
+#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
 #include "GDCore/Extensions/Metadata/ObjectMetadata.h"
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/IDE/PlatformManager.h"
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/BehaviorsSharedData.h"
+#include "GDCore/Tools/Localization.h"
 
 namespace gd {
 
@@ -28,8 +30,6 @@ std::map<gd::String, gd::InstructionMetadata>
     PlatformExtension::badActionsMetadata;
 std::map<gd::String, gd::ExpressionMetadata>
     PlatformExtension::badExpressionsMetadata;
-std::map<gd::String, gd::ExpressionMetadata>
-    PlatformExtension::badStrExpressionsMetadata;
 #endif
 
 gd::InstructionMetadata& PlatformExtension::AddCondition(
@@ -41,8 +41,7 @@ gd::InstructionMetadata& PlatformExtension::AddCondition(
     const gd::String& icon,
     const gd::String& smallicon) {
 #if defined(GD_IDE_ONLY)
-  gd::String nameWithNamespace =
-      GetNameSpace().empty() ? name : GetNameSpace() + name;
+  gd::String nameWithNamespace = GetNameSpace() + name;
   conditionsInfos[nameWithNamespace] = InstructionMetadata(GetNameSpace(),
                                                            nameWithNamespace,
                                                            fullname,
@@ -65,8 +64,7 @@ gd::InstructionMetadata& PlatformExtension::AddAction(
     const gd::String& icon,
     const gd::String& smallicon) {
 #if defined(GD_IDE_ONLY)
-  gd::String nameWithNamespace =
-      GetNameSpace().empty() ? name : GetNameSpace() + name;
+  gd::String nameWithNamespace = GetNameSpace() + name;
   actionsInfos[nameWithNamespace] = InstructionMetadata(GetNameSpace(),
                                                         nameWithNamespace,
                                                         fullname,
@@ -87,9 +85,9 @@ gd::ExpressionMetadata& PlatformExtension::AddExpression(
     const gd::String& group,
     const gd::String& smallicon) {
 #if defined(GD_IDE_ONLY)
-  gd::String nameWithNamespace =
-      GetNameSpace().empty() ? name : GetNameSpace() + name;
-  expressionsInfos[nameWithNamespace] = ExpressionMetadata(GetNameSpace(),
+  gd::String nameWithNamespace = GetNameSpace() + name;
+  expressionsInfos[nameWithNamespace] = ExpressionMetadata("number",
+                                                           GetNameSpace(),
                                                            nameWithNamespace,
                                                            fullname,
                                                            description,
@@ -107,9 +105,9 @@ gd::ExpressionMetadata& PlatformExtension::AddStrExpression(
     const gd::String& group,
     const gd::String& smallicon) {
 #if defined(GD_IDE_ONLY)
-  gd::String nameWithNamespace =
-      GetNameSpace().empty() ? name : GetNameSpace() + name;
-  strExpressionsInfos[nameWithNamespace] = ExpressionMetadata(GetNameSpace(),
+  gd::String nameWithNamespace = GetNameSpace() + name;
+  strExpressionsInfos[nameWithNamespace] = ExpressionMetadata("string",
+                                                              GetNameSpace(),
                                                               nameWithNamespace,
                                                               fullname,
                                                               description,
@@ -120,6 +118,94 @@ gd::ExpressionMetadata& PlatformExtension::AddStrExpression(
 #endif
 }
 
+gd::MultipleInstructionMetadata PlatformExtension::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 = AddCondition(name,
+                                 fullname,
+                                 conditionDescriptionTemplate.FindAndReplace(
+                                     "<subject>", descriptionSubject),
+                                 sentenceName,
+                                 group,
+                                 icon,
+                                 icon);
+
+  return MultipleInstructionMetadata::WithExpressionAndCondition(expression,
+                                                                 condition);
+}
+
+gd::MultipleInstructionMetadata
+PlatformExtension::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 = AddCondition(name,
+                                 fullname,
+                                 conditionDescriptionTemplate.FindAndReplace(
+                                     "<subject>", descriptionSubject),
+                                 sentenceName,
+                                 group,
+                                 icon,
+                                 icon);
+
+  // TODO: update the checks
+  gd::String actionDescriptionTemplate = _("Change <subject>.");
+  auto& action = AddAction(
+      "Set" + name,
+      fullname,
+      actionDescriptionTemplate.FindAndReplace("<subject>", descriptionSubject),
+      sentenceName,
+      group,
+      icon,
+      icon);
+
+  return MultipleInstructionMetadata::WithExpressionAndConditionAndAction(
+      expression, condition, action);
+}
+
 #if defined(GD_IDE_ONLY)
 gd::DependencyMetadata& PlatformExtension::AddDependency() {
   extensionDependenciesMetadata.push_back(DependencyMetadata());
@@ -133,8 +219,7 @@ gd::ObjectMetadata& PlatformExtension::AddObject(
     const gd::String& description,
     const gd::String& icon24x24,
     std::shared_ptr<gd::Object> instance) {
-  gd::String nameWithNamespace =
-      GetNameSpace().empty() ? name : GetNameSpace() + name;
+  gd::String nameWithNamespace = GetNameSpace() + name;
   objectsInfos[nameWithNamespace] = ObjectMetadata(GetNameSpace(),
                                                    nameWithNamespace,
                                                    fullname,
@@ -156,8 +241,7 @@ gd::BehaviorMetadata& PlatformExtension::AddBehavior(
     const gd::String& className,
     std::shared_ptr<gd::Behavior> instance,
     std::shared_ptr<gd::BehaviorsSharedData> sharedDatasInstance) {
-  gd::String nameWithNamespace =
-      GetNameSpace().empty() ? name : GetNameSpace() + name;
+  gd::String nameWithNamespace = GetNameSpace() + name;
   behaviorsInfo[nameWithNamespace] = BehaviorMetadata(GetNameSpace(),
                                                       nameWithNamespace,
                                                       fullname,
@@ -173,8 +257,7 @@ gd::BehaviorMetadata& PlatformExtension::AddBehavior(
 }
 
 gd::EffectMetadata& PlatformExtension::AddEffect(const gd::String& name) {
-  gd::String nameWithNamespace =
-      GetNameSpace().empty() ? name : GetNameSpace() + name;
+  gd::String nameWithNamespace = GetNameSpace() + name;
   effectsMetadata[nameWithNamespace] = EffectMetadata(nameWithNamespace);
   return effectsMetadata[nameWithNamespace];
 }
@@ -187,8 +270,7 @@ gd::EventMetadata& PlatformExtension::AddEvent(
     const gd::String& smallicon_,
     std::shared_ptr<gd::BaseEvent> instance_) {
 #if defined(GD_IDE_ONLY)
-  gd::String nameWithNamespace =
-      GetNameSpace().empty() ? name_ : GetNameSpace() + name_;
+  gd::String nameWithNamespace = GetNameSpace() + name_;
   eventsInfos[nameWithNamespace] = gd::EventMetadata(nameWithNamespace,
                                                      fullname_,
                                                      description_,
@@ -272,6 +354,73 @@ std::vector<gd::String> PlatformExtension::GetBehaviorsTypes() const {
 }
 
 #if defined(GD_IDE_ONLY)
+
+gd::InstructionMetadata& PlatformExtension::AddDuplicatedAction(
+    const gd::String& newActionName, const gd::String& copiedActionName) {
+  gd::String newNameWithNamespace = GetNameSpace() + newActionName;
+  gd::String copiedNameWithNamespace = GetNameSpace() + 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& PlatformExtension::AddDuplicatedCondition(
+    const gd::String& newConditionName, const gd::String& copiedConditionName) {
+  gd::String newNameWithNamespace = GetNameSpace() + newConditionName;
+  gd::String copiedNameWithNamespace = GetNameSpace() + 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& PlatformExtension::AddDuplicatedExpression(
+    const gd::String& newExpressionName,
+    const gd::String& copiedExpressionName) {
+  gd::String newNameWithNamespace = GetNameSpace() + newExpressionName;
+  gd::String copiedNameWithNamespace = GetNameSpace() + 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& PlatformExtension::AddDuplicatedStrExpression(
+    const gd::String& newExpressionName,
+    const gd::String& copiedExpressionName) {
+  gd::String newNameWithNamespace = GetNameSpace() + newExpressionName;
+  gd::String copiedNameWithNamespace = GetNameSpace() + 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];
+}
+
 std::map<gd::String, gd::InstructionMetadata>&
 PlatformExtension::GetAllActions() {
   return actionsInfos;
@@ -328,7 +477,7 @@ PlatformExtension::GetAllStrExpressionsForObject(gd::String objectType) {
   if (objectsInfos.find(objectType) != objectsInfos.end())
     return objectsInfos.find(objectType)->second.strExpressionsInfos;
 
-  return badStrExpressionsMetadata;
+  return badExpressionsMetadata;
 }
 
 std::map<gd::String, gd::InstructionMetadata>&
@@ -360,7 +509,7 @@ PlatformExtension::GetAllStrExpressionsForBehavior(gd::String autoType) {
   if (behaviorsInfo.find(autoType) != behaviorsInfo.end())
     return behaviorsInfo.find(autoType)->second.strExpressionsInfos;
 
-  return badStrExpressionsMetadata;
+  return badExpressionsMetadata;
 }
 
 gd::BaseEventSPtr PlatformExtension::CreateEvent(gd::String eventType) const {

Core/GDCore/Extensions/PlatformExtension.h

@@ -24,6 +24,7 @@
 namespace gd {
 class Instruction;
 class InstructionMetadata;
+class MultipleInstructionMetadata;
 class ExpressionMetadata;
 class ObjectMetadata;
 class BehaviorMetadata;
@@ -82,6 +83,11 @@ class GD_CORE_API PlatformExtension {
   PlatformExtension();
   virtual ~PlatformExtension();
 
+  /** \name Extension setup
+   * Common setup for all extensions
+   */
+  ///@{
+
   /**
    * \brief Must be called to declare the main information about the extension.
    */
@@ -100,8 +106,8 @@ class GD_CORE_API PlatformExtension {
   }
 
   /**
-   * \brief Set the path to the help, relative to the GDevelop documentation root.
-   * For example, "/all-features/collisions" for
+   * \brief Set the path to the help, relative to the GDevelop documentation
+   * root. For example, "/all-features/collisions" for
    * "http://wiki.compilgames.net/doku.php/gdevelop5/all-features/collisions".
    *
    * The instructions, objects and behaviors will have this help path set by
@@ -118,9 +124,15 @@ class GD_CORE_API PlatformExtension {
    */
   void MarkAsDeprecated() { deprecated = true; }
 
+  ///@}
+
+  /** \name Features declaration
+   * Declare features provided by the extension
+   */
+  ///@{
+
   /**
    * \brief Declare a new condition as being part of the extension.
-   * \note This method does nothing when used for GD C++ runtime.
    */
   gd::InstructionMetadata& AddCondition(const gd::String& name_,
                                         const gd::String& fullname_,
@@ -132,7 +144,6 @@ class GD_CORE_API PlatformExtension {
 
   /**
    * \brief Declare a new action as being part of the extension.
-   * \note This method does nothing when used for GD C++ runtime.
    */
   gd::InstructionMetadata& AddAction(const gd::String& name_,
                                      const gd::String& fullname_,
@@ -143,7 +154,6 @@ class GD_CORE_API PlatformExtension {
                                      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_,
@@ -151,8 +161,7 @@ class GD_CORE_API PlatformExtension {
                                         const gd::String& group_,
                                         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.
+   * \brief Declare a new string expression as being part of the extension.
    */
   gd::ExpressionMetadata& AddStrExpression(const gd::String& name_,
                                            const gd::String& fullname_,
@@ -160,55 +169,79 @@ class GD_CORE_API PlatformExtension {
                                            const gd::String& group_,
                                            const gd::String& smallicon_);
 
+  /**
+   * \brief Declare a new expression and condition as being part of the
+   * extension.
+   * \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
+   * extension.
+   * \note The action name is prefixed by "Set" (and the namespace, as the
+   * condition and the expression).
+   * \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);
+
   gd::DependencyMetadata& AddDependency();
 
   /**
    * \brief Declare a new object as being part of the extension.
-   * \note This method does nothing when used for GD C++ runtime.
    * \tparam T the declared class inherited from *gd::Object*
-   * \param name The name of the object
-   * \param fullname The user friendly name of the object
-   * \param description The user friendly description of the object
-   * \param icon The 24x24 icon of the object:
-   res/icons_[SkinName]/[iconName]24.png will be first tried,
-   * and then if it does not exists, the full entered name will be tried.
+   * \param name The name of the object.
+   * \param fullname The user friendly name of the object.
+   * \param description The user friendly description of the object.
+   * \param icon The icon of the object.
    */
   template <class T>
   gd::ObjectMetadata& AddObject(const gd::String& name_,
                                 const gd::String& fullname_,
                                 const gd::String& description_,
-                                const gd::String& icon24x24_);
+                                const gd::String& icon_);
 
   /**
    * \brief Declare a new object as being part of the extension.
-   * \note This method does nothing when used for GD C++ runtime.
    * \param name The name of the object
    * \param fullname The user friendly name of the object
    * \param description The user friendly description of the object
-   * \param icon The 24x24 icon of the object:
-   res/icons_[SkinName]/[iconName]24.png will be first tried,
-   * and then if it does not exists, the full entered name will be tried.
+   * \param icon The icon of the object.
    * \param instance The "blueprint" object to be copied when a new object is
    asked for.
    */
   gd::ObjectMetadata& AddObject(const gd::String& name_,
                                 const gd::String& fullname_,
                                 const gd::String& description_,
-                                const gd::String& icon24x24_,
+                                const gd::String& icon_,
                                 std::shared_ptr<gd::Object> instance);
 
   /**
    * \brief Declare a new behavior as being part of the extension.
-   * \note This method does nothing when used for GD C++ runtime.
    *
    * \param name The name of the behavior
    * \param fullname The user friendly name of the behavior
    * \param description The user friendly description of the behavior
-   * \param icon The 24x24 icon of the behavior:
-   * res/icons_[SkinName]/[iconName]24.png will be first tried, and then if it
-   * does not exists, it is assumed that the icon name is the filename that must
-   * be used to open the icon. \param instance An instance of the behavior that
-   * will be used to create the behavior \param sharedDatasInstance Optional
+   * \param icon The icon of the behavior.
+   * \param instance An instance of the behavior that
+   * will be used to create the behavior
+   * \param sharedDatasInstance Optional
    * instance of the data shared by the behaviors having the same name.
    */
   gd::BehaviorMetadata& AddBehavior(
@@ -217,7 +250,7 @@ class GD_CORE_API PlatformExtension {
       const gd::String& defaultName_,
       const gd::String& description_,
       const gd::String& group_,
-      const gd::String& icon24x24_,
+      const gd::String& icon_,
       const gd::String& className_,
       std::shared_ptr<gd::Behavior> instance,
       std::shared_ptr<gd::BehaviorsSharedData> sharedDatasInstance);
@@ -230,7 +263,6 @@ class GD_CORE_API PlatformExtension {
 
   /**
    * \brief Declare a new event as being part of the extension.
-   * \note This method does nothing when used for GD C++ runtime.
    */
   gd::EventMetadata& AddEvent(const gd::String& name_,
                               const gd::String& fullname_,
@@ -240,6 +272,43 @@ class GD_CORE_API PlatformExtension {
                               std::shared_ptr<gd::BaseEvent> instance);
 
 #if defined(GD_IDE_ONLY)
+  /**
+   * \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);
+
   /**
    * \brief Adds a property to the extension.
    */
@@ -248,6 +317,18 @@ class GD_CORE_API PlatformExtension {
   };
 #endif
 
+  /**
+   * \brief Delete all instructions having no function name or custom code
+   * generator.
+   */
+  void StripUnimplementedInstructionsAndExpressions();
+  ///@}
+
+  /** \name Extension accessors
+   * Accessors to read the information and content of the extension.
+   */
+  ///@{
+
   /**
    * \brief Return the name extension user friendly name.
    */
@@ -373,9 +454,8 @@ class GD_CORE_API PlatformExtension {
 
 #if defined(GD_IDE_ONLY)
   /**
-   * \brief Return a reference to a map containing the names of the actions (in
-   * the first members) and the metadata associated with (in the second
-   * members).
+   * \brief Return a reference to a map containing the names of the actions
+   * (as keys) and the metadata associated with (as values).
    */
   std::map<gd::String, gd::InstructionMetadata>& GetAllActions();
 
@@ -450,8 +530,8 @@ class GD_CORE_API PlatformExtension {
       gd::String autoType);
 
   /**
-   * Called ( e.g. during compilation ) so as to inventory resources used by
-   * conditions and update their filename
+   * Called to inventory resources used by conditions
+   * (and possibly do work on them, like renaming, etc...)
    *
    * \see gd::PlatformExtension::ExposeActionsResources
    */
@@ -459,8 +539,8 @@ class GD_CORE_API PlatformExtension {
                                          gd::ArbitraryResourceWorker& worker){};
 
   /**
-   * Called ( e.g. during compilation ) so as to inventory resources used by
-   * actions and update their filename
+   * Called to inventory resources used by actions
+   * (and possibly do work on them, like renaming, etc...)
    *
    * \see ArbitraryResourceWorker
    */
@@ -468,17 +548,14 @@ class GD_CORE_API PlatformExtension {
                                       gd::ArbitraryResourceWorker& worker){};
 
   /**
-   * \brief Delete all instructions having no functions name or custom code
-   * generator.
-   */
-  void StripUnimplementedInstructionsAndExpressions();
-
-  /**
-   * \brief Get all the properties of the extension
+   * \brief Get all the properties of the extension. Properties
+   * are shown in the game properties in the editor, and are exported in the
+   * project data.
    */
   std::map<gd::String, gd::PropertyDescriptor>& GetAllProperties() {
     return extensionPropertiesMetadata;
   }
+  ///@}
 #endif
 
   /**
@@ -495,8 +572,8 @@ class GD_CORE_API PlatformExtension {
 
  private:
   /**
-   * Set the namespace ( the String each actions/conditions/expressions start
-   * with )
+   * Set the namespace (the string all actions/conditions/expressions start
+   * with).
    */
   void SetNameSpace(gd::String nameSpace_);
 
@@ -541,9 +618,6 @@ class GD_CORE_API PlatformExtension {
   static std::map<gd::String, gd::ExpressionMetadata>
       badExpressionsMetadata;  ///< Used when an expression is not found in the
                                ///< extension
-  static std::map<gd::String, gd::ExpressionMetadata>
-      badStrExpressionsMetadata;  ///< Used when an expression is not found in
-                                  ///< the extension
 #endif
 };
 

Core/GDCore/IDE/Dialogs/LayoutEditorCanvas/LayoutEditorCanvasOptions.cpp

@@ -17,6 +17,7 @@ LayoutEditorCanvasOptions::LayoutEditorCanvasOptions()
       gridHeight(32),
       gridOffsetX(0),
       gridOffsetY(0),
+      gridType("rectangular"),
       gridR(158),
       gridG(180),
       gridB(255),
@@ -30,6 +31,7 @@ void LayoutEditorCanvasOptions::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("gridHeight", gridHeight);
   element.SetAttribute("gridOffsetX", gridOffsetX);
   element.SetAttribute("gridOffsetY", gridOffsetY);
+  element.SetAttribute("gridType", gridType);
   element.SetAttribute("gridR", gridR);
   element.SetAttribute("gridG", gridG);
   element.SetAttribute("gridB", gridB);
@@ -42,10 +44,11 @@ void LayoutEditorCanvasOptions::UnserializeFrom(
   grid = element.GetBoolAttribute("grid");
   snap = element.GetBoolAttribute("snap");
   windowMask = element.GetBoolAttribute("windowMask");
-  gridWidth = element.GetIntAttribute("gridWidth", 32);
-  gridHeight = element.GetIntAttribute("gridHeight", 32);
-  gridOffsetX = element.GetIntAttribute("gridOffsetX", 0);
-  gridOffsetY = element.GetIntAttribute("gridOffsetY", 0);
+  gridWidth = element.GetDoubleAttribute("gridWidth", 32);
+  gridHeight = element.GetDoubleAttribute("gridHeight", 32);
+  gridOffsetX = element.GetDoubleAttribute("gridOffsetX", 0);
+  gridOffsetY = element.GetDoubleAttribute("gridOffsetY", 0);
+  gridType = element.GetStringAttribute("gridType", "rectangular");
   gridR = element.GetIntAttribute("gridR", 158);
   gridG = element.GetIntAttribute("gridG", 180);
   gridB = element.GetIntAttribute("gridB", 255);

Core/GDCore/IDE/Dialogs/LayoutEditorCanvas/LayoutEditorCanvasOptions.h

@@ -40,14 +40,15 @@ class GD_CORE_API LayoutEditorCanvasOptions {
 
   bool grid;         ///< True if grid activated in editor
   bool snap;         ///< True if snap to grid activated in editor
-  int gridWidth;     ///< Grid width in editor
-  int gridHeight;    ///< Grid height in editor
-  int gridOffsetX;   ///< Grid X offset
-  int gridOffsetY;   ///< Grid Y offset
+  double gridWidth;    ///< Grid width in editor
+  double gridHeight;   ///< Grid height in editor
+  double gridOffsetX;  ///< Grid X offset
+  double gridOffsetY;  ///< Grid Y offset
+  gd::String gridType; ///< Grid type: rectangular or isometric
   int gridR;         ///< Grid red color in editor
   int gridG;         ///< Grid green color in editor
   int gridB;         ///< Grid blue color in editor
-  float zoomFactor;  ///< Stores the zoom factor
+  double zoomFactor;  ///< Stores the zoom factor
   bool windowMask;   ///< True if window mask displayed in editor
 };
 

Core/GDCore/IDE/Events/InstructionSentenceFormatter.cpp

@@ -136,7 +136,7 @@ gd::String InstructionSentenceFormatter::LabelFromType(const gd::String &type) {
   else if (type == "mouse")
     return _("Mouse button");
   else if (type == "yesorno")
-    return _("Yes or no");
+    return _("Yes or No");
   else if (type == "police")
     return _("Font");
   else if (type == "color")

Core/GDCore/IDE/Events/UsedExtensionsFinder.cpp

@@ -0,0 +1,144 @@
+#include "UsedExtensionsFinder.h"
+
+#include "GDCore/Events/Instruction.h"
+#include "GDCore/Events/Parsers/ExpressionParser2.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/PlatformExtension.h"
+#include "GDCore/IDE/WholeProjectRefactorer.h"
+#include "GDCore/Project/BehaviorContent.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/Project.h"
+
+namespace gd {
+
+std::set<gd::String> UsedExtensionsFinder::ScanProject(gd::Project& project) {
+  UsedExtensionsFinder worker(project);
+  gd::WholeProjectRefactorer::ExposeProjectObjects(project, worker);
+  gd::WholeProjectRefactorer::ExposeProjectEvents(project, worker);
+  return worker.usedExtensions;
+};
+
+// Objects scanner
+
+void UsedExtensionsFinder::DoVisitObject(gd::Object& object) {
+  usedExtensions.insert(gd::MetadataProvider::GetExtensionAndObjectMetadata(
+                            project.GetCurrentPlatform(), object.GetType())
+                            .GetExtension()
+                            .GetName());
+};
+
+// Behaviors scanner
+
+void UsedExtensionsFinder::DoVisitBehavior(gd::BehaviorContent& behavior) {
+  usedExtensions.insert(
+      gd::MetadataProvider::GetExtensionAndBehaviorMetadata(
+          project.GetCurrentPlatform(), behavior.GetTypeName())
+          .GetExtension()
+          .GetName());
+};
+
+// Instructions scanner
+
+bool UsedExtensionsFinder::DoVisitInstruction(gd::Instruction& instruction,
+                                              bool isCondition) {
+  auto metadata =
+      isCondition ? gd::MetadataProvider::GetExtensionAndConditionMetadata(
+                        project.GetCurrentPlatform(), instruction.GetType())
+                  : gd::MetadataProvider::GetExtensionAndActionMetadata(
+                        project.GetCurrentPlatform(), instruction.GetType());
+  usedExtensions.insert(metadata.GetExtension().GetName());
+
+  size_t i = 0;
+  for (auto expression : instruction.GetParameters()) {
+    const gd::String& parameterType =
+        metadata.GetMetadata().GetParameter(i).GetType();
+    i++;
+
+    if (gd::ParameterMetadata::IsExpression("string", parameterType) ||
+        gd::ParameterMetadata::IsExpression("number", parameterType)) {
+      gd::ExpressionParser2 parser(project.GetCurrentPlatform(),
+                                   GetGlobalObjectsContainer(),
+                                   GetObjectsContainer());
+      parser.ParseExpression(parameterType, expression.GetPlainString())
+          ->Visit(*this);
+    } else if (gd::ParameterMetadata::IsExpression("variable", parameterType))
+      usedExtensions.insert("BuiltinVariables");
+  }
+  return false;
+}
+
+// Expressions scanner
+
+// Ignore litterals nodes
+void UsedExtensionsFinder::OnVisitNumberNode(NumberNode& node){};
+void UsedExtensionsFinder::OnVisitTextNode(TextNode& node){};
+
+// Ignore nodes without valid extensions
+void UsedExtensionsFinder::OnVisitEmptyNode(EmptyNode& node){};
+void UsedExtensionsFinder::OnVisitObjectFunctionNameNode(
+    ObjectFunctionNameNode& node){};
+
+// Visit sub-expressions
+void UsedExtensionsFinder::OnVisitSubExpressionNode(SubExpressionNode& node) {
+  node.expression->Visit(*this);
+};
+
+void UsedExtensionsFinder::OnVisitOperatorNode(OperatorNode& node) {
+  node.leftHandSide->Visit(*this);
+  node.rightHandSide->Visit(*this);
+};
+
+void UsedExtensionsFinder::OnVisitUnaryOperatorNode(UnaryOperatorNode& node) {
+  node.factor->Visit(*this);
+};
+
+// Add variable extension and visit sub-expressions on variable nodes
+void UsedExtensionsFinder::OnVisitVariableNode(VariableNode& node) {
+  usedExtensions.insert("BuiltinVariables");
+  if (node.child) node.child->Visit(*this);
+};
+
+void UsedExtensionsFinder::OnVisitVariableAccessorNode(
+    VariableAccessorNode& node) {
+  usedExtensions.insert("BuiltinVariables");
+  if (node.child) node.child->Visit(*this);
+};
+
+void UsedExtensionsFinder::OnVisitVariableBracketAccessorNode(
+    VariableBracketAccessorNode& node) {
+  usedExtensions.insert("BuiltinVariables");
+  node.expression->Visit(*this);
+  if (node.child) node.child->Visit(*this);
+};
+
+// Add extensions bound to Objects/Behaviors/Functions
+void UsedExtensionsFinder::OnVisitIdentifierNode(IdentifierNode& node) {
+  if (gd::ParameterMetadata::IsObject(node.type)) {
+    usedExtensions.insert(gd::MetadataProvider::GetExtensionAndObjectMetadata(
+                              project.GetCurrentPlatform(), node.identifierName)
+                              .GetExtension()
+                              .GetName());
+  }
+};
+
+void UsedExtensionsFinder::OnVisitFunctionCallNode(FunctionCallNode& node) {
+  // Extensions of non-free functions are already found when scanning objects.
+  if (!(node.objectName.empty() && node.behaviorName.empty())) return;
+  gd::ExtensionAndMetadata<gd::ExpressionMetadata> metadata;
+
+  // Try to find a free number expression
+  metadata = gd::MetadataProvider::GetExtensionAndExpressionMetadata(
+      project.GetCurrentPlatform(), node.functionName);
+  if (gd::MetadataProvider::IsBadExpressionMetadata(metadata.GetMetadata())) {
+    // Try to find a free str expression
+    metadata = gd::MetadataProvider::GetExtensionAndStrExpressionMetadata(
+        project.GetCurrentPlatform(), node.functionName);
+    // No valid expression found, return.
+    if (gd::MetadataProvider::IsBadExpressionMetadata(metadata.GetMetadata()))
+      return;
+  }
+
+  usedExtensions.insert(metadata.GetExtension().GetName());
+};
+
+}  // namespace gd

Core/GDCore/IDE/Events/UsedExtensionsFinder.h

@@ -0,0 +1,64 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#ifndef GDCORE_USED_EXTENSIONS_FINDER_H
+#define GDCORE_USED_EXTENSIONS_FINDER_H
+#include <set>
+
+#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
+#include "GDCore/String.h"
+
+namespace gd {
+class Project;
+class Object;
+class BehaviorContent;
+}  // namespace gd
+
+namespace gd {
+
+class GD_CORE_API UsedExtensionsFinder
+    : public ArbitraryObjectsWorker,
+      public ArbitraryEventsWorkerWithContext,
+      public ExpressionParser2NodeWorker {
+ public:
+  static std::set<gd::String> ScanProject(gd::Project& project);
+
+ private:
+  UsedExtensionsFinder(gd::Project& project_) : project(project_){};
+  gd::Project& project;
+  std::set<gd::String> usedExtensions;
+
+  // Object Visitor
+  void DoVisitObject(gd::Object& object) override;
+
+  // Behavior Visitor
+  void DoVisitBehavior(gd::BehaviorContent& behavior) override;
+
+  // Instructions Visitor
+  bool DoVisitInstruction(gd::Instruction& instruction,
+                          bool isCondition) override;
+
+  // Expression Visitor
+  void OnVisitSubExpressionNode(SubExpressionNode& node) override;
+  void OnVisitOperatorNode(OperatorNode& node) override;
+  void OnVisitUnaryOperatorNode(UnaryOperatorNode& node) override;
+  void OnVisitNumberNode(NumberNode& node) override;
+  void OnVisitTextNode(TextNode& node) override;
+  void OnVisitVariableNode(VariableNode& node) override;
+  void OnVisitVariableAccessorNode(VariableAccessorNode& node) override;
+  void OnVisitVariableBracketAccessorNode(
+      VariableBracketAccessorNode& node) override;
+  void OnVisitIdentifierNode(IdentifierNode& node) override;
+  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override;
+  void OnVisitFunctionCallNode(FunctionCallNode& node) override;
+  void OnVisitEmptyNode(EmptyNode& node) override;
+};
+
+};  // namespace gd
+
+#endif

Core/GDCore/IDE/ExportedDependencyResolver.h

@@ -0,0 +1,124 @@
+#pragma once
+#include <vector>
+
+#include "GDCore/Extensions/Metadata/DependencyMetadata.h"
+#include "GDCore/Extensions/PlatformExtension.h"
+#include "GDCore/Project/Project.h"
+
+namespace gd {
+
+/**
+ * \brief Store references to a gd::DependencyMetadata and its associated
+ * gd::PlatformExtension.
+ *
+ * \note Both objects must be kept alive, as this is keeping a pointer to them.
+ */
+struct DependencyMetadataAndExtension {
+  DependencyMetadataAndExtension(gd::DependencyMetadata& dependency_,
+                                 gd::PlatformExtension& extension_)
+      : dependency(&dependency_), extension(&extension_){};
+
+  gd::DependencyMetadata& GetDependency() const { return *dependency; };
+  gd::PlatformExtension& GetExtension() const { return *extension; };
+
+ private:
+  gd::DependencyMetadata* dependency;
+  gd::PlatformExtension* extension;
+};
+
+/**
+ * \brief Helpers to manipulate dependencies of extensions to be exported along
+ * with a game.
+ */
+class ExportedDependencyResolver {
+ public:
+  /**
+   * \brief Return the list of dependencies to be exported for the given project
+   * and dependency type.
+   *
+   * Not all dependencies declared by extensions must be exported: some are only
+   * exported when some settings are filled. Then, some others are only exported
+   * when some other dependencies are exported (this won't work for more than
+   * one level though).
+   */
+  static std::vector<DependencyMetadataAndExtension> GetDependenciesFor(
+      const gd::Project& project, const gd::String& dependencyType) {
+    std::vector<DependencyMetadataAndExtension> dependenciesWithProperType;
+    for (std::shared_ptr<gd::PlatformExtension> extension :
+         project.GetCurrentPlatform().GetAllPlatformExtensions()) {
+      for (gd::DependencyMetadata& dependency :
+           extension->GetAllDependencies()) {
+        if (dependency.GetDependencyType() == dependencyType) {
+          DependencyMetadataAndExtension dependencyMetadataAndExtension(
+              dependency, *extension);
+          dependenciesWithProperType.push_back(dependencyMetadataAndExtension);
+        }
+      }
+    }
+
+    // Keep only the dependencies that have their extra settings filled
+    // and those that don't require extra settings to be filled.
+    std::vector<DependencyMetadataAndExtension> dependenciesWithFilledSettings;
+    for (auto dependencyAndExtension : dependenciesWithProperType) {
+      auto& dependency = dependencyAndExtension.GetDependency();
+      auto extraSettingValues = GetExtensionDependencyExtraSettingValues(
+          project, dependencyAndExtension);
+
+      bool hasExtraSettings = !extraSettingValues.empty();
+      if (!dependency.IsOnlyIfSomeExtraSettingsNonEmpty() || hasExtraSettings)
+        dependenciesWithFilledSettings.push_back(dependencyAndExtension);
+    }
+
+    // Keep only the dependency that depends on another dependencies that is
+    // exported (or dependencies that don't require another dependency).
+    std::vector<DependencyMetadataAndExtension> exportedDependencies;
+    for (auto dependencyAndExtension : dependenciesWithFilledSettings) {
+      auto& dependency = dependencyAndExtension.GetDependency();
+      auto& otherDependencyName =
+          dependency.GetOtherDependencyThatMustBeExported();
+      if (otherDependencyName.empty() ||
+          std::find_if(
+              dependenciesWithFilledSettings.begin(),
+              dependenciesWithFilledSettings.end(),
+              [&otherDependencyName](
+                  DependencyMetadataAndExtension& otherDependencyAndExtension) {
+                return otherDependencyAndExtension.GetDependency().GetName() ==
+                       otherDependencyName;
+              }) != dependenciesWithFilledSettings.end()) {
+        exportedDependencies.push_back(dependencyAndExtension);
+      }
+    }
+
+    return exportedDependencies;
+  }
+
+  /**
+   * \brief Return the values that were stored in the project for the given
+   * dependency.
+   */
+  static std::map<gd::String, gd::String>
+  GetExtensionDependencyExtraSettingValues(
+      const gd::Project& project,
+      const gd::DependencyMetadataAndExtension& dependencyAndExtension) {
+    std::map<gd::String, gd::String> values;
+    auto& dependency = dependencyAndExtension.GetDependency();
+    const gd::String& extensionName =
+        dependencyAndExtension.GetExtension().GetName();
+
+    for (const auto& extraSetting : dependency.GetAllExtraSettings()) {
+      const gd::String& type = extraSetting.second.GetType();
+      const gd::String extraSettingValue =
+          type == "ExtensionProperty"
+              ? project.GetExtensionProperties().GetValue(
+                    extensionName, extraSetting.second.GetValue())
+              : extraSetting.second.GetValue();
+
+      if (!extraSettingValue.empty())
+        values[extraSetting.first] = extraSettingValue;
+    }
+
+    return values;
+  };
+};
+
+}  // namespace gd

Core/GDCore/IDE/Project/ArbitraryObjectsWorker.cpp

@@ -0,0 +1,43 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "ArbitraryObjectsWorker.h"
+
+#include <iostream>
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/Project/BehaviorContent.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/ObjectsContainer.h"
+#include "GDCore/String.h"
+
+using namespace std;
+
+namespace gd {
+
+ArbitraryObjectsWorker::~ArbitraryObjectsWorker() {}
+
+void ArbitraryObjectsWorker::VisitObjectContainer(
+    gd::ObjectsContainer& objects) {
+  DoVisitObjectContainer(objects);
+
+  for (size_t i = 0; i < objects.GetObjectsCount(); i++)
+    VisitObject(objects.GetObject(i));
+}
+
+void ArbitraryObjectsWorker::VisitObject(gd::Object& object) {
+  DoVisitObject(object);
+
+  for (auto behaviorName : object.GetAllBehaviorNames())
+    VisitBehavior(object.GetBehavior(behaviorName));
+}
+
+void ArbitraryObjectsWorker::VisitBehavior(gd::BehaviorContent& behavior) {
+  DoVisitBehavior(behavior);
+}
+
+}  // namespace gd

Core/GDCore/IDE/Project/ArbitraryObjectsWorker.h

@@ -0,0 +1,63 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#ifndef ARBITRARYOBJECTSWORKER_H
+#define ARBITRARYOBJECTSWORKER_H
+
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/String.h"
+namespace gd {
+class Object;
+class ObjectsContainer;
+class BehaviorContent;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief ArbitraryObjectsWorker is an abstract class used to browse objects
+ * (and behaviors) and do some work on them. Can be used to implement
+ * refactoring for example.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API ArbitraryObjectsWorker {
+ public:
+  ArbitraryObjectsWorker(){};
+  virtual ~ArbitraryObjectsWorker();
+
+  /**
+   * \brief Launch the worker on the specified events list.
+   */
+  void Launch(gd::ObjectsContainer& objects) { VisitObjectContainer(objects); };
+
+ private:
+  void VisitObjectContainer(gd::ObjectsContainer& objects);
+  void VisitObject(gd::Object& object);
+  void VisitBehavior(gd::BehaviorContent& instruction);
+
+  /**
+   * Called to do some work on an object container.
+   */
+  virtual void DoVisitObjectContainer(gd::ObjectsContainer& objects){};
+
+  /**
+   * Called to do some work on an object.
+   */
+  virtual void DoVisitObject(gd::Object& object){};
+
+  /**
+   * Called to do some work on a behavior.
+   */
+  virtual void DoVisitBehavior(gd::BehaviorContent& instruction){};
+};
+
+}  // namespace gd
+
+#endif  // ARBITRARYOBJECTSWORKER_H

Core/GDCore/IDE/Project/ArbitraryResourceWorker.cpp

@@ -6,8 +6,10 @@
 #if defined(GD_IDE_ONLY)
 
 #include "ArbitraryResourceWorker.h"
+
 #include <memory>
 #include <vector>
+
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/EventsList.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
@@ -55,6 +57,21 @@ void ArbitraryResourceWorker::ExposeFont(gd::String& fontName) {
   ExposeFile(fontName);
 };
 
+void ArbitraryResourceWorker::ExposeBitmapFont(gd::String& bitmapFontName) {
+  for (auto resources : GetResources()) {
+    if (!resources) continue;
+
+    if (resources->HasResource(bitmapFontName) &&
+        resources->GetResource(bitmapFontName).GetKind() == "bitmapFont") {
+      // Nothing to do, the font is a reference to a resource that
+      // is already exposed.
+      return;
+    }
+  }
+
+  ExposeFile(bitmapFontName);
+};
+
 void ArbitraryResourceWorker::ExposeResources(
     gd::ResourcesManager* resourcesManager) {
   if (!resourcesManager) return;
@@ -82,15 +99,8 @@ void LaunchResourceWorkerOnEvents(const gd::Project& project,
                                   gd::EventsList& events,
                                   gd::ArbitraryResourceWorker& worker) {
   // Get all extensions used
-  std::vector<std::shared_ptr<gd::PlatformExtension> > allGameExtensions;
-  std::vector<gd::String> usedExtensions = project.GetUsedExtensions();
-  for (std::size_t i = 0; i < usedExtensions.size(); ++i) {
-    std::shared_ptr<gd::PlatformExtension> extension =
-        project.GetCurrentPlatform().GetExtension(usedExtensions[i]);
-
-    if (extension != std::shared_ptr<gd::PlatformExtension>())
-      allGameExtensions.push_back(extension);
-  }
+  auto allGameExtensions =
+      project.GetCurrentPlatform().GetAllPlatformExtensions();
 
   for (std::size_t j = 0; j < events.size(); j++) {
     vector<gd::InstructionsList*> allActionsVectors =

Core/GDCore/IDE/Project/ArbitraryResourceWorker.h

@@ -70,6 +70,12 @@ class GD_CORE_API ArbitraryResourceWorker {
    */
   virtual void ExposeFont(gd::String &fontName);
 
+  /**
+   * \brief Expose a bitmap font, which is either a reference to a "bitmapFont" resource,
+   * or a filename if no resource with this name exists.
+   */
+  virtual void ExposeBitmapFont(gd::String &bitmapFontName);
+
   /**
    * \brief Expose a shader.
    * \warn Currently unsupported.

Core/GDCore/IDE/Project/ResourcesInUseHelper.h

@@ -38,12 +38,15 @@ class ResourcesInUseHelper : public gd::ArbitraryResourceWorker {
   std::set<gd::String>& GetAllImages() { return GetAll("image"); };
   std::set<gd::String>& GetAllFonts() { return GetAll("font"); };
   std::set<gd::String>& GetAllAudios() { return GetAll("audio"); };
+  std::set<gd::String>& GetAllBitmapFonts() { return GetAll("bitmapFont"); };
   std::set<gd::String>& GetAll(const gd::String& resourceType) {
     return resourceType == "image"
                ? allImages
                : (resourceType == "audio"
                       ? allAudios
-                      : (resourceType == "font") ? allFonts : emptyResources);
+                      : (resourceType == "font")
+                            ? allFonts
+                            : (resourceType == "bitmapFont") ? allBitmapFonts : emptyResources);
   };
 
   virtual void ExposeFile(gd::String& resource) override{
@@ -58,11 +61,15 @@ class ResourcesInUseHelper : public gd::ArbitraryResourceWorker {
   virtual void ExposeFont(gd::String& fontResourceName) override {
     allFonts.insert(fontResourceName);
   };
+  virtual void ExposeBitmapFont(gd::String& bitmapFontResourceName) override {
+    allBitmapFonts.insert(bitmapFontResourceName);
+  };
 
  protected:
   std::set<gd::String> allImages;
   std::set<gd::String> allAudios;
   std::set<gd::String> allFonts;
+  std::set<gd::String> allBitmapFonts;
   std::set<gd::String> emptyResources;
 };
 

Core/GDCore/IDE/WholeProjectRefactorer.cpp

@@ -4,15 +4,17 @@
  * reserved. This project is released under the MIT License.
  */
 #include "WholeProjectRefactorer.h"
+
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/IDE/DependenciesAnalyzer.h"
 #include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
 #include "GDCore/IDE/Events/EventsRefactorer.h"
-#include "GDCore/IDE/Events/ExpressionsRenamer.h"
 #include "GDCore/IDE/Events/ExpressionsParameterMover.h"
-#include "GDCore/IDE/Events/InstructionsTypeRenamer.h"
+#include "GDCore/IDE/Events/ExpressionsRenamer.h"
 #include "GDCore/IDE/Events/InstructionsParameterMover.h"
+#include "GDCore/IDE/Events/InstructionsTypeRenamer.h"
 #include "GDCore/IDE/EventsFunctionTools.h"
+#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
 #include "GDCore/Project/EventsBasedBehavior.h"
 #include "GDCore/Project/EventsFunctionsExtension.h"
 #include "GDCore/Project/ExternalEvents.h"
@@ -141,6 +143,13 @@ void WholeProjectRefactorer::ExposeProjectEvents(
   }
 }
 
+void WholeProjectRefactorer::ExposeProjectObjects(
+    gd::Project& project, gd::ArbitraryObjectsWorker& worker) {
+  worker.Launch(project);
+  for (size_t i = 0; i < project.GetLayoutsCount(); i++)
+    worker.Launch(project.GetLayout(i));
+};
+
 std::set<gd::String>
 WholeProjectRefactorer::GetAllObjectTypesUsingEventsBasedBehavior(
     const gd::Project& project,

Core/GDCore/IDE/WholeProjectRefactorer.h

@@ -16,6 +16,7 @@ class EventsFunction;
 class ObjectsContainer;
 class EventsBasedBehavior;
 class ArbitraryEventsWorker;
+class ArbitraryObjectsWorker;
 class ArbitraryEventsWorkerWithContext;
 }  // namespace gd
 
@@ -50,10 +51,21 @@ class GD_CORE_API WholeProjectRefactorer {
                                   gd::ArbitraryEventsWorkerWithContext& worker);
 
   /**
-   * \brief Refactor the project **before** an events function extension is renamed.
+   * \brief Call the specified worker on all ObjectContainers of the project (global,
+   * layouts...)
+   *
+   * This should be the preferred way to traverse all the objects of a project.
+   */
+  static void ExposeProjectObjects(
+      gd::Project& project, gd::ArbitraryObjectsWorker& worker);
+
+  /**
+   * \brief Refactor the project **before** an events function extension is
+   * renamed.
    *
    * \warning Do the renaming of the specified extension after calling this.
-   * This is because the extension is expected to have its old name for the refactoring.
+   * This is because the extension is expected to have its old name for the
+   * refactoring.
    */
   static void RenameEventsFunctionsExtension(
       gd::Project& project,
@@ -65,7 +77,8 @@ class GD_CORE_API WholeProjectRefactorer {
    * \brief Refactor the project **before** an events function is renamed.
    *
    * \warning Do the renaming of the specified function after calling this.
-   * This is because the function is expected to have its old name for the refactoring.
+   * This is because the function is expected to have its old name for the
+   * refactoring.
    */
   static void RenameEventsFunction(
       gd::Project& project,
@@ -78,7 +91,8 @@ class GD_CORE_API WholeProjectRefactorer {
    * renamed.
    *
    * \warning Do the renaming of the specified function after calling this.
-   * This is because the function is expected to have its old name for the refactoring.
+   * This is because the function is expected to have its old name for the
+   * refactoring.
    */
   static void RenameBehaviorEventsFunction(
       gd::Project& project,
@@ -91,8 +105,9 @@ class GD_CORE_API WholeProjectRefactorer {
    * \brief Refactor the project **before** an events function parameter
    * is moved.
    *
-   * \warning Do the move of the specified function parameters after calling this.
-   * This is because the function is expected to be in its old state for the refactoring.
+   * \warning Do the move of the specified function parameters after calling
+   * this. This is because the function is expected to be in its old state for
+   * the refactoring.
    */
   static void MoveEventsFunctionParameter(
       gd::Project& project,
@@ -102,11 +117,12 @@ class GD_CORE_API WholeProjectRefactorer {
       std::size_t newIndex);
 
   /**
-   * \brief Refactor the project **before** the parameter of an events function of a
-   * behavior is moved.
+   * \brief Refactor the project **before** the parameter of an events function
+   * of a behavior is moved.
    *
-   * \warning Do the move of the specified function parameters after calling this.
-   * This is because the function is expected to be in its old state for the refactoring.
+   * \warning Do the move of the specified function parameters after calling
+   * this. This is because the function is expected to be in its old state for
+   * the refactoring.
    */
   static void MoveBehaviorEventsFunctionParameter(
       gd::Project& project,
@@ -121,7 +137,8 @@ class GD_CORE_API WholeProjectRefactorer {
    * renamed.
    *
    * \warning Do the renaming of the specified property after calling this.
-   * This is because the property is expected to have its old name for the refactoring.
+   * This is because the property is expected to have its old name for the
+   * refactoring.
    */
   static void RenameBehaviorProperty(
       gd::Project& project,
@@ -134,7 +151,8 @@ class GD_CORE_API WholeProjectRefactorer {
    * \brief Refactor the project **before** a behavior is renamed.
    *
    * \warning Do the renaming of the specified behavior after calling this.
-   * This is because the behavior is expected to have its old name for the refactoring.
+   * This is because the behavior is expected to have its old name for the
+   * refactoring.
    */
   static void RenameEventsBasedBehavior(
       gd::Project& project,

Core/GDCore/Project/EventsFunction.cpp

@@ -17,6 +17,7 @@ void EventsFunction::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("fullName", fullName);
   element.SetAttribute("description", description);
   element.SetAttribute("sentence", sentence);
+  element.SetBoolAttribute("private", isPrivate);
   events.SerializeTo(element.AddChild("events"));
 
   gd::String functionTypeStr = "Action";
@@ -43,6 +44,7 @@ void EventsFunction::UnserializeFrom(gd::Project& project,
   fullName = element.GetStringAttribute("fullName");
   description = element.GetStringAttribute("description");
   sentence = element.GetStringAttribute("sentence");
+  isPrivate = element.GetBoolAttribute("private");
   events.UnserializeFrom(project, element.GetChild("events"));
 
   gd::String functionTypeStr = element.GetStringAttribute("functionType");

Core/GDCore/Project/EventsFunction.h

@@ -8,6 +8,7 @@
 #define GDCORE_EVENTSFUNCTION_H
 
 #include <vector>
+
 #include "GDCore/Events/EventsList.h"
 #include "GDCore/Project/ObjectGroupsContainer.h"
 #include "GDCore/String.h"
@@ -116,6 +117,19 @@ class GD_CORE_API EventsFunction {
    */
   FunctionType GetFunctionType() const { return functionType; };
 
+  /**
+   * \brief Returns true if the function is private.
+   */
+  bool IsPrivate() { return isPrivate; }
+
+  /**
+   * \brief Sets the privateness of the function.
+   */
+  EventsFunction& SetPrivate(bool _isPrivate) {
+    isPrivate = _isPrivate;
+    return *this;
+  }
+
   /**
    * \brief Return the events.
    */
@@ -128,7 +142,7 @@ class GD_CORE_API EventsFunction {
 
   /**
    * \brief Return the parameters of the function.
-   * 
+   *
    * \note During code/extension generation, new parameters are added
    * to the generated function, like "runtimeScene" and "eventsFunctionContext".
    * This should be transparent to the user.
@@ -143,12 +157,14 @@ class GD_CORE_API EventsFunction {
   std::vector<gd::ParameterMetadata>& GetParameters() { return parameters; };
 
   /**
-   * \brief Return a reference to the object groups that can be used in the function.
+   * \brief Return a reference to the object groups that can be used in the
+   * function.
    */
   ObjectGroupsContainer& GetObjectGroups() { return objectGroups; }
 
   /**
-   * \brief Return a const reference to the object groups that can be used in the function.
+   * \brief Return a const reference to the object groups that can be used in
+   * the function.
    */
   const ObjectGroupsContainer& GetObjectGroups() const { return objectGroups; }
 
@@ -176,6 +192,7 @@ class GD_CORE_API EventsFunction {
   FunctionType functionType;
   std::vector<gd::ParameterMetadata> parameters;
   gd::ObjectGroupsContainer objectGroups;
+  bool isPrivate = false;
 };
 
 }  // namespace gd

Core/GDCore/Project/EventsFunctionsExtension.cpp

@@ -59,6 +59,10 @@ void EventsFunctionsExtension::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("previewIconUrl", previewIconUrl);
   element.SetAttribute("iconUrl", iconUrl);
   element.SetAttribute("helpPath", helpPath);
+  auto& dependenciesElement = element.AddChild("dependencies");
+  dependenciesElement.ConsiderAsArray();
+  for (auto& dependency : dependencies)
+    SerializeDependencyTo(dependency, dependenciesElement.AddChild(""));
 
   SerializeEventsFunctionsTo(element.AddChild("eventsFunctions"));
   eventsBasedBehaviors.SerializeElementsTo(
@@ -95,6 +99,13 @@ void EventsFunctionsExtension::UnserializeFrom(
     }
   }
 
+  dependencies.clear();
+  const auto& dependenciesElement = element.GetChild("dependencies");
+  dependenciesElement.ConsiderAsArray();
+  for (size_t i = 0; i < dependenciesElement.GetChildrenCount(); ++i)
+    dependencies.push_back(
+        UnserializeDependencyFrom(dependenciesElement.GetChild(i)));
+
   UnserializeEventsFunctionsFrom(project, element.GetChild("eventsFunctions"));
   eventsBasedBehaviors.UnserializeElementsFrom(
       "eventsBasedBehavior", project, element.GetChild("eventsBasedBehaviors"));

Core/GDCore/Project/EventsFunctionsExtension.h

@@ -9,6 +9,7 @@
 
 #include <vector>
 
+#include "GDCore/Extensions/Metadata/DependencyMetadata.h"
 #include "GDCore/Project/EventsBasedBehavior.h"
 #include "GDCore/Project/EventsFunctionsContainer.h"
 #include "GDCore/String.h"
@@ -136,6 +137,35 @@ class GD_CORE_API EventsFunctionsExtension : public EventsFunctionsContainer {
     return eventsBasedBehaviors;
   }
 
+  /** \name Dependencies
+   */
+  ///@{
+
+  /**
+   * \brief Adds a new dependency.
+   */
+  gd::DependencyMetadata& AddDependency() {
+    gd::DependencyMetadata dependency;
+    dependencies.push_back(dependency);
+    return dependencies.back();
+  };
+
+  /**
+   * \brief Adds a new dependency.
+   */
+  void RemoveDependencyAt(size_t index) {
+    dependencies.erase(dependencies.begin() + index);
+  };
+
+  /**
+   * \brief Returns the list of dependencies.
+   */
+  std::vector<gd::DependencyMetadata>& GetAllDependencies() {
+    return dependencies;
+  };
+
+  ///@}
+
   /** \name Serialization
    */
   ///@{
@@ -165,6 +195,24 @@ class GD_CORE_API EventsFunctionsExtension : public EventsFunctionsContainer {
    */
   void Init(const gd::EventsFunctionsExtension& other);
 
+  void SerializeDependencyTo(const gd::DependencyMetadata& dependency,
+                             gd::SerializerElement& serializer) const {
+    serializer.SetStringAttribute("type", dependency.GetDependencyType());
+    serializer.SetStringAttribute("exportName", dependency.GetExportName());
+    serializer.SetStringAttribute("name", dependency.GetName());
+    serializer.SetStringAttribute("version", dependency.GetVersion());
+  }
+
+  gd::DependencyMetadata UnserializeDependencyFrom(
+      gd::SerializerElement& serializer) {
+    gd::DependencyMetadata dependency;
+    dependency.SetDependencyType(serializer.GetStringAttribute("type"));
+    dependency.SetExportName(serializer.GetStringAttribute("exportName"));
+    dependency.SetName(serializer.GetStringAttribute("name"));
+    dependency.SetVersion(serializer.GetStringAttribute("version"));
+    return dependency;
+  }
+
   gd::String version;
   gd::String extensionNamespace;
   gd::String shortDescription;
@@ -178,6 +226,7 @@ class GD_CORE_API EventsFunctionsExtension : public EventsFunctionsContainer {
   gd::String helpPath;  ///< The relative path to the help for this extension in
                         ///< the documentation (or an absolute URL).
   gd::SerializableWithNameList<EventsBasedBehavior> eventsBasedBehaviors;
+  std::vector<gd::DependencyMetadata> dependencies;
 };
 
 }  // namespace gd

Core/GDCore/Project/InitialInstance.cpp

@@ -48,17 +48,17 @@ void InitialInstance::UnserializeFrom(const SerializerElement& element) {
   persistentUuid = element.GetStringAttribute("persistentUuid");
   if (persistentUuid.empty()) ResetPersistentUuid();
 
-  floatInfos.clear();
-  const SerializerElement& floatPropElement =
+  numberProperties.clear();
+  const SerializerElement& numberPropertiesElement =
       element.GetChild("numberProperties", 0, "floatInfos");
-  floatPropElement.ConsiderAsArrayOf("property", "Info");
-  for (std::size_t j = 0; j < floatPropElement.GetChildrenCount(); ++j) {
-    gd::String name = floatPropElement.GetChild(j).GetStringAttribute("name");
-    float value = floatPropElement.GetChild(j).GetDoubleAttribute("value");
-    floatInfos[name] = value;
+  numberPropertiesElement.ConsiderAsArrayOf("property", "Info");
+  for (std::size_t j = 0; j < numberPropertiesElement.GetChildrenCount(); ++j) {
+    gd::String name = numberPropertiesElement.GetChild(j).GetStringAttribute("name");
+    double value = numberPropertiesElement.GetChild(j).GetDoubleAttribute("value");
+    numberProperties[name] = value;
   }
 
-  stringInfos.clear();
+  stringProperties.clear();
   const SerializerElement& stringPropElement =
       element.GetChild("stringProperties", 0, "stringInfos");
   stringPropElement.ConsiderAsArrayOf("property", "Info");
@@ -66,7 +66,7 @@ void InitialInstance::UnserializeFrom(const SerializerElement& element) {
     gd::String name = stringPropElement.GetChild(j).GetStringAttribute("name");
     gd::String value =
         stringPropElement.GetChild(j).GetStringAttribute("value");
-    stringInfos[name] = value;
+    stringProperties[name] = value;
   }
 
   GetVariables().UnserializeFrom(
@@ -88,26 +88,20 @@ void InitialInstance::SerializeTo(SerializerElement& element) const {
   if (persistentUuid.empty()) persistentUuid = UUID::MakeUuid4();
   element.SetStringAttribute("persistentUuid", persistentUuid);
 
-  SerializerElement& floatPropElement = element.AddChild("numberProperties");
-  floatPropElement.ConsiderAsArrayOf("property");
-  for (std::map<gd::String, float>::const_iterator floatInfo =
-           floatInfos.begin();
-       floatInfo != floatInfos.end();
-       ++floatInfo) {
-    floatPropElement.AddChild("property")
-        .SetAttribute("name", floatInfo->first)
-        .SetAttribute("value", floatInfo->second);
+  SerializerElement& numberPropertiesElement = element.AddChild("numberProperties");
+  numberPropertiesElement.ConsiderAsArrayOf("property");
+  for (const auto& property: numberProperties) {
+    numberPropertiesElement.AddChild("property")
+        .SetAttribute("name", property.first)
+        .SetAttribute("value", property.second);
   }
 
   SerializerElement& stringPropElement = element.AddChild("stringProperties");
   stringPropElement.ConsiderAsArrayOf("property");
-  for (std::map<gd::String, gd::String>::const_iterator stringInfo =
-           stringInfos.begin();
-       stringInfo != stringInfos.end();
-       ++stringInfo) {
+  for (const auto& property: stringProperties) {
     stringPropElement.AddChild("property")
-        .SetAttribute("name", stringInfo->first)
-        .SetAttribute("value", stringInfo->second);
+        .SetAttribute("name", property.first)
+        .SetAttribute("value", property.second);
   }
 
   GetVariables().SerializeTo(element.AddChild("initialVariables"));
@@ -146,28 +140,28 @@ bool InitialInstance::UpdateCustomProperty(const gd::String& name,
 
   return false;
 }
+#endif
 
-float InitialInstance::GetRawFloatProperty(const gd::String& name) const {
-  const auto& it = floatInfos.find(name);
-  return it != floatInfos.end() ? it->second : 0;
+double InitialInstance::GetRawDoubleProperty(const gd::String& name) const {
+  const auto& it = numberProperties.find(name);
+  return it != numberProperties.end() ? it->second : 0;
 }
 
 const gd::String& InitialInstance::GetRawStringProperty(
     const gd::String& name) const {
   if (!badStringProperyValue) badStringProperyValue = new gd::String("");
 
-  const auto& it = stringInfos.find(name);
-  return it != stringInfos.end() ? it->second : *badStringProperyValue;
+  const auto& it = stringProperties.find(name);
+  return it != stringProperties.end() ? it->second : *badStringProperyValue;
 }
 
-void InitialInstance::SetRawFloatProperty(const gd::String& name, float value) {
-  floatInfos[name] = value;
+void InitialInstance::SetRawDoubleProperty(const gd::String& name, double value) {
+  numberProperties[name] = value;
 }
 
 void InitialInstance::SetRawStringProperty(const gd::String& name,
                                            const gd::String& value) {
-  stringInfos[name] = value;
+  stringProperties[name] = value;
 }
-#endif
 
 }  // namespace gd

Core/GDCore/Project/InitialInstance.h

@@ -54,32 +54,32 @@ class GD_CORE_API InitialInstance {
   /**
    * \brief Get the X position of the instance
    */
-  float GetX() const { return x; }
+  double GetX() const { return x; }
 
   /**
    * \brief Set the X position of the instance
    */
-  void SetX(float x_) { x = x_; }
+  void SetX(double x_) { x = x_; }
 
   /**
    * \brief Get the Y position of the instance
    */
-  float GetY() const { return y; }
+  double GetY() const { return y; }
 
   /**
    * \brief Set the Y position of the instance
    */
-  void SetY(float y_) { y = y_; }
+  void SetY(double y_) { y = y_; }
 
   /**
    * \brief Get the rotation of the instance, in radians.
    */
-  float GetAngle() const { return angle; }
+  double GetAngle() const { return angle; }
 
   /**
    * \brief Set the rotation of the instance, in radians.
    */
-  void SetAngle(float angle_) { angle = angle_; }
+  void SetAngle(double angle_) { angle = angle_; }
 
   /**
    * \brief Get the Z order of the instance.
@@ -120,11 +120,11 @@ class GD_CORE_API InitialInstance {
     personalizedSize = hasCustomSize_;
   }
 
-  float GetCustomWidth() const { return width; }
-  void SetCustomWidth(float width_) { width = width_; }
+  double GetCustomWidth() const { return width; }
+  void SetCustomWidth(double width_) { width = width_; }
 
-  float GetCustomHeight() const { return height; }
-  void SetCustomHeight(float height_) { height = height_; }
+  double GetCustomHeight() const { return height; }
+  void SetCustomHeight(double height_) { height = height_; }
 
   /**
    * \brief Return true if the instance is locked and cannot be selected by
@@ -162,26 +162,29 @@ class GD_CORE_API InitialInstance {
   gd::VariablesContainer& GetVariables() { return initialVariables; }
   ///@}
 
-#if defined(GD_IDE_ONLY)
   /** \name Others properties management
    * Members functions related to exposing others properties of the instance.
    *
    * \note Extensions writers: even if we can define new types of object by
    * inheriting from gd::Object class, we cannot define new gd::InitialInstance
-   * classes. However, objects can store custom properties for their associated
-   * initial instances: these properties can be stored into floatInfos and
-   * stringInfos members. When the IDE want to get the custom properties, it
-   * will call GetProperties and UpdateProperty methods. These
-   * methods are here defined to forward the call to the gd::Object associated
-   * to the gd::InitialInstance. (by looking at the value returned by
-   * GetObjectName()).
+   * classes.
+   *
+   * However, objects can store custom properties for their associated
+   * initial instances. When the IDE want to get the custom properties, it
+   * will call `GetCustomProperties` and `UpdateCustomProperty` methods.
+   * These methods are here defined to forward the call to the gd::Object
+   * associated to the gd::InitialInstance (by looking at the value returned
+   * by GetObjectName()).
    *
    * \see gd::Object
    */
   ///@{
+#if defined(GD_IDE_ONLY)
   /**
    * \brief Return a map containing the properties names (as keys) and their
-   * values. \note Common properties ( name, position... ) do not need to be
+   * values.
+   *
+   * \note Common properties ( name, position... ) do not need to be
    * inserted in this map
    */
   std::map<gd::String, gd::PropertyDescriptor> GetCustomProperties(
@@ -196,15 +199,16 @@ class GD_CORE_API InitialInstance {
                             const gd::String& value,
                             gd::Project& project,
                             gd::Layout& layout);
+#endif
 
   /**
-   * \brief Get the value of a float property stored in the instance.
+   * \brief Get the value of a double property stored in the instance.
    * \note Only use this when \a GetCustomProperties is too slow (when rendering
    * instances for example).
    * \return the value of the property, or 0 if it does
    * not exists.
    */
-  float GetRawFloatProperty(const gd::String& name) const;
+  double GetRawDoubleProperty(const gd::String& name) const;
 
   /**
    * \brief Get the value of a string property stored in the instance.
@@ -216,16 +220,15 @@ class GD_CORE_API InitialInstance {
   const gd::String& GetRawStringProperty(const gd::String& name) const;
 
   /**
-   * \brief Set the value of a float property stored in the instance.
+   * \brief Set the value of a double property stored in the instance.
    */
-  void SetRawFloatProperty(const gd::String& name, float value);
+  void SetRawDoubleProperty(const gd::String& name, double value);
 
   /**
    * \brief Set the value of a string property stored in the instance.
    */
   void SetRawStringProperty(const gd::String& name, const gd::String& value);
 ///@}
-#endif
 
   /** \name Saving and loading
    * Members functions related to serialization.
@@ -248,22 +251,23 @@ class GD_CORE_API InitialInstance {
   InitialInstance& ResetPersistentUuid();
   ///@}
 
-  // More properties can be stored in floatInfos and stringInfos.
-  // These properties are then managed by the Object class.
-  std::map<gd::String, float>
-      floatInfos;  ///< More data which can be used by the object
-  std::map<gd::String, gd::String>
-      stringInfos;  ///< More data which can be used by the object
  private:
+  // More properties can be stored in numberProperties and stringProperties.
+  // These properties are then managed by the Object class.
+  std::map<gd::String, double>
+      numberProperties;  ///< More data which can be used by the object
+  std::map<gd::String, gd::String>
+      stringProperties;  ///< More data which can be used by the object
+
   gd::String objectName;  ///< Object name
-  float x;                ///< Object initial X position
-  float y;                ///< Object initial Y position
-  float angle;            ///< Object initial angle
+  double x;                ///< Object initial X position
+  double y;                ///< Object initial Y position
+  double angle;            ///< Object initial angle
   int zOrder;             ///< Object initial Z order
   gd::String layer;       ///< Object initial layer
   bool personalizedSize;  ///< True if object has a custom size
-  float width;            ///< Object custom width
-  float height;           ///< Object custom height
+  double width;            ///< Object custom width
+  double height;           ///< Object custom height
   gd::VariablesContainer initialVariables;  ///< Instance specific variables
   bool locked;                              ///< True if the instance is locked
   mutable gd::String persistentUuid; ///< A persistent random version 4 UUID, useful for hot reloading.

Core/GDCore/Project/Project.cpp

@@ -20,6 +20,7 @@
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/Extensions/PlatformExtension.h"
+#include "GDCore/IDE/Events/UsedExtensionsFinder.h"
 #include "GDCore/IDE/PlatformManager.h"
 #include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
 #include "GDCore/Project/EventsFunctionsExtension.h"
@@ -79,28 +80,6 @@ Project::Project()
 #endif
 {
   imageManager->SetResourcesManager(&resourcesManager);
-#if defined(GD_IDE_ONLY)
-  // Game use builtin extensions by default
-  extensionsUsed.push_back("BuiltinObject");
-  extensionsUsed.push_back("BuiltinAudio");
-  extensionsUsed.push_back("BuiltinVariables");
-  extensionsUsed.push_back("BuiltinTime");
-  extensionsUsed.push_back("BuiltinMouse");
-  extensionsUsed.push_back("BuiltinKeyboard");
-  extensionsUsed.push_back("BuiltinJoystick");
-  extensionsUsed.push_back("BuiltinCamera");
-  extensionsUsed.push_back("BuiltinWindow");
-  extensionsUsed.push_back("BuiltinFile");
-  extensionsUsed.push_back("BuiltinNetwork");
-  extensionsUsed.push_back("BuiltinScene");
-  extensionsUsed.push_back("BuiltinAdvanced");
-  extensionsUsed.push_back("Sprite");
-  extensionsUsed.push_back("BuiltinCommonInstructions");
-  extensionsUsed.push_back("BuiltinCommonConversions");
-  extensionsUsed.push_back("BuiltinStringInstructions");
-  extensionsUsed.push_back("BuiltinMathematicalTools");
-  extensionsUsed.push_back("BuiltinExternalLayouts");
-#endif
 
 #if !defined(GD_IDE_ONLY)
   platforms.push_back(&CppPlatform::Get());
@@ -651,18 +630,6 @@ void Project::UnserializeFrom(const SerializerElement& element) {
 
 #endif
 
-  const SerializerElement& extensionsElement =
-      propElement.GetChild("extensions", 0, "Extensions");
-  extensionsElement.ConsiderAsArrayOf("extension", "Extension");
-  for (std::size_t i = 0; i < extensionsElement.GetChildrenCount(); ++i) {
-    gd::String extensionName =
-        extensionsElement.GetChild(i).GetStringAttribute("name");
-    if (find(GetUsedExtensions().begin(),
-             GetUsedExtensions().end(),
-             extensionName) == GetUsedExtensions().end())
-      GetUsedExtensions().push_back(extensionName);
-  }
-
 #if defined(GD_IDE_ONLY)
   currentPlatform = NULL;
   gd::String currentPlatformName =
@@ -730,68 +697,6 @@ void Project::UnserializeFrom(const SerializerElement& element) {
 #endif
 // End of Compatibility code
 
-// Compatibility code
-#if defined(GD_IDE_ONLY)
-  if (VersionWrapper::IsOlderOrEqual(gdMajorVersion,
-                                     gdMinorVersion,
-                                     revision,
-                                     gdBuildVersion,
-                                     2,
-                                     2,
-                                     1,
-                                     10822)) {
-    if (std::find(GetUsedExtensions().begin(),
-                  GetUsedExtensions().end(),
-                  "BuiltinExternalLayouts") == GetUsedExtensions().end())
-      GetUsedExtensions().push_back("BuiltinExternalLayouts");
-  }
-#endif
-
-// Compatibility code
-#if defined(GD_IDE_ONLY)
-  if (VersionWrapper::IsOlderOrEqual(gdMajorVersion,
-                                     gdMinorVersion,
-                                     revision,
-                                     gdBuildVersion,
-                                     3,
-                                     3,
-                                     3,
-                                     0)) {
-    if (std::find(GetUsedExtensions().begin(),
-                  GetUsedExtensions().end(),
-                  "AStarBehavior") != GetUsedExtensions().end()) {
-      GetUsedExtensions().erase(std::remove(GetUsedExtensions().begin(),
-                                            GetUsedExtensions().end(),
-                                            "AStarBehavior"),
-                                GetUsedExtensions().end());
-      GetUsedExtensions().push_back("PathfindingBehavior");
-      updateText +=
-          _("The project is using the pathfinding behavior. This behavior has "
-            "been replaced by a new one:\n");
-      updateText +=
-          _("You must add the new 'Pathfinding' behavior to the objects that "
-            "need to be moved, and add the 'Pathfinding Obstacle' to the "
-            "objects that must act as obstacles.");
-    }
-  }
-#endif
-
-// Compatibility code
-#if defined(GD_IDE_ONLY)
-  if (VersionWrapper::IsOlderOrEqual(gdMajorVersion,
-                                     gdMinorVersion,
-                                     revision,
-                                     gdBuildVersion,
-                                     4,
-                                     0,
-                                     85,
-                                     0)) {
-    for (unsigned int i = 0; i < extensionsUsed.size(); ++i)
-      extensionsUsed[i] =
-          extensionsUsed[i].FindAndReplace("Automatism", "Behavior");
-  }
-#endif
-
 #if defined(GD_IDE_ONLY)
   GetObjectGroups().UnserializeFrom(
       element.GetChild("objectsGroups", 0, "ObjectGroups"));
@@ -917,12 +822,6 @@ void Project::SerializeTo(SerializerElement& element) const {
 
   extensionProperties.SerializeTo(propElement.AddChild("extensionProperties"));
 
-  SerializerElement& extensionsElement = propElement.AddChild("extensions");
-  extensionsElement.ConsiderAsArrayOf("extension");
-  for (std::size_t i = 0; i < GetUsedExtensions().size(); ++i)
-    extensionsElement.AddChild("extension")
-        .SetAttribute("name", GetUsedExtensions()[i]);
-
   SerializerElement& platformsElement = propElement.AddChild("platforms");
   platformsElement.ConsiderAsArrayOf("platform");
   for (std::size_t i = 0; i < platforms.size(); ++i) {
@@ -1121,7 +1020,6 @@ void Project::Init(const gd::Project& game) {
 
   currentPlatform = game.currentPlatform;
 #endif
-  extensionsUsed = game.extensionsUsed;
   platforms = game.platforms;
 
   resourcesManager = game.resourcesManager;

Core/GDCore/Project/Project.h

@@ -313,20 +313,6 @@ class GD_CORE_API Project : public ObjectsContainer {
    */
   void ResetProjectUuid();
 
-  /**
-   * Return a reference to the vector containing the names of extensions used by
-   * the project.
-   */
-  const std::vector<gd::String>& GetUsedExtensions() const {
-    return extensionsUsed;
-  };
-
-  /**
-   * Return a reference to the vector containing the names of extensions used by
-   * the project.
-   */
-  std::vector<gd::String>& GetUsedExtensions() { return extensionsUsed; };
-
 #if defined(GD_IDE_ONLY)
   /**
    * \brief Get the properties set by extensions.
@@ -1002,7 +988,6 @@ class GD_CORE_API Project : public ObjectsContainer {
   std::shared_ptr<gd::ImageManager>
       imageManager;  ///< Image manager is accessed thanks to a (smart) ptr as
                      ///< it can be shared with GD C++ Platform projects.
-  std::vector<gd::String> extensionsUsed;  ///< List of extensions used
   std::vector<gd::Platform*>
       platforms;  ///< Pointers to the platforms this project supports.
   gd::String firstLayout;

Core/GDCore/Project/ResourcesManager.cpp

@@ -80,6 +80,8 @@ std::shared_ptr<Resource> ResourcesManager::CreateResource(
     return std::make_shared<VideoResource>();
   else if (kind == "json")
     return std::make_shared<JsonResource>();
+  else if (kind == "bitmapFont")
+    return std::make_shared<BitmapFontResource>();
 
   std::cout << "Bad resource created (type: " << kind << ")" << std::endl;
   return std::make_shared<Resource>();
@@ -157,6 +159,28 @@ bool ImageResource::UpdateProperty(const gd::String& name,
   return true;
 }
 
+std::map<gd::String, gd::PropertyDescriptor> AudioResource::GetProperties() const {
+  std::map<gd::String, gd::PropertyDescriptor> properties;
+  properties[_("Preload as sound")]
+      .SetValue(preloadAsSound ? "true" : "false")
+      .SetType("Boolean");
+  properties[_("Preload as music")]
+      .SetValue(preloadAsMusic ? "true" : "false")
+      .SetType("Boolean");
+
+  return properties;
+}
+
+bool AudioResource::UpdateProperty(const gd::String& name,
+                                   const gd::String& value) {
+  if (name == _("Preload as sound"))
+    preloadAsSound = value == "1";
+  else if (name == _("Preload as music"))
+    preloadAsMusic = value == "1";
+
+  return true;
+}
+
 bool ResourcesManager::AddResource(const gd::Resource& resource) {
   if (HasResource(resource.GetName())) return false;
 
@@ -538,12 +562,16 @@ void AudioResource::SetFile(const gd::String& newFile) {
 void AudioResource::UnserializeFrom(const SerializerElement& element) {
   SetUserAdded(element.GetBoolAttribute("userAdded"));
   SetFile(element.GetStringAttribute("file"));
+  SetPreloadAsMusic(element.GetBoolAttribute("preloadAsMusic"));
+  SetPreloadAsSound(element.GetBoolAttribute("preloadAsSound"));
 }
 
 #if defined(GD_IDE_ONLY)
 void AudioResource::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("userAdded", IsUserAdded());
   element.SetAttribute("file", GetFile());
+  element.SetAttribute("preloadAsMusic", PreloadAsMusic());
+  element.SetAttribute("preloadAsSound", PreloadAsSound());
 }
 #endif
 
@@ -628,6 +656,26 @@ bool JsonResource::UpdateProperty(const gd::String& name,
 
 #endif
 
+void BitmapFontResource::SetFile(const gd::String& newFile) {
+  file = newFile;
+
+  // Convert all backslash to slashs.
+  while (file.find('\\') != gd::String::npos)
+    file.replace(file.find('\\'), 1, "/");
+}
+
+void BitmapFontResource::UnserializeFrom(const SerializerElement& element) {
+  SetUserAdded(element.GetBoolAttribute("userAdded"));
+  SetFile(element.GetStringAttribute("file"));
+}
+
+#if defined(GD_IDE_ONLY)
+void BitmapFontResource::SerializeTo(SerializerElement& element) const {
+  element.SetAttribute("userAdded", IsUserAdded());
+  element.SetAttribute("file", GetFile());
+}
+#endif
+
 #if defined(GD_IDE_ONLY)
 ResourceFolder::ResourceFolder(const ResourceFolder& other) { Init(other); }
 

Core/GDCore/Project/ResourcesManager.h

@@ -132,8 +132,7 @@ class GD_CORE_API Resource {
    *
    * \return false if the new value cannot be set
    */
-  virtual bool UpdateProperty(const gd::String& name,
-                              const gd::String& value) {
+  virtual bool UpdateProperty(const gd::String& name, const gd::String& value) {
     return false;
   };
 ///@}
@@ -191,8 +190,7 @@ class GD_CORE_API ImageResource : public Resource {
   virtual bool UseFile() override { return true; }
 
   std::map<gd::String, gd::PropertyDescriptor> GetProperties() const override;
-  bool UpdateProperty(const gd::String& name,
-                      const gd::String& value) override;
+  bool UpdateProperty(const gd::String& name, const gd::String& value) override;
 
   /**
    * \brief Serialize the object
@@ -229,7 +227,9 @@ class GD_CORE_API ImageResource : public Resource {
  */
 class GD_CORE_API AudioResource : public Resource {
  public:
-  AudioResource() : Resource() { SetKind("audio"); };
+  AudioResource() : Resource(), preloadAsMusic(false), preloadAsSound(false) {
+    SetKind("audio");
+  };
   virtual ~AudioResource(){};
   virtual AudioResource* Clone() const override {
     return new AudioResource(*this);
@@ -240,13 +240,39 @@ class GD_CORE_API AudioResource : public Resource {
 
 #if defined(GD_IDE_ONLY)
   virtual bool UseFile() override { return true; }
+
+  std::map<gd::String, gd::PropertyDescriptor> GetProperties() const override;
+  bool UpdateProperty(const gd::String& name, const gd::String& value) override;
+  
   void SerializeTo(SerializerElement& element) const override;
 #endif
 
   void UnserializeFrom(const SerializerElement& element) override;
 
+  /**
+   * \brief Return true if the audio resource should be preloaded as music.
+   */
+  bool PreloadAsMusic() const { return preloadAsMusic; }
+
+  /**
+   * \brief Set if the audio resource should be preloaded as music.
+   */
+  void SetPreloadAsMusic(bool enable = true) { preloadAsMusic = enable; }
+
+  /**
+   * \brief Return true if the audio resource should be preloaded as music.
+   */
+  bool PreloadAsSound() const { return preloadAsSound; }
+
+  /**
+   * \brief Set if the audio resource should be preloaded as music.
+   */
+  void SetPreloadAsSound(bool enable = true) { preloadAsSound = enable; }
+
  private:
   gd::String file;
+  bool preloadAsSound;
+  bool preloadAsMusic;
 };
 
 /**
@@ -326,8 +352,7 @@ class GD_CORE_API JsonResource : public Resource {
   virtual bool UseFile() override { return true; }
 
   std::map<gd::String, gd::PropertyDescriptor> GetProperties() const override;
-  bool UpdateProperty(const gd::String& name,
-                      const gd::String& value) override;
+  bool UpdateProperty(const gd::String& name, const gd::String& value) override;
 
   void SerializeTo(SerializerElement& element) const override;
 #endif
@@ -349,6 +374,34 @@ class GD_CORE_API JsonResource : public Resource {
   gd::String file;
 };
 
+/**
+ * \brief Describe a bitmap font file used by a project.
+ *
+ * \see Resource
+ * \ingroup ResourcesManagement
+ */
+class GD_CORE_API BitmapFontResource : public Resource {
+ public:
+  BitmapFontResource() : Resource() { SetKind("bitmapFont"); };
+  virtual ~BitmapFontResource(){};
+  virtual BitmapFontResource* Clone() const override {
+    return new BitmapFontResource(*this);
+  }
+
+  virtual const gd::String& GetFile() const override { return file; };
+  virtual void SetFile(const gd::String& newFile) override;
+
+#if defined(GD_IDE_ONLY)
+  virtual bool UseFile() override { return true; }
+  void SerializeTo(SerializerElement& element) const override;
+#endif
+
+  void UnserializeFrom(const SerializerElement& element) override;
+
+ private:
+  gd::String file;
+};
+
 /**
  * \brief Inventory all resources used by a project
  *

Core/GDCore/Project/Variable.cpp

@@ -7,38 +7,128 @@
 #include "GDCore/Project/Variable.h"
 
 #include <sstream>
+#include <cmath>
 
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/String.h"
-#include "GDCore/TinyXml/tinyxml.h"
 
 using namespace std;
 
 namespace gd {
 
-/**
- * Get value as a double
- */
+gd::Variable Variable::badVariable;
+
+gd::String Variable::TypeAsString(Type t) {
+  switch (t) {
+    case Type::String:
+      return "string";
+    case Type::Number:
+      return "number";
+    case Type::Boolean:
+      return "boolean";
+    case Type::Structure:
+      return "structure";
+    case Type::Array:
+      return "array";
+    default:
+      return "error-type";
+  }
+};
+
+Variable::Type Variable::StringAsType(const gd::String& str) {
+  if (str == "string")
+    return Type::String;
+  else if (str == "number")
+    return Type::Number;
+  else if (str == "boolean")
+    return Type::Boolean;
+  else if (str == "structure")
+    return Type::Structure;
+  else if (str == "array")
+    return Type::Array;
+
+  // Default to number
+  return Type::Number;
+}
+
+bool Variable::IsPrimitive(const Type type) {
+  return type == Type::String || type == Type::Number || type == Type::Boolean;
+}
+
+void Variable::CastTo(const Type newType) {
+  if (newType == Type::Number)
+    SetValue(GetValue());
+  else if (newType == Type::String)
+    SetString(GetString());
+  else if (newType == Type::Boolean)
+    SetBool(GetBool());
+  else if (newType == Type::Structure) {
+    children.clear();
+
+    // Conversion is only possible for non primitive types
+    if (type == Type::Array)
+      for (auto i = childrenArray.begin(); i != childrenArray.end(); ++i)
+        children.insert(
+            std::make_pair(gd::String::From(i - childrenArray.begin()), (*i)));
+
+    type = Type::Structure;
+    // Free now unused memory
+    childrenArray.clear();
+  } else if (newType == Type::Array) {
+    childrenArray.clear();
+
+    // Conversion is only possible for non primitive types
+    if (type == Type::Structure)
+      for (auto i = children.begin(); i != children.end(); ++i)
+        childrenArray.push_back((*i).second);
+
+    type = Type::Array;
+    // Free now unused memory
+    children.clear();
+  }
+}
+
 double Variable::GetValue() const {
-  if (!isNumber) {
-    value = str.To<double>();
-    isNumber = true;
+  if (type == Type::Number) {
+    return value;
+  } else if (type == Type::String) {
+    double retVal = str.To<double>();
+    if(std::isnan(retVal)) retVal = 0.0;
+    return retVal;
+  } else if (type == Type::Boolean) {
+    return boolVal ? 1.0 : 0.0;
   }
 
-  return value;
+  // It isn't possible to convert a non-primitive type to a number
+  return 0.0;
 }
 
 const gd::String& Variable::GetString() const {
-  if (isNumber) {
+  if (type == Type::Number)
     str = gd::String::From(value);
-    isNumber = false;
-  }
+  else if (type == Type::Boolean)
+    str = boolVal ? "1" : "0";
+  else if (type != Type::String)
+    str.clear();
 
   return str;
 }
 
+bool Variable::GetBool() const {
+  if (type == Type::Boolean) {
+    return boolVal;
+  } else if (type == Type::String) {
+    return !str.empty();
+  } else if (type == Type::Number) {
+    return value != 0;
+  }
+
+  // It isn't possible to convert a non-primitive type to a boolean
+  return false;
+}
+
 bool Variable::HasChild(const gd::String& name) const {
-  return isStructure && children.find(name) != children.end();
+  return type == Type::Structure && children.find(name) != children.end();
 }
 
 /**
@@ -51,7 +141,7 @@ Variable& Variable::GetChild(const gd::String& name) {
   auto it = children.find(name);
   if (it != children.end()) return *it->second;
 
-  isStructure = true;
+  type = Type::Structure;
   children[name] = std::make_shared<gd::Variable>();
   return *children[name];
 }
@@ -66,20 +156,20 @@ const Variable& Variable::GetChild(const gd::String& name) const {
   auto it = children.find(name);
   if (it != children.end()) return *it->second;
 
-  isStructure = true;
+  type = Type::Structure;
   children[name] = std::make_shared<gd::Variable>();
   return *children[name];
 }
 
 void Variable::RemoveChild(const gd::String& name) {
-  if (!isStructure) return;
+  if (type != Type::Structure) return;
   children.erase(name);
-  isStructure = !children.empty();
 }
 
 bool Variable::RenameChild(const gd::String& oldName,
                            const gd::String& newName) {
-  if (!isStructure || !HasChild(oldName) || HasChild(newName)) return false;
+  if (type != Type::Structure || !HasChild(oldName) || HasChild(newName))
+    return false;
 
   children[newName] = children[oldName];
   children.erase(oldName);
@@ -87,15 +177,35 @@ bool Variable::RenameChild(const gd::String& oldName,
   return true;
 }
 
-void Variable::ClearChildren() {
-  if (!isStructure) return;
-  children.clear();
-}
+Variable& Variable::GetAtIndex(const size_t index) {
+  type = Type::Array;
+  while (childrenArray.size() <= index)
+    childrenArray.push_back(std::make_shared<gd::Variable>());
+  return *childrenArray[index];
+};
+
+const Variable& Variable::GetAtIndex(const size_t index) const {
+  if (childrenArray.size() <= index) return badVariable;
+  return *childrenArray.at(index);
+};
+
+Variable& Variable::PushNew() { return GetAtIndex(GetChildrenCount()); };
+
+void Variable::RemoveAtIndex(const size_t index) {
+  if (index >= childrenArray.size()) return;
+  childrenArray.erase(childrenArray.begin() + index);
+};
 
 void Variable::SerializeTo(SerializerElement& element) const {
-  if (!isStructure)
-    element.SetAttribute("value", GetString());
-  else {
+  element.SetStringAttribute("type", TypeAsString(GetType()));
+
+  if (type == Type::String) {
+    element.SetStringAttribute("value", GetString());
+  } else if (type == Type::Number) {
+    element.SetDoubleAttribute("value", GetValue());
+  } else if (type == Type::Boolean) {
+    element.SetBoolAttribute("value", GetBool());
+  } else if (type == Type::Structure) {
     SerializerElement& childrenElement = element.AddChild("children");
     childrenElement.ConsiderAsArrayOf("variable");
     for (auto i = children.begin(); i != children.end(); ++i) {
@@ -103,63 +213,54 @@ void Variable::SerializeTo(SerializerElement& element) const {
       variableElement.SetAttribute("name", i->first);
       i->second->SerializeTo(variableElement);
     }
+  } else if (type == Type::Array) {
+    SerializerElement& childrenElement = element.AddChild("children");
+    childrenElement.ConsiderAsArrayOf("variable");
+    for (auto child : childrenArray) {
+      child->SerializeTo(childrenElement.AddChild("variable"));
+    }
   }
 }
 
 void Variable::UnserializeFrom(const SerializerElement& element) {
-  isStructure = element.HasChild("children", "Children");
+  type = StringAsType(element.GetStringAttribute("type", "string"));
 
-  if (isStructure) {
+  // Compatibility with GD <= 5.0.0-beta102
+  // Before, everything was stored as strings.
+  // We can unserialize primitives as string as they can be converted from/to
+  // strings anyways, but structures cannot be converted from a string.
+  // If we detect children, but the type is primitive (meaning the default type
+  // is used as a type if missing), then it should be unserialized as a
+  // structure instead of a string.
+  if (element.HasChild("children", "Children") && IsPrimitive(type))
+    type = Type::Structure;
+  // end of compatibility code
+
+  if (IsPrimitive(type)) {
+    if (type == Type::String) {
+      SetString(element.GetStringAttribute("value", "0", "Value"));
+    } else if (type == Type::Number) {
+      SetValue(element.GetDoubleAttribute("value", 0.0, "Value"));
+    } else if (type == Type::Boolean) {
+      SetBool(element.GetBoolAttribute("value", false, "Value"));
+    }
+  } else {
     const SerializerElement& childrenElement =
         element.GetChild("children", 0, "Children");
     childrenElement.ConsiderAsArrayOf("variable", "Variable");
+    if (childrenElement.GetChildrenCount() == 0) return;
+
     for (int i = 0; i < childrenElement.GetChildrenCount(); ++i) {
       const SerializerElement& childElement = childrenElement.GetChild(i);
-      gd::String name = childElement.GetStringAttribute("name", "", "Name");
-      children[name] = std::make_shared<gd::Variable>();
-      children[name]->UnserializeFrom(childElement);
-    }
-  } else
-    SetString(element.GetStringAttribute("value", "", "Value"));
-}
-
-void Variable::SaveToXml(TiXmlElement* element) const {
-  if (!element) return;
-
-  if (!isStructure)
-    element->SetAttribute("Value", GetString().c_str());
-  else {
-    TiXmlElement* childrenElem = new TiXmlElement("Children");
-    element->LinkEndChild(childrenElem);
-    for (auto i = children.begin(); i != children.end(); ++i) {
-      TiXmlElement* variable = new TiXmlElement("Variable");
-      childrenElem->LinkEndChild(variable);
-
-      variable->SetAttribute("Name", i->first.c_str());
-      i->second->SaveToXml(variable);
+      if (type == Type::Structure) {
+        gd::String name = childElement.GetStringAttribute("name", "", "Name");
+        children[name] = std::make_shared<gd::Variable>();
+        children[name]->UnserializeFrom(childElement);
+      } else if (type == Type::Array)
+        PushNew().UnserializeFrom(childElement);
     }
   }
-}
-
-void Variable::LoadFromXml(const TiXmlElement* element) {
-  if (!element) return;
-
-  isStructure = element->FirstChildElement("Children") != NULL;
-
-  if (isStructure) {
-    const TiXmlElement* child =
-        element->FirstChildElement("Children")->FirstChildElement();
-    while (child) {
-      gd::String name =
-          child->Attribute("Name") ? child->Attribute("Name") : "";
-      children[name] = std::make_shared<gd::Variable>();
-      children[name]->LoadFromXml(child);
-
-      child = child->NextSiblingElement();
-    }
-  } else if (element->Attribute("Value"))
-    SetString(element->Attribute("Value"));
-}
+}  // namespace gd
 
 std::vector<gd::String> Variable::GetAllChildrenNames() const {
   std::vector<gd::String> names;
@@ -176,27 +277,37 @@ bool Variable::Contains(const gd::Variable& variableToSearch,
     if (it.second.get() == &variableToSearch) return true;
     if (recursive && it.second->Contains(variableToSearch, true)) return true;
   }
+  for (auto& it : childrenArray) {
+    if (it.get() == &variableToSearch) return true;
+    if (recursive && it->Contains(variableToSearch, true)) return true;
+  }
 
   return false;
 }
 
 void Variable::RemoveRecursively(const gd::Variable& variableToRemove) {
   for (auto it = children.begin(); it != children.end();) {
-    if (it->second.get() == &variableToRemove) {
+    if (it->second.get() == &variableToRemove)
       it = children.erase(it);
-    } else {
+    else {
       it->second->RemoveRecursively(variableToRemove);
       it++;
     }
   }
-  isStructure = !children.empty();
+  for (auto it = childrenArray.begin(); it != childrenArray.end();)
+    if (it->get() == &variableToRemove)
+      childrenArray.erase(it);
+    else {
+      (*it)->RemoveRecursively(variableToRemove);
+      it++;
+    };
 }
 
 Variable::Variable(const Variable& other)
     : value(other.value),
       str(other.str),
-      isNumber(other.isNumber),
-      isStructure(other.isStructure) {
+      boolVal(other.boolVal),
+      type(other.type) {
   CopyChildren(other);
 }
 
@@ -204,8 +315,8 @@ Variable& Variable::operator=(const Variable& other) {
   if (this != &other) {
     value = other.value;
     str = other.str;
-    isNumber = other.isNumber;
-    isStructure = other.isStructure;
+    boolVal = other.boolVal;
+    type = other.type;
     CopyChildren(other);
   }
 
@@ -217,5 +328,8 @@ void Variable::CopyChildren(const gd::Variable& other) {
   for (auto& it : other.children) {
     children[it.first] = std::make_shared<gd::Variable>(*it.second);
   }
+  for (auto child : other.childrenArray) {
+    childrenArray.push_back(std::make_shared<gd::Variable>(*child.get()));
+  }
 }
 }  // namespace gd

Core/GDCore/Project/Variable.h

@@ -8,11 +8,12 @@
 #define GDCORE_VARIABLE_H
 #include <map>
 #include <memory>
+#include <vector>
+
 #include "GDCore/String.h"
 namespace gd {
 class SerializerElement;
 }
-class TiXmlElement;
 
 namespace gd {
 
@@ -26,18 +27,49 @@ namespace gd {
  */
 class GD_CORE_API Variable {
  public:
+  static gd::Variable badVariable;
+  enum Type {
+    // Primitive types
+    String,
+    Number,
+    Boolean,
+
+    // Collection types
+    Structure,
+    Array
+  };
+
+  /**
+   * \brief Returns true if the passed type is primitive
+   */
+  static bool IsPrimitive(const Type type);
+
   /**
    * \brief Default constructor creating a variable with 0 as value.
    */
-  Variable() : value(0), isNumber(true), isStructure(false){};
+  Variable() : value(0), type(Type::Number){};
   Variable(const Variable&);
   virtual ~Variable(){};
 
   Variable& operator=(const Variable& rhs);
 
-  /** \name Number or string
-   * Methods and operators used when the variable is considered as a number or a
-   * string.
+  /**
+   * \brief Get the type of the variable.
+   */
+  Type GetType() const { return type; }
+
+  /**
+   * \brief Converts the variable to a new type.
+   */
+  void CastTo(const Type newType);
+
+  /**
+   * \brief Converts the variable to a new type.
+   */
+  void CastTo(const gd::String& type) { return CastTo(StringAsType(type)); };
+
+  /** \name Primitives
+   * Methods and operators used when the variable is considered as a primitive.
    */
   ///@{
 
@@ -51,8 +83,7 @@ class GD_CORE_API Variable {
    */
   void SetString(const gd::String& newStr) {
     str = newStr;
-    isNumber = false;
-    isStructure = false;
+    type = Type::String;
   }
 
   /**
@@ -65,8 +96,20 @@ class GD_CORE_API Variable {
    */
   void SetValue(double val) {
     value = val;
-    isNumber = true;
-    isStructure = false;
+    type = Type::Number;
+  }
+
+  /**
+   * \brief Return the content of the variable, considered as a boolean.
+   */
+  bool GetBool() const;
+
+  /**
+   * \brief Change the content of the variable, considered as a boolean.
+   */
+  void SetBool(bool val) {
+    boolVal = val;
+    type = Type::Boolean;
   }
 
   // Operators are overloaded to allow accessing to variable using a simple
@@ -84,6 +127,20 @@ class GD_CORE_API Variable {
   bool operator==(double val) const { return GetValue() == val; };
   bool operator!=(double val) const { return GetValue() != val; };
 
+  // Avoid ambiguous operators
+  void operator=(int val) { SetValue(val); };
+  void operator+=(int val) { SetValue(val + GetValue()); }
+  void operator-=(int val) { SetValue(GetValue() - val); }
+  void operator*=(int val) { SetValue(val * GetValue()); }
+  void operator/=(int val) { SetValue(GetValue() / val); }
+
+  bool operator<=(int val) const { return GetValue() <= val; };
+  bool operator>=(int val) const { return GetValue() >= val; };
+  bool operator<(int val) const { return GetValue() < val; };
+  bool operator>(int val) const { return GetValue() > val; };
+  bool operator==(int val) const { return GetValue() == val; };
+  bool operator!=(int val) const { return GetValue() != val; };
+
   // Operators are overloaded to allow accessing to variable using a simple
   // string-like semantic.
   void operator=(const gd::String& val) { SetString(val); };
@@ -92,22 +149,48 @@ class GD_CORE_API Variable {
   bool operator==(const gd::String& val) const { return GetString() == val; };
   bool operator!=(const gd::String& val) const { return GetString() != val; };
 
-  /**
-   * \brief Return true if the variable is a number
-   */
-  bool IsNumber() const { return !isStructure && isNumber; }
+  // Avoid ambiguous operators
+  void operator=(const char* val) { SetString(val); };
+  void operator+=(const char* val) { SetString(GetString() + val); }
+
+  bool operator==(const char* val) const { return GetString() == val; };
+  bool operator!=(const char* val) const { return GetString() != val; };
+
+  // Operators are overloaded to allow accessing to variable using a simple
+  // bool-like semantic.
+  void operator=(const bool val) { SetBool(val); };
+
+  bool operator==(const bool val) const { return GetBool() == val; };
+  bool operator!=(const bool val) const { return GetBool() != val; };
+
   ///@}
 
+  /** \name Collection types
+   * Methods used for collection types
+   */
+  ///@{
+
+  /**
+   * \brief Remove all the children.
+   */
+  void ClearChildren() {
+    children.clear();
+    childrenArray.clear();
+  };
+
+  /**
+   * \brief Get the count of children that the variable has.
+   */
+  size_t GetChildrenCount() const {
+    return type == Type::Structure
+               ? children.size()
+               : type == Type::Array ? childrenArray.size() : 0;
+  };
+
   /** \name Structure
    * Methods used when the variable is considered as a structure.
    */
   ///@{
-
-  /**
-   * \brief Return true if the variable is a structure which can have children.
-   */
-  bool IsStructure() const { return isStructure; }
-
   /**
    * \brief Return true if the variable is a structure and has the specified
    * child.
@@ -147,18 +230,6 @@ class GD_CORE_API Variable {
    */
   bool RenameChild(const gd::String& oldName, const gd::String& newName);
 
-  /**
-   * \brief Remove all the children.
-   *
-   * If the variable is not a structure, nothing is done.
-   */
-  void ClearChildren();
-
-  /**
-   * \brief Get the count of children that the variable has.
-   */
-  size_t GetChildrenCount() const { return children.size(); };
-
   /**
    * \brief Get the names of all children
    */
@@ -183,20 +254,52 @@ class GD_CORE_API Variable {
   void RemoveRecursively(const gd::Variable& variableToRemove);
   ///@}
 
+  /** \name Array
+   * Methods used when the variable is considered as an array.
+   */
+  ///@{
+
+  /**
+   * \brief Return the element with the specified index.
+   *
+   * If the variable does not have the specified index,
+   * the array will be filled up to that index with empty variables.
+   */
+  Variable& GetAtIndex(const size_t index);
+
+  /**
+   * \brief Return the element with the specified index.
+   *
+   * If the variable has not the specified child,
+   * an empty variable is returned.
+   */
+  const Variable& GetAtIndex(const size_t index) const;
+
+  /**
+   * \brief Appends a new variable at the end of the list and returns it.
+   */
+  Variable& PushNew();
+
+  /**
+   * \brief Remove the element with the specified index.
+   *
+   * And shifts all the next elements back by one.
+   */
+  void RemoveAtIndex(const size_t index);
+
+  /**
+   * \brief Get the vector containing all the children.
+   */
+  const std::vector<std::shared_ptr<Variable>>& GetAllChildrenArray() const {
+    return childrenArray;
+  }
+  ///@}
+  ///@}
+
   /** \name Serialization
    * Methods used when to load or save a variable to XML.
    */
   ///@{
-  /**
-   * Called to save the variable to a TiXmlElement.
-   */
-  void SaveToXml(TiXmlElement* element) const;
-
-  /**
-   * Called to load the variable from a TiXmlElement.
-   */
-  void LoadFromXml(const TiXmlElement* element);
-
   /**
    * \brief Serialize variable.
    */
@@ -209,14 +312,25 @@ class GD_CORE_API Variable {
   ///@}
 
  private:
-  mutable double value;
+  /**
+   * \brief Converts a Type to a string.
+   */
+  static gd::String TypeAsString(Type t);
+
+  /**
+   * \brief Converts a string to a Type.
+   */
+  static Type StringAsType(const gd::String& str);
+
+  mutable Type type;
   mutable gd::String str;
-  mutable bool isNumber;     ///< True if the type of the variable is a number.
-  mutable bool isStructure;  ///< False when the variable is a primitive ( i.e:
-                             ///< Number or String ), true when it is a
-                             ///< structure and has may have children.
+  mutable double value;
+  mutable bool boolVal;
   mutable std::map<gd::String, std::shared_ptr<Variable>>
       children;  ///< Children, when the variable is considered as a structure.
+  mutable std::vector<std::shared_ptr<Variable>>
+      childrenArray;  ///< Children, when the variable is considered as an
+                      ///< array.
 
   /**
    * Initialize children by copying them from another variable.  Used by

Core/GDCore/Serialization/Serializer.cpp

@@ -5,17 +5,24 @@
  */
 
 #include "GDCore/Serialization/Serializer.h"
+
 #include <iomanip>
 #include <iostream>
 #include <string>
 #include <utility>
 #include <vector>
+
 #include "GDCore/CommonTools.h"
 #include "GDCore/Serialization/SerializerElement.h"
+#include "rapidjson/document.h"
+#include "rapidjson/prettywriter.h"
+#include "rapidjson/rapidjson.h"
 #if !defined(EMSCRIPTEN)
 #include "GDCore/TinyXml/tinyxml.h"
 #endif
 
+using namespace rapidjson;
+
 namespace gd {
 
 #if !defined(EMSCRIPTEN)
@@ -104,401 +111,120 @@ gd::String Serializer::ToEscapedXMLString(const gd::String& str) {
 }
 
 namespace {
-
-/**
- * Adapted from public domain library "jsoncpp"
- * (http://sourceforge.net/projects/jsoncpp/).
- */
-static inline bool isControlCharacter(char ch) { return ch > 0 && ch <= 0x1F; }
-
-/**
- * Adapted from public domain library "jsoncpp"
- * (http://sourceforge.net/projects/jsoncpp/).
- */
-static bool containsControlCharacter(const char* str) {
-  while (*str) {
-    if (isControlCharacter(*(str++))) return true;
-  }
-  return false;
-}
-
-/**
- * Tool function converting a string to a quoted string that can be inserted
- * into a JSON file. Adapted from public domain library "jsoncpp"
- * (http://sourceforge.net/projects/jsoncpp/).
- */
-gd::String StringToQuotedJSONString(const char* value) {
-  if (value == NULL) return "";
-  // Not sure how to handle unicode...
-  if (strpbrk(value, "\"\\\b\f\n\r\t") == NULL &&
-      !containsControlCharacter(value))
-    return gd::String("\"") + value + "\"";
-  // We have to walk value and escape any special characters.
-  // Appending to std::string is not efficient, but this should be rare.
-  // (Note: forward slashes are *not* rare, but I am not escaping them.)
-  std::string::size_type maxsize =
-      strlen(value) * 2 + 3;  // allescaped+quotes+NULL
-  std::string result;
-  result.reserve(maxsize);  // to avoid lots of mallocs
-  result += "\"";
-  for (const char* c = value; *c != 0; ++c) {
-    switch (*c) {
-      case '\"':
-        result += "\\\"";
-        break;
-      case '\\':
-        result += "\\\\";
-        break;
-      case '\b':
-        result += "\\b";
-        break;
-      case '\f':
-        result += "\\f";
-        break;
-      case '\n':
-        result += "\\n";
-        break;
-      case '\r':
-        result += "\\r";
-        break;
-      case '\t':
-        result += "\\t";
-        break;
-      // case '/':
-      // Even though \/ is considered a legal escape in JSON, a bare
-      // slash is also legal, so I see no reason to escape it.
-      // (I hope I am not misunderstanding something.
-      // blep notes: actually escaping \/ may be useful in javascript to avoid
-      // </ sequence. Should add a flag to allow this compatibility mode and
-      // prevent this sequence from occurring.
-      default:
-        if (isControlCharacter(*c)) {
-          std::ostringstream oss;
-          oss << "\\u" << std::hex << std::uppercase << std::setfill('0')
-              << std::setw(4) << static_cast<int>(*c);
-          result += oss.str();
-        } else {
-          result += *c;
-        }
-        break;
+void RapidJsonValueToElement(const Value& value,
+                             gd::SerializerElement& element) {
+  if (value.IsBool()) {
+    element.SetBoolValue(value.GetBool());
+  } else if (value.IsNumber()) {
+    if (value.IsInt64())
+      element.SetIntValue(value.GetInt64());
+    else if (value.IsUint64())
+      element.SetIntValue(value.GetUint64());
+    else if (value.IsInt())
+      element.SetValue(value.GetInt());
+    else if (value.IsUint())
+      element.SetValue(value.GetUint());
+    else if (value.IsDouble())
+      element.SetValue(value.GetDouble());
+    else if (value.IsFloat())
+      element.SetValue(value.GetFloat());
+  } else if (value.IsString()) {
+    element.SetStringValue(value.GetString());
+  } else if (value.IsObject()) {
+    for (auto& m : value.GetObject()) {
+      RapidJsonValueToElement(m.value, element.AddChild(m.name.GetString()));
     }
-  }
-  result += "\"";
-  return gd::String::FromUTF8(result);
-}
-
-gd::String ValueToJSON(const SerializerValue& val) {
-  if (val.IsBoolean())
-    return val.GetBool() ? "true" : "false";
-  else if (val.IsInt())
-    return gd::String::From(val.GetInt());
-  else if (val.IsDouble())
-    return gd::String::From(val.GetDouble());
-  else
-    return StringToQuotedJSONString(val.GetString().c_str());
-}
-}  // namespace
-
-gd::String Serializer::ToJSON(const SerializerElement& element) {
-  if (element.IsValueUndefined()) {
-    if (element.ConsideredAsArray()) {
-      // Store the element as an array in JSON:
-      gd::String str = "[";
-      bool firstChild = true;
-
-      if (element.GetAllAttributes().size() > 0) {
-        std::cout << "ERROR: A SerializerElement is considered as an array of "
-                  << (element.ConsideredAsArrayOf().empty()
-                          ? "[unnamed elements]"
-                          : element.ConsideredAsArrayOf())
-                  << " but has attributes. These attributes won't be saved!"
-                  << std::endl;
-      }
-
-      const std::vector<
-          std::pair<gd::String, std::shared_ptr<SerializerElement> > >&
-          children = element.GetAllChildren();
-      for (size_t i = 0; i < children.size(); ++i) {
-        if (children[i].second == std::shared_ptr<SerializerElement>())
-          continue;
-        if (children[i].first != element.ConsideredAsArrayOf()) {
-          std::cout
-              << "ERROR: A SerializerElement is considered as an array of "
-              << (element.ConsideredAsArrayOf().empty()
-                      ? "[unnamed elements]"
-                      : element.ConsideredAsArrayOf())
-              << " but has a child called \"" << children[i].first
-              << "\". This child won't be saved!" << std::endl;
-          continue;
-        }
-
-        if (!firstChild) str += ",";
-        str += ToJSON(*children[i].second);
-
-        firstChild = false;
-      }
-
-      str += "]";
-      return str;
-    } else {
-      gd::String str = "{";
-      bool firstChild = true;
-
-      const std::map<gd::String, SerializerValue>& attributes =
-          element.GetAllAttributes();
-      for (std::map<gd::String, SerializerValue>::const_iterator it =
-               attributes.begin();
-           it != attributes.end();
-           ++it) {
-        if (!firstChild) str += ",";
-        str += StringToQuotedJSONString(it->first.c_str()) + ": " +
-               ValueToJSON(it->second);
-
-        firstChild = false;
-      }
-
-      const std::vector<
-          std::pair<gd::String, std::shared_ptr<SerializerElement> > >&
-          children = element.GetAllChildren();
-      for (size_t i = 0; i < children.size(); ++i) {
-        if (children[i].second == std::shared_ptr<SerializerElement>())
-          continue;
-
-        if (attributes.find(children[i].first) != attributes.end()) {
-          std::cout << "ERROR: An attribute and a children called \""
-                    << children[i].first
-                    << "\" both exist. The children will erase the attribute - "
-                       "fix the usage of the attribute or (better) use "
-                       "children methods only."
-                    << std::endl;
-        }
-
-        if (!firstChild) str += ",";
-        str += StringToQuotedJSONString(children[i].first.c_str()) + ": " +
-               ToJSON(*children[i].second);
-
-        firstChild = false;
-      }
-
-      str += "}";
-      return str;
-    }
-  } else {
-    return ValueToJSON(element.GetValue());
-  }
-}
-
-// Private functions for JSON parsing
-namespace {
-size_t SkipBlankChar(const std::string& str, size_t pos) {
-  const std::string blankChar = " \n";
-  return str.find_first_not_of(blankChar, pos);
-}
-
-/**
- * Adapted from https://github.com/hjiang/jsonxx
- */
-std::string DecodeString(const std::string& original) {
-  std::string value;
-  value.reserve(original.size());
-  std::istringstream input("\"" + original + "\"");
-
-  char ch = '\0', delimiter = '"';
-  input.get(ch);
-  if (ch != delimiter) return "";
-
-  while (!input.eof() && input.good()) {
-    input.get(ch);
-    if (ch == delimiter) {
-      break;
-    }
-    if (ch == '\\') {
-      input.get(ch);
-      switch (ch) {
-        case '\\':
-        case '/':
-          value.push_back(ch);
-          break;
-        case 'b':
-          value.push_back('\b');
-          break;
-        case 'f':
-          value.push_back('\f');
-          break;
-        case 'n':
-          value.push_back('\n');
-          break;
-        case 'r':
-          value.push_back('\r');
-          break;
-        case 't':
-          value.push_back('\t');
-          break;
-        case 'u': {
-          int i;
-          std::stringstream ss;
-          for (i = 0; (!input.eof() && input.good()) && i < 4; ++i) {
-            input.get(ch);
-            ss << ch;
-          }
-          if (input.good() && (ss >> i)) value.push_back(i);
-        } break;
-        default:
-          if (ch != delimiter) {
-            value.push_back('\\');
-            value.push_back(ch);
-          } else
-            value.push_back(ch);
-          break;
-      }
-    } else {
-      value.push_back(ch);
-    }
-  }
-  if (input && ch == delimiter) {
-    return value;
-  } else {
-    return "";
-  }
-}
-
-/**
- * Return the position of the end of the string. Blank are skipped if necessary
- * @param str The string to be used
- * @param startPos The start position
- * @param strContent A reference to a string that will be filled with the string
- * content.
- */
-size_t SkipString(const std::string& str,
-                  size_t startPos,
-                  std::string& strContent) {
-  startPos = SkipBlankChar(str, startPos);
-  if (startPos >= str.length()) return std::string::npos;
-
-  size_t endPos = startPos;
-
-  if (str[startPos] == '"') {
-    if (startPos + 1 >= str.length()) return std::string::npos;
-
-    while (endPos == startPos || (str[endPos - 1] == '\\')) {
-      endPos = str.find_first_of('\"', endPos + 1);
-      if (endPos == std::string::npos)
-        return std::string::npos;  // Invalid string
-    }
-
-    strContent = DecodeString(str.substr(startPos + 1, endPos - 1 - startPos));
-    return endPos;
-  }
-
-  endPos = str.find_first_of(" \n,:");
-  if (endPos >= str.length()) return std::string::npos;  // Invalid string
-
-  strContent = DecodeString(str.substr(startPos, endPos - 1 - startPos));
-  return endPos - 1;
-}
-
-/**
- * Parse a JSON string, starting from pos, and storing the result into the
- * specified element. Note that the parsing is stopped as soon as a valid object
- * is parsed. \return The position at the end of the valid object stored into
- * the element.
- */
-size_t ParseJSONObject(const std::string& jsonStr,
-                       size_t startPos,
-                       gd::SerializerElement& element) {
-  size_t pos = SkipBlankChar(jsonStr, startPos);
-  if (pos >= jsonStr.length()) return std::string::npos;
-
-  if (jsonStr[pos] == '{')  // Object
-  {
-    bool firstChild = true;
-    while (firstChild || jsonStr[pos] == ',') {
-      pos++;
-      if (pos < jsonStr.length() && jsonStr[pos] == '}') break;
-
-      std::string childName;
-      pos = SkipString(jsonStr, pos, childName);
-
-      pos++;
-      pos = SkipBlankChar(jsonStr, pos);
-      if (pos >= jsonStr.length() || jsonStr[pos] != ':')
-        return std::string::npos;
-
-      pos++;
-      pos = ParseJSONObject(
-          jsonStr,
-          pos,
-          element.AddChild(gd::String::FromUTF8(childName).ReplaceInvalid()));
-
-      pos = SkipBlankChar(jsonStr, pos);
-      if (pos >= jsonStr.length()) return std::string::npos;
-      firstChild = false;
-    }
-
-    if (jsonStr[pos] != '}') {
-      std::cout << "Parsing error: Object not properly formed.";
-      return std::string::npos;
-    }
-    return pos + 1;
-  } else if (jsonStr[pos] == '[')  // Array
-  {
+  } else if (value.IsArray()) {
     element.ConsiderAsArray();
-    unsigned int index = 0;
-    while (index == 0 || jsonStr[pos] == ',') {
-      pos++;
-      if (pos < jsonStr.length() && jsonStr[pos] == ']') break;
-      pos = ParseJSONObject(jsonStr, pos, element.AddChild(""));
-
-      pos = SkipBlankChar(jsonStr, pos);
-      if (pos >= jsonStr.length()) {
-        std::cout << "Parsing error: element of array not properly formed.";
-        return std::string::npos;
-      }
-      index++;
+    for (auto& m : value.GetArray()) {
+      RapidJsonValueToElement(m, element.AddChild(""));
     }
+  }
+}
 
-    if (jsonStr[pos] != ']') {
-      std::cout << "Parsing error: array not properly ended";
-      return std::string::npos;
-    }
-    return pos + 1;
-  } else if (jsonStr[pos] == '"')  // String
-  {
-    std::string str;
-    pos = SkipString(jsonStr, pos, str);
-    if (pos >= jsonStr.length()) {
-      std::cout << "Parsing error: Invalid string";
-      return std::string::npos;
+void ElementToRapidJson(const gd::SerializerElement& element,
+                        Value& value,
+                        Document::AllocatorType& allocator) {
+  if (!element.IsValueUndefined()) {
+    const SerializerValue& serializerValue = element.GetValue();
+    // TODO: use GetRaw to avoid conversions
+    if (serializerValue.IsBoolean())
+      value.SetBool(serializerValue.GetBool());
+    else if (serializerValue.IsDouble())
+      value.SetDouble(serializerValue.GetDouble());
+    else if (serializerValue.IsInt())
+      value.SetInt(serializerValue.GetInt());
+    else if (serializerValue.IsString()) {
+      // This does a copy of the string, and measure the string length.
+      value.SetString(serializerValue.GetRawString().c_str(), allocator);
     }
+  } else if (element.ConsideredAsArray()) {
+    value.SetArray();
 
-    element.SetValue(gd::String::FromUTF8(str).ReplaceInvalid());
-    return pos + 1;
-  } else  // Number or boolean
-  {
-    std::string str;
-    size_t endPos = pos;
-    const std::string separators = " \n,}]";
-    while (endPos < jsonStr.length() &&
-           separators.find_first_of(jsonStr[endPos]) == std::string::npos) {
-      endPos++;
-    }
+    const auto& children = element.GetAllChildren();
+    value.Reserve(children.size(), allocator);
 
-    str = jsonStr.substr(pos, endPos - pos);
-    if (str == "true")
-      element.SetValue(true);
-    else if (str == "false")
-      element.SetValue(false);
-    else
-      element.SetValue(gd::String::FromUTF8(str).To<double>());
-    return endPos;
+    for (const auto& child : children) {
+      Value childValue;
+      ElementToRapidJson(*child.second, childValue, allocator);
+      value.PushBack(childValue, allocator);
+    }
+  } else {
+    value.SetObject();
+
+    const auto& attributes = element.GetAllAttributes();
+    const auto& children = element.GetAllChildren();
+
+    for (const auto& attribute : attributes) {
+      Value name(attribute.first.c_str(),
+                 allocator);  // Copying the name is required.
+      Value childValue;
+      ElementToRapidJson(attribute.second, childValue, allocator);
+      value.AddMember(name, childValue, allocator);
+    }
+    for (const auto& child : children) {
+      Value name(child.first.c_str(),
+                 allocator);  // Copying the name is required.
+      Value childValue;
+      ElementToRapidJson(*child.second, childValue, allocator);
+      value.AddMember(name, childValue, allocator);
+    }
   }
 }
 }  // namespace
 
-SerializerElement Serializer::FromJSON(const std::string& jsonStr) {
+SerializerElement Serializer::FromJSON(const char* json) {
   SerializerElement element;
-  if (!jsonStr.empty()) gd::ParseJSONObject(jsonStr, 0, element);
+  size_t len = strlen(json);
+  if (len != 0) {
+    Document document;
+
+    // In-situ parsing, decode strings directly in the source string. Source
+    // must be string.
+    char buffer[len + 1];
+    memcpy(buffer, json, len + 1);
+    if (document.ParseInsitu(buffer).HasParseError()) {
+      std::cout << "TODO: error while parsing" << std::endl;
+      return element;
+    }
+
+    RapidJsonValueToElement(document, element);
+  }
+
   return element;
 }
 
+gd::String Serializer::ToJSON(const SerializerElement& element) {
+  Document document;
+  Document::AllocatorType& allocator = document.GetAllocator();
+
+  ElementToRapidJson(element, document, allocator);
+
+  StringBuffer buffer;
+  Writer<StringBuffer> writer(buffer);
+  document.Accept(writer);
+
+  return buffer.GetString();  // Temporary copy
+}
+
 }  // namespace gd

Core/GDCore/Serialization/Serializer.h

@@ -19,7 +19,7 @@ namespace gd {
 class GD_CORE_API Serializer {
  public:
 /** \name XML serialization.
- * Serialize a SerializerElement from/to XML.
+ * Convert a gd::SerializerElement from/to XML.
  */
 ///@{
 #if !defined(EMSCRIPTEN)
@@ -34,7 +34,9 @@ class GD_CORE_API Serializer {
   ///@}
 
   /** \name JSON serialization.
-   * Serialize a SerializerElement from/to JSON.
+   * Convert a gd::SerializerElement from/to JSON.
+   * This uses RapidJSON for fast parsing and stringification.
+   * See https://github.com/miloyip/nativejson-benchmark
    */
   ///@{
   /**
@@ -42,13 +44,16 @@ class GD_CORE_API Serializer {
    */
   static gd::String ToJSON(const SerializerElement& element);
 
-  static SerializerElement FromJSON(const std::string& json);
+  /**
+   * \brief Construct a gd::SerializerElement from a JSON string.
+   */
+  static SerializerElement FromJSON(const char* json);
 
   /**
-   * \brief Parse a JSON string and returns a gd::SerializerElement for it.
+   * \brief Construct a gd::SerializerElement from a JSON string.
    */
   static SerializerElement FromJSON(const gd::String& json) {
-    return FromJSON(json.ToUTF8());
+    return FromJSON(json.c_str());
   }
   ///@}
 

Core/GDCore/Serialization/SerializerValue.h

@@ -61,6 +61,12 @@ class GD_CORE_API SerializerValue {
    */
   gd::String GetString() const;
 
+  /**
+   * Get the string value, without attempting any conversion.
+   * Make sure to check that IsString is true beforehand.
+   */
+  const gd::String& GetRawString() const { return stringValue; };
+
   /**
    * Get the value, its type being an int.
    */

Core/GDCore/Serialization/rapidjson/allocators.h

@@ -0,0 +1,271 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_ALLOCATORS_H_
+#define RAPIDJSON_ALLOCATORS_H_
+
+#include "rapidjson.h"
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+///////////////////////////////////////////////////////////////////////////////
+// Allocator
+
+/*! \class rapidjson::Allocator
+    \brief Concept for allocating, resizing and freeing memory block.
+    
+    Note that Malloc() and Realloc() are non-static but Free() is static.
+    
+    So if an allocator need to support Free(), it needs to put its pointer in 
+    the header of memory block.
+
+\code
+concept Allocator {
+    static const bool kNeedFree;    //!< Whether this allocator needs to call Free().
+
+    // Allocate a memory block.
+    // \param size of the memory block in bytes.
+    // \returns pointer to the memory block.
+    void* Malloc(size_t size);
+
+    // Resize a memory block.
+    // \param originalPtr The pointer to current memory block. Null pointer is permitted.
+    // \param originalSize The current size in bytes. (Design issue: since some allocator may not book-keep this, explicitly pass to it can save memory.)
+    // \param newSize the new size in bytes.
+    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize);
+
+    // Free a memory block.
+    // \param pointer to the memory block. Null pointer is permitted.
+    static void Free(void *ptr);
+};
+\endcode
+*/
+
+///////////////////////////////////////////////////////////////////////////////
+// CrtAllocator
+
+//! C-runtime library allocator.
+/*! This class is just wrapper for standard C library memory routines.
+    \note implements Allocator concept
+*/
+class CrtAllocator {
+public:
+    static const bool kNeedFree = true;
+    void* Malloc(size_t size) { 
+        if (size) //  behavior of malloc(0) is implementation defined.
+            return std::malloc(size);
+        else
+            return NULL; // standardize to returning NULL.
+    }
+    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize) {
+        (void)originalSize;
+        if (newSize == 0) {
+            std::free(originalPtr);
+            return NULL;
+        }
+        return std::realloc(originalPtr, newSize);
+    }
+    static void Free(void *ptr) { std::free(ptr); }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// MemoryPoolAllocator
+
+//! Default memory allocator used by the parser and DOM.
+/*! This allocator allocate memory blocks from pre-allocated memory chunks. 
+
+    It does not free memory blocks. And Realloc() only allocate new memory.
+
+    The memory chunks are allocated by BaseAllocator, which is CrtAllocator by default.
+
+    User may also supply a buffer as the first chunk.
+
+    If the user-buffer is full then additional chunks are allocated by BaseAllocator.
+
+    The user-buffer is not deallocated by this allocator.
+
+    \tparam BaseAllocator the allocator type for allocating memory chunks. Default is CrtAllocator.
+    \note implements Allocator concept
+*/
+template <typename BaseAllocator = CrtAllocator>
+class MemoryPoolAllocator {
+public:
+    static const bool kNeedFree = false;    //!< Tell users that no need to call Free() with this allocator. (concept Allocator)
+
+    //! Constructor with chunkSize.
+    /*! \param chunkSize The size of memory chunk. The default is kDefaultChunkSize.
+        \param baseAllocator The allocator for allocating memory chunks.
+    */
+    MemoryPoolAllocator(size_t chunkSize = kDefaultChunkCapacity, BaseAllocator* baseAllocator = 0) : 
+        chunkHead_(0), chunk_capacity_(chunkSize), userBuffer_(0), baseAllocator_(baseAllocator), ownBaseAllocator_(0)
+    {
+    }
+
+    //! Constructor with user-supplied buffer.
+    /*! The user buffer will be used firstly. When it is full, memory pool allocates new chunk with chunk size.
+
+        The user buffer will not be deallocated when this allocator is destructed.
+
+        \param buffer User supplied buffer.
+        \param size Size of the buffer in bytes. It must at least larger than sizeof(ChunkHeader).
+        \param chunkSize The size of memory chunk. The default is kDefaultChunkSize.
+        \param baseAllocator The allocator for allocating memory chunks.
+    */
+    MemoryPoolAllocator(void *buffer, size_t size, size_t chunkSize = kDefaultChunkCapacity, BaseAllocator* baseAllocator = 0) :
+        chunkHead_(0), chunk_capacity_(chunkSize), userBuffer_(buffer), baseAllocator_(baseAllocator), ownBaseAllocator_(0)
+    {
+        RAPIDJSON_ASSERT(buffer != 0);
+        RAPIDJSON_ASSERT(size > sizeof(ChunkHeader));
+        chunkHead_ = reinterpret_cast<ChunkHeader*>(buffer);
+        chunkHead_->capacity = size - sizeof(ChunkHeader);
+        chunkHead_->size = 0;
+        chunkHead_->next = 0;
+    }
+
+    //! Destructor.
+    /*! This deallocates all memory chunks, excluding the user-supplied buffer.
+    */
+    ~MemoryPoolAllocator() {
+        Clear();
+        RAPIDJSON_DELETE(ownBaseAllocator_);
+    }
+
+    //! Deallocates all memory chunks, excluding the user-supplied buffer.
+    void Clear() {
+        while (chunkHead_ && chunkHead_ != userBuffer_) {
+            ChunkHeader* next = chunkHead_->next;
+            baseAllocator_->Free(chunkHead_);
+            chunkHead_ = next;
+        }
+        if (chunkHead_ && chunkHead_ == userBuffer_)
+            chunkHead_->size = 0; // Clear user buffer
+    }
+
+    //! Computes the total capacity of allocated memory chunks.
+    /*! \return total capacity in bytes.
+    */
+    size_t Capacity() const {
+        size_t capacity = 0;
+        for (ChunkHeader* c = chunkHead_; c != 0; c = c->next)
+            capacity += c->capacity;
+        return capacity;
+    }
+
+    //! Computes the memory blocks allocated.
+    /*! \return total used bytes.
+    */
+    size_t Size() const {
+        size_t size = 0;
+        for (ChunkHeader* c = chunkHead_; c != 0; c = c->next)
+            size += c->size;
+        return size;
+    }
+
+    //! Allocates a memory block. (concept Allocator)
+    void* Malloc(size_t size) {
+        if (!size)
+            return NULL;
+
+        size = RAPIDJSON_ALIGN(size);
+        if (chunkHead_ == 0 || chunkHead_->size + size > chunkHead_->capacity)
+            if (!AddChunk(chunk_capacity_ > size ? chunk_capacity_ : size))
+                return NULL;
+
+        void *buffer = reinterpret_cast<char *>(chunkHead_) + RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + chunkHead_->size;
+        chunkHead_->size += size;
+        return buffer;
+    }
+
+    //! Resizes a memory block (concept Allocator)
+    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize) {
+        if (originalPtr == 0)
+            return Malloc(newSize);
+
+        if (newSize == 0)
+            return NULL;
+
+        originalSize = RAPIDJSON_ALIGN(originalSize);
+        newSize = RAPIDJSON_ALIGN(newSize);
+
+        // Do not shrink if new size is smaller than original
+        if (originalSize >= newSize)
+            return originalPtr;
+
+        // Simply expand it if it is the last allocation and there is sufficient space
+        if (originalPtr == reinterpret_cast<char *>(chunkHead_) + RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + chunkHead_->size - originalSize) {
+            size_t increment = static_cast<size_t>(newSize - originalSize);
+            if (chunkHead_->size + increment <= chunkHead_->capacity) {
+                chunkHead_->size += increment;
+                return originalPtr;
+            }
+        }
+
+        // Realloc process: allocate and copy memory, do not free original buffer.
+        if (void* newBuffer = Malloc(newSize)) {
+            if (originalSize)
+                std::memcpy(newBuffer, originalPtr, originalSize);
+            return newBuffer;
+        }
+        else
+            return NULL;
+    }
+
+    //! Frees a memory block (concept Allocator)
+    static void Free(void *ptr) { (void)ptr; } // Do nothing
+
+private:
+    //! Copy constructor is not permitted.
+    MemoryPoolAllocator(const MemoryPoolAllocator& rhs) /* = delete */;
+    //! Copy assignment operator is not permitted.
+    MemoryPoolAllocator& operator=(const MemoryPoolAllocator& rhs) /* = delete */;
+
+    //! Creates a new chunk.
+    /*! \param capacity Capacity of the chunk in bytes.
+        \return true if success.
+    */
+    bool AddChunk(size_t capacity) {
+        if (!baseAllocator_)
+            ownBaseAllocator_ = baseAllocator_ = RAPIDJSON_NEW(BaseAllocator());
+        if (ChunkHeader* chunk = reinterpret_cast<ChunkHeader*>(baseAllocator_->Malloc(RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + capacity))) {
+            chunk->capacity = capacity;
+            chunk->size = 0;
+            chunk->next = chunkHead_;
+            chunkHead_ =  chunk;
+            return true;
+        }
+        else
+            return false;
+    }
+
+    static const int kDefaultChunkCapacity = 64 * 1024; //!< Default chunk capacity.
+
+    //! Chunk header for perpending to each chunk.
+    /*! Chunks are stored as a singly linked list.
+    */
+    struct ChunkHeader {
+        size_t capacity;    //!< Capacity of the chunk in bytes (excluding the header itself).
+        size_t size;        //!< Current size of allocated memory in bytes.
+        ChunkHeader *next;  //!< Next chunk in the linked list.
+    };
+
+    ChunkHeader *chunkHead_;    //!< Head of the chunk linked-list. Only the head chunk serves allocation.
+    size_t chunk_capacity_;     //!< The minimum capacity of chunk when they are allocated.
+    void *userBuffer_;          //!< User supplied buffer.
+    BaseAllocator* baseAllocator_;  //!< base allocator for allocating memory chunks.
+    BaseAllocator* ownBaseAllocator_;   //!< base allocator created by this object.
+};
+
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_ENCODINGS_H_

Core/GDCore/Serialization/rapidjson/encodedstream.h

@@ -0,0 +1,299 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_ENCODEDSTREAM_H_
+#define RAPIDJSON_ENCODEDSTREAM_H_
+
+#include "stream.h"
+#include "memorystream.h"
+
+#ifdef __GNUC__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(effc++)
+#endif
+
+#ifdef __clang__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(padded)
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+//! Input byte stream wrapper with a statically bound encoding.
+/*!
+    \tparam Encoding The interpretation of encoding of the stream. Either UTF8, UTF16LE, UTF16BE, UTF32LE, UTF32BE.
+    \tparam InputByteStream Type of input byte stream. For example, FileReadStream.
+*/
+template <typename Encoding, typename InputByteStream>
+class EncodedInputStream {
+    RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+public:
+    typedef typename Encoding::Ch Ch;
+
+    EncodedInputStream(InputByteStream& is) : is_(is) { 
+        current_ = Encoding::TakeBOM(is_);
+    }
+
+    Ch Peek() const { return current_; }
+    Ch Take() { Ch c = current_; current_ = Encoding::Take(is_); return c; }
+    size_t Tell() const { return is_.Tell(); }
+
+    // Not implemented
+    void Put(Ch) { RAPIDJSON_ASSERT(false); }
+    void Flush() { RAPIDJSON_ASSERT(false); } 
+    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
+    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
+
+private:
+    EncodedInputStream(const EncodedInputStream&);
+    EncodedInputStream& operator=(const EncodedInputStream&);
+
+    InputByteStream& is_;
+    Ch current_;
+};
+
+//! Specialized for UTF8 MemoryStream.
+template <>
+class EncodedInputStream<UTF8<>, MemoryStream> {
+public:
+    typedef UTF8<>::Ch Ch;
+
+    EncodedInputStream(MemoryStream& is) : is_(is) {
+        if (static_cast<unsigned char>(is_.Peek()) == 0xEFu) is_.Take();
+        if (static_cast<unsigned char>(is_.Peek()) == 0xBBu) is_.Take();
+        if (static_cast<unsigned char>(is_.Peek()) == 0xBFu) is_.Take();
+    }
+    Ch Peek() const { return is_.Peek(); }
+    Ch Take() { return is_.Take(); }
+    size_t Tell() const { return is_.Tell(); }
+
+    // Not implemented
+    void Put(Ch) {}
+    void Flush() {} 
+    Ch* PutBegin() { return 0; }
+    size_t PutEnd(Ch*) { return 0; }
+
+    MemoryStream& is_;
+
+private:
+    EncodedInputStream(const EncodedInputStream&);
+    EncodedInputStream& operator=(const EncodedInputStream&);
+};
+
+//! Output byte stream wrapper with statically bound encoding.
+/*!
+    \tparam Encoding The interpretation of encoding of the stream. Either UTF8, UTF16LE, UTF16BE, UTF32LE, UTF32BE.
+    \tparam OutputByteStream Type of input byte stream. For example, FileWriteStream.
+*/
+template <typename Encoding, typename OutputByteStream>
+class EncodedOutputStream {
+    RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+public:
+    typedef typename Encoding::Ch Ch;
+
+    EncodedOutputStream(OutputByteStream& os, bool putBOM = true) : os_(os) { 
+        if (putBOM)
+            Encoding::PutBOM(os_);
+    }
+
+    void Put(Ch c) { Encoding::Put(os_, c);  }
+    void Flush() { os_.Flush(); }
+
+    // Not implemented
+    Ch Peek() const { RAPIDJSON_ASSERT(false); return 0;}
+    Ch Take() { RAPIDJSON_ASSERT(false); return 0;}
+    size_t Tell() const { RAPIDJSON_ASSERT(false);  return 0; }
+    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
+    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
+
+private:
+    EncodedOutputStream(const EncodedOutputStream&);
+    EncodedOutputStream& operator=(const EncodedOutputStream&);
+
+    OutputByteStream& os_;
+};
+
+#define RAPIDJSON_ENCODINGS_FUNC(x) UTF8<Ch>::x, UTF16LE<Ch>::x, UTF16BE<Ch>::x, UTF32LE<Ch>::x, UTF32BE<Ch>::x
+
+//! Input stream wrapper with dynamically bound encoding and automatic encoding detection.
+/*!
+    \tparam CharType Type of character for reading.
+    \tparam InputByteStream type of input byte stream to be wrapped.
+*/
+template <typename CharType, typename InputByteStream>
+class AutoUTFInputStream {
+    RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+public:
+    typedef CharType Ch;
+
+    //! Constructor.
+    /*!
+        \param is input stream to be wrapped.
+        \param type UTF encoding type if it is not detected from the stream.
+    */
+    AutoUTFInputStream(InputByteStream& is, UTFType type = kUTF8) : is_(&is), type_(type), hasBOM_(false) {
+        RAPIDJSON_ASSERT(type >= kUTF8 && type <= kUTF32BE);        
+        DetectType();
+        static const TakeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Take) };
+        takeFunc_ = f[type_];
+        current_ = takeFunc_(*is_);
+    }
+
+    UTFType GetType() const { return type_; }
+    bool HasBOM() const { return hasBOM_; }
+
+    Ch Peek() const { return current_; }
+    Ch Take() { Ch c = current_; current_ = takeFunc_(*is_); return c; }
+    size_t Tell() const { return is_->Tell(); }
+
+    // Not implemented
+    void Put(Ch) { RAPIDJSON_ASSERT(false); }
+    void Flush() { RAPIDJSON_ASSERT(false); } 
+    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
+    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
+
+private:
+    AutoUTFInputStream(const AutoUTFInputStream&);
+    AutoUTFInputStream& operator=(const AutoUTFInputStream&);
+
+    // Detect encoding type with BOM or RFC 4627
+    void DetectType() {
+        // BOM (Byte Order Mark):
+        // 00 00 FE FF  UTF-32BE
+        // FF FE 00 00  UTF-32LE
+        // FE FF        UTF-16BE
+        // FF FE        UTF-16LE
+        // EF BB BF     UTF-8
+
+        const unsigned char* c = reinterpret_cast<const unsigned char *>(is_->Peek4());
+        if (!c)
+            return;
+
+        unsigned bom = static_cast<unsigned>(c[0] | (c[1] << 8) | (c[2] << 16) | (c[3] << 24));
+        hasBOM_ = false;
+        if (bom == 0xFFFE0000)                  { type_ = kUTF32BE; hasBOM_ = true; is_->Take(); is_->Take(); is_->Take(); is_->Take(); }
+        else if (bom == 0x0000FEFF)             { type_ = kUTF32LE; hasBOM_ = true; is_->Take(); is_->Take(); is_->Take(); is_->Take(); }
+        else if ((bom & 0xFFFF) == 0xFFFE)      { type_ = kUTF16BE; hasBOM_ = true; is_->Take(); is_->Take();                           }
+        else if ((bom & 0xFFFF) == 0xFEFF)      { type_ = kUTF16LE; hasBOM_ = true; is_->Take(); is_->Take();                           }
+        else if ((bom & 0xFFFFFF) == 0xBFBBEF)  { type_ = kUTF8;    hasBOM_ = true; is_->Take(); is_->Take(); is_->Take();              }
+
+        // RFC 4627: Section 3
+        // "Since the first two characters of a JSON text will always be ASCII
+        // characters [RFC0020], it is possible to determine whether an octet
+        // stream is UTF-8, UTF-16 (BE or LE), or UTF-32 (BE or LE) by looking
+        // at the pattern of nulls in the first four octets."
+        // 00 00 00 xx  UTF-32BE
+        // 00 xx 00 xx  UTF-16BE
+        // xx 00 00 00  UTF-32LE
+        // xx 00 xx 00  UTF-16LE
+        // xx xx xx xx  UTF-8
+
+        if (!hasBOM_) {
+            unsigned pattern = (c[0] ? 1 : 0) | (c[1] ? 2 : 0) | (c[2] ? 4 : 0) | (c[3] ? 8 : 0);
+            switch (pattern) {
+            case 0x08: type_ = kUTF32BE; break;
+            case 0x0A: type_ = kUTF16BE; break;
+            case 0x01: type_ = kUTF32LE; break;
+            case 0x05: type_ = kUTF16LE; break;
+            case 0x0F: type_ = kUTF8;    break;
+            default: break; // Use type defined by user.
+            }
+        }
+
+        // Runtime check whether the size of character type is sufficient. It only perform checks with assertion.
+        if (type_ == kUTF16LE || type_ == kUTF16BE) RAPIDJSON_ASSERT(sizeof(Ch) >= 2);
+        if (type_ == kUTF32LE || type_ == kUTF32BE) RAPIDJSON_ASSERT(sizeof(Ch) >= 4);
+    }
+
+    typedef Ch (*TakeFunc)(InputByteStream& is);
+    InputByteStream* is_;
+    UTFType type_;
+    Ch current_;
+    TakeFunc takeFunc_;
+    bool hasBOM_;
+};
+
+//! Output stream wrapper with dynamically bound encoding and automatic encoding detection.
+/*!
+    \tparam CharType Type of character for writing.
+    \tparam OutputByteStream type of output byte stream to be wrapped.
+*/
+template <typename CharType, typename OutputByteStream>
+class AutoUTFOutputStream {
+    RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+public:
+    typedef CharType Ch;
+
+    //! Constructor.
+    /*!
+        \param os output stream to be wrapped.
+        \param type UTF encoding type.
+        \param putBOM Whether to write BOM at the beginning of the stream.
+    */
+    AutoUTFOutputStream(OutputByteStream& os, UTFType type, bool putBOM) : os_(&os), type_(type) {
+        RAPIDJSON_ASSERT(type >= kUTF8 && type <= kUTF32BE);
+
+        // Runtime check whether the size of character type is sufficient. It only perform checks with assertion.
+        if (type_ == kUTF16LE || type_ == kUTF16BE) RAPIDJSON_ASSERT(sizeof(Ch) >= 2);
+        if (type_ == kUTF32LE || type_ == kUTF32BE) RAPIDJSON_ASSERT(sizeof(Ch) >= 4);
+
+        static const PutFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Put) };
+        putFunc_ = f[type_];
+
+        if (putBOM)
+            PutBOM();
+    }
+
+    UTFType GetType() const { return type_; }
+
+    void Put(Ch c) { putFunc_(*os_, c); }
+    void Flush() { os_->Flush(); } 
+
+    // Not implemented
+    Ch Peek() const { RAPIDJSON_ASSERT(false); return 0;}
+    Ch Take() { RAPIDJSON_ASSERT(false); return 0;}
+    size_t Tell() const { RAPIDJSON_ASSERT(false); return 0; }
+    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
+    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
+
+private:
+    AutoUTFOutputStream(const AutoUTFOutputStream&);
+    AutoUTFOutputStream& operator=(const AutoUTFOutputStream&);
+
+    void PutBOM() { 
+        typedef void (*PutBOMFunc)(OutputByteStream&);
+        static const PutBOMFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(PutBOM) };
+        f[type_](*os_);
+    }
+
+    typedef void (*PutFunc)(OutputByteStream&, Ch);
+
+    OutputByteStream* os_;
+    UTFType type_;
+    PutFunc putFunc_;
+};
+
+#undef RAPIDJSON_ENCODINGS_FUNC
+
+RAPIDJSON_NAMESPACE_END
+
+#ifdef __clang__
+RAPIDJSON_DIAG_POP
+#endif
+
+#ifdef __GNUC__
+RAPIDJSON_DIAG_POP
+#endif
+
+#endif // RAPIDJSON_FILESTREAM_H_

Core/GDCore/Serialization/rapidjson/encodings.h

@@ -0,0 +1,716 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_ENCODINGS_H_
+#define RAPIDJSON_ENCODINGS_H_
+
+#include "rapidjson.h"
+
+#ifdef _MSC_VER
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(4244) // conversion from 'type1' to 'type2', possible loss of data
+RAPIDJSON_DIAG_OFF(4702)  // unreachable code
+#elif defined(__GNUC__)
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(effc++)
+RAPIDJSON_DIAG_OFF(overflow)
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+///////////////////////////////////////////////////////////////////////////////
+// Encoding
+
+/*! \class rapidjson::Encoding
+    \brief Concept for encoding of Unicode characters.
+
+\code
+concept Encoding {
+    typename Ch;    //! Type of character. A "character" is actually a code unit in unicode's definition.
+
+    enum { supportUnicode = 1 }; // or 0 if not supporting unicode
+
+    //! \brief Encode a Unicode codepoint to an output stream.
+    //! \param os Output stream.
+    //! \param codepoint An unicode codepoint, ranging from 0x0 to 0x10FFFF inclusively.
+    template<typename OutputStream>
+    static void Encode(OutputStream& os, unsigned codepoint);
+
+    //! \brief Decode a Unicode codepoint from an input stream.
+    //! \param is Input stream.
+    //! \param codepoint Output of the unicode codepoint.
+    //! \return true if a valid codepoint can be decoded from the stream.
+    template <typename InputStream>
+    static bool Decode(InputStream& is, unsigned* codepoint);
+
+    //! \brief Validate one Unicode codepoint from an encoded stream.
+    //! \param is Input stream to obtain codepoint.
+    //! \param os Output for copying one codepoint.
+    //! \return true if it is valid.
+    //! \note This function just validating and copying the codepoint without actually decode it.
+    template <typename InputStream, typename OutputStream>
+    static bool Validate(InputStream& is, OutputStream& os);
+
+    // The following functions are deal with byte streams.
+
+    //! Take a character from input byte stream, skip BOM if exist.
+    template <typename InputByteStream>
+    static CharType TakeBOM(InputByteStream& is);
+
+    //! Take a character from input byte stream.
+    template <typename InputByteStream>
+    static Ch Take(InputByteStream& is);
+
+    //! Put BOM to output byte stream.
+    template <typename OutputByteStream>
+    static void PutBOM(OutputByteStream& os);
+
+    //! Put a character to output byte stream.
+    template <typename OutputByteStream>
+    static void Put(OutputByteStream& os, Ch c);
+};
+\endcode
+*/
+
+///////////////////////////////////////////////////////////////////////////////
+// UTF8
+
+//! UTF-8 encoding.
+/*! http://en.wikipedia.org/wiki/UTF-8
+    http://tools.ietf.org/html/rfc3629
+    \tparam CharType Code unit for storing 8-bit UTF-8 data. Default is char.
+    \note implements Encoding concept
+*/
+template<typename CharType = char>
+struct UTF8 {
+    typedef CharType Ch;
+
+    enum { supportUnicode = 1 };
+
+    template<typename OutputStream>
+    static void Encode(OutputStream& os, unsigned codepoint) {
+        if (codepoint <= 0x7F) 
+            os.Put(static_cast<Ch>(codepoint & 0xFF));
+        else if (codepoint <= 0x7FF) {
+            os.Put(static_cast<Ch>(0xC0 | ((codepoint >> 6) & 0xFF)));
+            os.Put(static_cast<Ch>(0x80 | ((codepoint & 0x3F))));
+        }
+        else if (codepoint <= 0xFFFF) {
+            os.Put(static_cast<Ch>(0xE0 | ((codepoint >> 12) & 0xFF)));
+            os.Put(static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
+            os.Put(static_cast<Ch>(0x80 | (codepoint & 0x3F)));
+        }
+        else {
+            RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
+            os.Put(static_cast<Ch>(0xF0 | ((codepoint >> 18) & 0xFF)));
+            os.Put(static_cast<Ch>(0x80 | ((codepoint >> 12) & 0x3F)));
+            os.Put(static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
+            os.Put(static_cast<Ch>(0x80 | (codepoint & 0x3F)));
+        }
+    }
+
+    template<typename OutputStream>
+    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
+        if (codepoint <= 0x7F) 
+            PutUnsafe(os, static_cast<Ch>(codepoint & 0xFF));
+        else if (codepoint <= 0x7FF) {
+            PutUnsafe(os, static_cast<Ch>(0xC0 | ((codepoint >> 6) & 0xFF)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint & 0x3F))));
+        }
+        else if (codepoint <= 0xFFFF) {
+            PutUnsafe(os, static_cast<Ch>(0xE0 | ((codepoint >> 12) & 0xFF)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | (codepoint & 0x3F)));
+        }
+        else {
+            RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
+            PutUnsafe(os, static_cast<Ch>(0xF0 | ((codepoint >> 18) & 0xFF)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint >> 12) & 0x3F)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | (codepoint & 0x3F)));
+        }
+    }
+
+    template <typename InputStream>
+    static bool Decode(InputStream& is, unsigned* codepoint) {
+#define COPY() c = is.Take(); *codepoint = (*codepoint << 6) | (static_cast<unsigned char>(c) & 0x3Fu)
+#define TRANS(mask) result &= ((GetRange(static_cast<unsigned char>(c)) & mask) != 0)
+#define TAIL() COPY(); TRANS(0x70)
+        typename InputStream::Ch c = is.Take();
+        if (!(c & 0x80)) {
+            *codepoint = static_cast<unsigned char>(c);
+            return true;
+        }
+
+        unsigned char type = GetRange(static_cast<unsigned char>(c));
+        if (type >= 32) {
+            *codepoint = 0;
+        } else {
+            *codepoint = (0xFF >> type) & static_cast<unsigned char>(c);
+        }
+        bool result = true;
+        switch (type) {
+        case 2: TAIL(); return result;
+        case 3: TAIL(); TAIL(); return result;
+        case 4: COPY(); TRANS(0x50); TAIL(); return result;
+        case 5: COPY(); TRANS(0x10); TAIL(); TAIL(); return result;
+        case 6: TAIL(); TAIL(); TAIL(); return result;
+        case 10: COPY(); TRANS(0x20); TAIL(); return result;
+        case 11: COPY(); TRANS(0x60); TAIL(); TAIL(); return result;
+        default: return false;
+        }
+#undef COPY
+#undef TRANS
+#undef TAIL
+    }
+
+    template <typename InputStream, typename OutputStream>
+    static bool Validate(InputStream& is, OutputStream& os) {
+#define COPY() os.Put(c = is.Take())
+#define TRANS(mask) result &= ((GetRange(static_cast<unsigned char>(c)) & mask) != 0)
+#define TAIL() COPY(); TRANS(0x70)
+        Ch c;
+        COPY();
+        if (!(c & 0x80))
+            return true;
+
+        bool result = true;
+        switch (GetRange(static_cast<unsigned char>(c))) {
+        case 2: TAIL(); return result;
+        case 3: TAIL(); TAIL(); return result;
+        case 4: COPY(); TRANS(0x50); TAIL(); return result;
+        case 5: COPY(); TRANS(0x10); TAIL(); TAIL(); return result;
+        case 6: TAIL(); TAIL(); TAIL(); return result;
+        case 10: COPY(); TRANS(0x20); TAIL(); return result;
+        case 11: COPY(); TRANS(0x60); TAIL(); TAIL(); return result;
+        default: return false;
+        }
+#undef COPY
+#undef TRANS
+#undef TAIL
+    }
+
+    static unsigned char GetRange(unsigned char c) {
+        // Referring to DFA of http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
+        // With new mapping 1 -> 0x10, 7 -> 0x20, 9 -> 0x40, such that AND operation can test multiple types.
+        static const unsigned char type[] = {
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+            0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,
+            0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,
+            0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+            0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+            8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+            10,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3, 11,6,6,6,5,8,8,8,8,8,8,8,8,8,8,8,
+        };
+        return type[c];
+    }
+
+    template <typename InputByteStream>
+    static CharType TakeBOM(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        typename InputByteStream::Ch c = Take(is);
+        if (static_cast<unsigned char>(c) != 0xEFu) return c;
+        c = is.Take();
+        if (static_cast<unsigned char>(c) != 0xBBu) return c;
+        c = is.Take();
+        if (static_cast<unsigned char>(c) != 0xBFu) return c;
+        c = is.Take();
+        return c;
+    }
+
+    template <typename InputByteStream>
+    static Ch Take(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        return static_cast<Ch>(is.Take());
+    }
+
+    template <typename OutputByteStream>
+    static void PutBOM(OutputByteStream& os) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xEFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xBBu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xBFu));
+    }
+
+    template <typename OutputByteStream>
+    static void Put(OutputByteStream& os, Ch c) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>(c));
+    }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// UTF16
+
+//! UTF-16 encoding.
+/*! http://en.wikipedia.org/wiki/UTF-16
+    http://tools.ietf.org/html/rfc2781
+    \tparam CharType Type for storing 16-bit UTF-16 data. Default is wchar_t. C++11 may use char16_t instead.
+    \note implements Encoding concept
+
+    \note For in-memory access, no need to concern endianness. The code units and code points are represented by CPU's endianness.
+    For streaming, use UTF16LE and UTF16BE, which handle endianness.
+*/
+template<typename CharType = wchar_t>
+struct UTF16 {
+    typedef CharType Ch;
+    RAPIDJSON_STATIC_ASSERT(sizeof(Ch) >= 2);
+
+    enum { supportUnicode = 1 };
+
+    template<typename OutputStream>
+    static void Encode(OutputStream& os, unsigned codepoint) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
+        if (codepoint <= 0xFFFF) {
+            RAPIDJSON_ASSERT(codepoint < 0xD800 || codepoint > 0xDFFF); // Code point itself cannot be surrogate pair 
+            os.Put(static_cast<typename OutputStream::Ch>(codepoint));
+        }
+        else {
+            RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
+            unsigned v = codepoint - 0x10000;
+            os.Put(static_cast<typename OutputStream::Ch>((v >> 10) | 0xD800));
+            os.Put((v & 0x3FF) | 0xDC00);
+        }
+    }
+
+
+    template<typename OutputStream>
+    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
+        if (codepoint <= 0xFFFF) {
+            RAPIDJSON_ASSERT(codepoint < 0xD800 || codepoint > 0xDFFF); // Code point itself cannot be surrogate pair 
+            PutUnsafe(os, static_cast<typename OutputStream::Ch>(codepoint));
+        }
+        else {
+            RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
+            unsigned v = codepoint - 0x10000;
+            PutUnsafe(os, static_cast<typename OutputStream::Ch>((v >> 10) | 0xD800));
+            PutUnsafe(os, (v & 0x3FF) | 0xDC00);
+        }
+    }
+
+    template <typename InputStream>
+    static bool Decode(InputStream& is, unsigned* codepoint) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 2);
+        typename InputStream::Ch c = is.Take();
+        if (c < 0xD800 || c > 0xDFFF) {
+            *codepoint = static_cast<unsigned>(c);
+            return true;
+        }
+        else if (c <= 0xDBFF) {
+            *codepoint = (static_cast<unsigned>(c) & 0x3FF) << 10;
+            c = is.Take();
+            *codepoint |= (static_cast<unsigned>(c) & 0x3FF);
+            *codepoint += 0x10000;
+            return c >= 0xDC00 && c <= 0xDFFF;
+        }
+        return false;
+    }
+
+    template <typename InputStream, typename OutputStream>
+    static bool Validate(InputStream& is, OutputStream& os) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 2);
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
+        typename InputStream::Ch c;
+        os.Put(static_cast<typename OutputStream::Ch>(c = is.Take()));
+        if (c < 0xD800 || c > 0xDFFF)
+            return true;
+        else if (c <= 0xDBFF) {
+            os.Put(c = is.Take());
+            return c >= 0xDC00 && c <= 0xDFFF;
+        }
+        return false;
+    }
+};
+
+//! UTF-16 little endian encoding.
+template<typename CharType = wchar_t>
+struct UTF16LE : UTF16<CharType> {
+    template <typename InputByteStream>
+    static CharType TakeBOM(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        CharType c = Take(is);
+        return static_cast<uint16_t>(c) == 0xFEFFu ? Take(is) : c;
+    }
+
+    template <typename InputByteStream>
+    static CharType Take(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        unsigned c = static_cast<uint8_t>(is.Take());
+        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
+        return static_cast<CharType>(c);
+    }
+
+    template <typename OutputByteStream>
+    static void PutBOM(OutputByteStream& os) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
+    }
+
+    template <typename OutputByteStream>
+    static void Put(OutputByteStream& os, CharType c) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>(static_cast<unsigned>(c) & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>((static_cast<unsigned>(c) >> 8) & 0xFFu));
+    }
+};
+
+//! UTF-16 big endian encoding.
+template<typename CharType = wchar_t>
+struct UTF16BE : UTF16<CharType> {
+    template <typename InputByteStream>
+    static CharType TakeBOM(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        CharType c = Take(is);
+        return static_cast<uint16_t>(c) == 0xFEFFu ? Take(is) : c;
+    }
+
+    template <typename InputByteStream>
+    static CharType Take(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        unsigned c = static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
+        c |= static_cast<uint8_t>(is.Take());
+        return static_cast<CharType>(c);
+    }
+
+    template <typename OutputByteStream>
+    static void PutBOM(OutputByteStream& os) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
+    }
+
+    template <typename OutputByteStream>
+    static void Put(OutputByteStream& os, CharType c) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>((static_cast<unsigned>(c) >> 8) & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(static_cast<unsigned>(c) & 0xFFu));
+    }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// UTF32
+
+//! UTF-32 encoding. 
+/*! http://en.wikipedia.org/wiki/UTF-32
+    \tparam CharType Type for storing 32-bit UTF-32 data. Default is unsigned. C++11 may use char32_t instead.
+    \note implements Encoding concept
+
+    \note For in-memory access, no need to concern endianness. The code units and code points are represented by CPU's endianness.
+    For streaming, use UTF32LE and UTF32BE, which handle endianness.
+*/
+template<typename CharType = unsigned>
+struct UTF32 {
+    typedef CharType Ch;
+    RAPIDJSON_STATIC_ASSERT(sizeof(Ch) >= 4);
+
+    enum { supportUnicode = 1 };
+
+    template<typename OutputStream>
+    static void Encode(OutputStream& os, unsigned codepoint) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 4);
+        RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
+        os.Put(codepoint);
+    }
+
+    template<typename OutputStream>
+    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 4);
+        RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
+        PutUnsafe(os, codepoint);
+    }
+
+    template <typename InputStream>
+    static bool Decode(InputStream& is, unsigned* codepoint) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 4);
+        Ch c = is.Take();
+        *codepoint = c;
+        return c <= 0x10FFFF;
+    }
+
+    template <typename InputStream, typename OutputStream>
+    static bool Validate(InputStream& is, OutputStream& os) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 4);
+        Ch c;
+        os.Put(c = is.Take());
+        return c <= 0x10FFFF;
+    }
+};
+
+//! UTF-32 little endian enocoding.
+template<typename CharType = unsigned>
+struct UTF32LE : UTF32<CharType> {
+    template <typename InputByteStream>
+    static CharType TakeBOM(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        CharType c = Take(is);
+        return static_cast<uint32_t>(c) == 0x0000FEFFu ? Take(is) : c;
+    }
+
+    template <typename InputByteStream>
+    static CharType Take(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        unsigned c = static_cast<uint8_t>(is.Take());
+        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
+        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 16;
+        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 24;
+        return static_cast<CharType>(c);
+    }
+
+    template <typename OutputByteStream>
+    static void PutBOM(OutputByteStream& os) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
+    }
+
+    template <typename OutputByteStream>
+    static void Put(OutputByteStream& os, CharType c) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>(c & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 8) & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 16) & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 24) & 0xFFu));
+    }
+};
+
+//! UTF-32 big endian encoding.
+template<typename CharType = unsigned>
+struct UTF32BE : UTF32<CharType> {
+    template <typename InputByteStream>
+    static CharType TakeBOM(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        CharType c = Take(is);
+        return static_cast<uint32_t>(c) == 0x0000FEFFu ? Take(is) : c; 
+    }
+
+    template <typename InputByteStream>
+    static CharType Take(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        unsigned c = static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 24;
+        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 16;
+        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
+        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take()));
+        return static_cast<CharType>(c);
+    }
+
+    template <typename OutputByteStream>
+    static void PutBOM(OutputByteStream& os) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
+    }
+
+    template <typename OutputByteStream>
+    static void Put(OutputByteStream& os, CharType c) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 24) & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 16) & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 8) & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(c & 0xFFu));
+    }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// ASCII
+
+//! ASCII encoding.
+/*! http://en.wikipedia.org/wiki/ASCII
+    \tparam CharType Code unit for storing 7-bit ASCII data. Default is char.
+    \note implements Encoding concept
+*/
+template<typename CharType = char>
+struct ASCII {
+    typedef CharType Ch;
+
+    enum { supportUnicode = 0 };
+
+    template<typename OutputStream>
+    static void Encode(OutputStream& os, unsigned codepoint) {
+        RAPIDJSON_ASSERT(codepoint <= 0x7F);
+        os.Put(static_cast<Ch>(codepoint & 0xFF));
+    }
+
+    template<typename OutputStream>
+    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
+        RAPIDJSON_ASSERT(codepoint <= 0x7F);
+        PutUnsafe(os, static_cast<Ch>(codepoint & 0xFF));
+    }
+
+    template <typename InputStream>
+    static bool Decode(InputStream& is, unsigned* codepoint) {
+        uint8_t c = static_cast<uint8_t>(is.Take());
+        *codepoint = c;
+        return c <= 0X7F;
+    }
+
+    template <typename InputStream, typename OutputStream>
+    static bool Validate(InputStream& is, OutputStream& os) {
+        uint8_t c = static_cast<uint8_t>(is.Take());
+        os.Put(static_cast<typename OutputStream::Ch>(c));
+        return c <= 0x7F;
+    }
+
+    template <typename InputByteStream>
+    static CharType TakeBOM(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        uint8_t c = static_cast<uint8_t>(Take(is));
+        return static_cast<Ch>(c);
+    }
+
+    template <typename InputByteStream>
+    static Ch Take(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        return static_cast<Ch>(is.Take());
+    }
+
+    template <typename OutputByteStream>
+    static void PutBOM(OutputByteStream& os) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        (void)os;
+    }
+
+    template <typename OutputByteStream>
+    static void Put(OutputByteStream& os, Ch c) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>(c));
+    }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// AutoUTF
+
+//! Runtime-specified UTF encoding type of a stream.
+enum UTFType {
+    kUTF8 = 0,      //!< UTF-8.
+    kUTF16LE = 1,   //!< UTF-16 little endian.
+    kUTF16BE = 2,   //!< UTF-16 big endian.
+    kUTF32LE = 3,   //!< UTF-32 little endian.
+    kUTF32BE = 4    //!< UTF-32 big endian.
+};
+
+//! Dynamically select encoding according to stream's runtime-specified UTF encoding type.
+/*! \note This class can be used with AutoUTFInputtStream and AutoUTFOutputStream, which provides GetType().
+*/
+template<typename CharType>
+struct AutoUTF {
+    typedef CharType Ch;
+
+    enum { supportUnicode = 1 };
+
+#define RAPIDJSON_ENCODINGS_FUNC(x) UTF8<Ch>::x, UTF16LE<Ch>::x, UTF16BE<Ch>::x, UTF32LE<Ch>::x, UTF32BE<Ch>::x
+
+    template<typename OutputStream>
+    RAPIDJSON_FORCEINLINE static void Encode(OutputStream& os, unsigned codepoint) {
+        typedef void (*EncodeFunc)(OutputStream&, unsigned);
+        static const EncodeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Encode) };
+        (*f[os.GetType()])(os, codepoint);
+    }
+
+    template<typename OutputStream>
+    RAPIDJSON_FORCEINLINE static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
+        typedef void (*EncodeFunc)(OutputStream&, unsigned);
+        static const EncodeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(EncodeUnsafe) };
+        (*f[os.GetType()])(os, codepoint);
+    }
+
+    template <typename InputStream>
+    RAPIDJSON_FORCEINLINE static bool Decode(InputStream& is, unsigned* codepoint) {
+        typedef bool (*DecodeFunc)(InputStream&, unsigned*);
+        static const DecodeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Decode) };
+        return (*f[is.GetType()])(is, codepoint);
+    }
+
+    template <typename InputStream, typename OutputStream>
+    RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
+        typedef bool (*ValidateFunc)(InputStream&, OutputStream&);
+        static const ValidateFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Validate) };
+        return (*f[is.GetType()])(is, os);
+    }
+
+#undef RAPIDJSON_ENCODINGS_FUNC
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// Transcoder
+
+//! Encoding conversion.
+template<typename SourceEncoding, typename TargetEncoding>
+struct Transcoder {
+    //! Take one Unicode codepoint from source encoding, convert it to target encoding and put it to the output stream.
+    template<typename InputStream, typename OutputStream>
+    RAPIDJSON_FORCEINLINE static bool Transcode(InputStream& is, OutputStream& os) {
+        unsigned codepoint;
+        if (!SourceEncoding::Decode(is, &codepoint))
+            return false;
+        TargetEncoding::Encode(os, codepoint);
+        return true;
+    }
+
+    template<typename InputStream, typename OutputStream>
+    RAPIDJSON_FORCEINLINE static bool TranscodeUnsafe(InputStream& is, OutputStream& os) {
+        unsigned codepoint;
+        if (!SourceEncoding::Decode(is, &codepoint))
+            return false;
+        TargetEncoding::EncodeUnsafe(os, codepoint);
+        return true;
+    }
+
+    //! Validate one Unicode codepoint from an encoded stream.
+    template<typename InputStream, typename OutputStream>
+    RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
+        return Transcode(is, os);   // Since source/target encoding is different, must transcode.
+    }
+};
+
+// Forward declaration.
+template<typename Stream>
+inline void PutUnsafe(Stream& stream, typename Stream::Ch c);
+
+//! Specialization of Transcoder with same source and target encoding.
+template<typename Encoding>
+struct Transcoder<Encoding, Encoding> {
+    template<typename InputStream, typename OutputStream>
+    RAPIDJSON_FORCEINLINE static bool Transcode(InputStream& is, OutputStream& os) {
+        os.Put(is.Take());  // Just copy one code unit. This semantic is different from primary template class.
+        return true;
+    }
+    
+    template<typename InputStream, typename OutputStream>
+    RAPIDJSON_FORCEINLINE static bool TranscodeUnsafe(InputStream& is, OutputStream& os) {
+        PutUnsafe(os, is.Take());  // Just copy one code unit. This semantic is different from primary template class.
+        return true;
+    }
+    
+    template<typename InputStream, typename OutputStream>
+    RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
+        return Encoding::Validate(is, os);  // source/target encoding are the same
+    }
+};
+
+RAPIDJSON_NAMESPACE_END
+
+#if defined(__GNUC__) || defined(_MSC_VER)
+RAPIDJSON_DIAG_POP
+#endif
+
+#endif // RAPIDJSON_ENCODINGS_H_

Core/GDCore/Serialization/rapidjson/error/en.h

@@ -0,0 +1,74 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_ERROR_EN_H_
+#define RAPIDJSON_ERROR_EN_H_
+
+#include "error.h"
+
+#ifdef __clang__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(switch-enum)
+RAPIDJSON_DIAG_OFF(covered-switch-default)
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+//! Maps error code of parsing into error message.
+/*!
+    \ingroup RAPIDJSON_ERRORS
+    \param parseErrorCode Error code obtained in parsing.
+    \return the error message.
+    \note User can make a copy of this function for localization.
+        Using switch-case is safer for future modification of error codes.
+*/
+inline const RAPIDJSON_ERROR_CHARTYPE* GetParseError_En(ParseErrorCode parseErrorCode) {
+    switch (parseErrorCode) {
+        case kParseErrorNone:                           return RAPIDJSON_ERROR_STRING("No error.");
+
+        case kParseErrorDocumentEmpty:                  return RAPIDJSON_ERROR_STRING("The document is empty.");
+        case kParseErrorDocumentRootNotSingular:        return RAPIDJSON_ERROR_STRING("The document root must not be followed by other values.");
+    
+        case kParseErrorValueInvalid:                   return RAPIDJSON_ERROR_STRING("Invalid value.");
+    
+        case kParseErrorObjectMissName:                 return RAPIDJSON_ERROR_STRING("Missing a name for object member.");
+        case kParseErrorObjectMissColon:                return RAPIDJSON_ERROR_STRING("Missing a colon after a name of object member.");
+        case kParseErrorObjectMissCommaOrCurlyBracket:  return RAPIDJSON_ERROR_STRING("Missing a comma or '}' after an object member.");
+    
+        case kParseErrorArrayMissCommaOrSquareBracket:  return RAPIDJSON_ERROR_STRING("Missing a comma or ']' after an array element.");
+
+        case kParseErrorStringUnicodeEscapeInvalidHex:  return RAPIDJSON_ERROR_STRING("Incorrect hex digit after \\u escape in string.");
+        case kParseErrorStringUnicodeSurrogateInvalid:  return RAPIDJSON_ERROR_STRING("The surrogate pair in string is invalid.");
+        case kParseErrorStringEscapeInvalid:            return RAPIDJSON_ERROR_STRING("Invalid escape character in string.");
+        case kParseErrorStringMissQuotationMark:        return RAPIDJSON_ERROR_STRING("Missing a closing quotation mark in string.");
+        case kParseErrorStringInvalidEncoding:          return RAPIDJSON_ERROR_STRING("Invalid encoding in string.");
+
+        case kParseErrorNumberTooBig:                   return RAPIDJSON_ERROR_STRING("Number too big to be stored in double.");
+        case kParseErrorNumberMissFraction:             return RAPIDJSON_ERROR_STRING("Miss fraction part in number.");
+        case kParseErrorNumberMissExponent:             return RAPIDJSON_ERROR_STRING("Miss exponent in number.");
+
+        case kParseErrorTermination:                    return RAPIDJSON_ERROR_STRING("Terminate parsing due to Handler error.");
+        case kParseErrorUnspecificSyntaxError:          return RAPIDJSON_ERROR_STRING("Unspecific syntax error.");
+
+        default:                                        return RAPIDJSON_ERROR_STRING("Unknown error.");
+    }
+}
+
+RAPIDJSON_NAMESPACE_END
+
+#ifdef __clang__
+RAPIDJSON_DIAG_POP
+#endif
+
+#endif // RAPIDJSON_ERROR_EN_H_

Core/GDCore/Serialization/rapidjson/error/error.h

@@ -0,0 +1,155 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_ERROR_ERROR_H_
+#define RAPIDJSON_ERROR_ERROR_H_
+
+#include "../rapidjson.h"
+
+#ifdef __clang__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(padded)
+#endif
+
+/*! \file error.h */
+
+/*! \defgroup RAPIDJSON_ERRORS RapidJSON error handling */
+
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_ERROR_CHARTYPE
+
+//! Character type of error messages.
+/*! \ingroup RAPIDJSON_ERRORS
+    The default character type is \c char.
+    On Windows, user can define this macro as \c TCHAR for supporting both
+    unicode/non-unicode settings.
+*/
+#ifndef RAPIDJSON_ERROR_CHARTYPE
+#define RAPIDJSON_ERROR_CHARTYPE char
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_ERROR_STRING
+
+//! Macro for converting string literial to \ref RAPIDJSON_ERROR_CHARTYPE[].
+/*! \ingroup RAPIDJSON_ERRORS
+    By default this conversion macro does nothing.
+    On Windows, user can define this macro as \c _T(x) for supporting both
+    unicode/non-unicode settings.
+*/
+#ifndef RAPIDJSON_ERROR_STRING
+#define RAPIDJSON_ERROR_STRING(x) x
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+///////////////////////////////////////////////////////////////////////////////
+// ParseErrorCode
+
+//! Error code of parsing.
+/*! \ingroup RAPIDJSON_ERRORS
+    \see GenericReader::Parse, GenericReader::GetParseErrorCode
+*/
+enum ParseErrorCode {
+    kParseErrorNone = 0,                        //!< No error.
+
+    kParseErrorDocumentEmpty,                   //!< The document is empty.
+    kParseErrorDocumentRootNotSingular,         //!< The document root must not follow by other values.
+
+    kParseErrorValueInvalid,                    //!< Invalid value.
+
+    kParseErrorObjectMissName,                  //!< Missing a name for object member.
+    kParseErrorObjectMissColon,                 //!< Missing a colon after a name of object member.
+    kParseErrorObjectMissCommaOrCurlyBracket,   //!< Missing a comma or '}' after an object member.
+
+    kParseErrorArrayMissCommaOrSquareBracket,   //!< Missing a comma or ']' after an array element.
+
+    kParseErrorStringUnicodeEscapeInvalidHex,   //!< Incorrect hex digit after \\u escape in string.
+    kParseErrorStringUnicodeSurrogateInvalid,   //!< The surrogate pair in string is invalid.
+    kParseErrorStringEscapeInvalid,             //!< Invalid escape character in string.
+    kParseErrorStringMissQuotationMark,         //!< Missing a closing quotation mark in string.
+    kParseErrorStringInvalidEncoding,           //!< Invalid encoding in string.
+
+    kParseErrorNumberTooBig,                    //!< Number too big to be stored in double.
+    kParseErrorNumberMissFraction,              //!< Miss fraction part in number.
+    kParseErrorNumberMissExponent,              //!< Miss exponent in number.
+
+    kParseErrorTermination,                     //!< Parsing was terminated.
+    kParseErrorUnspecificSyntaxError            //!< Unspecific syntax error.
+};
+
+//! Result of parsing (wraps ParseErrorCode)
+/*!
+    \ingroup RAPIDJSON_ERRORS
+    \code
+        Document doc;
+        ParseResult ok = doc.Parse("[42]");
+        if (!ok) {
+            fprintf(stderr, "JSON parse error: %s (%u)",
+                    GetParseError_En(ok.Code()), ok.Offset());
+            exit(EXIT_FAILURE);
+        }
+    \endcode
+    \see GenericReader::Parse, GenericDocument::Parse
+*/
+struct ParseResult {
+public:
+    //! Default constructor, no error.
+    ParseResult() : code_(kParseErrorNone), offset_(0) {}
+    //! Constructor to set an error.
+    ParseResult(ParseErrorCode code, size_t offset) : code_(code), offset_(offset) {}
+
+    //! Get the error code.
+    ParseErrorCode Code() const { return code_; }
+    //! Get the error offset, if \ref IsError(), 0 otherwise.
+    size_t Offset() const { return offset_; }
+
+    //! Conversion to \c bool, returns \c true, iff !\ref IsError().
+    operator bool() const { return !IsError(); }
+    //! Whether the result is an error.
+    bool IsError() const { return code_ != kParseErrorNone; }
+
+    bool operator==(const ParseResult& that) const { return code_ == that.code_; }
+    bool operator==(ParseErrorCode code) const { return code_ == code; }
+    friend bool operator==(ParseErrorCode code, const ParseResult & err) { return code == err.code_; }
+
+    //! Reset error code.
+    void Clear() { Set(kParseErrorNone); }
+    //! Update error code and offset.
+    void Set(ParseErrorCode code, size_t offset = 0) { code_ = code; offset_ = offset; }
+
+private:
+    ParseErrorCode code_;
+    size_t offset_;
+};
+
+//! Function pointer type of GetParseError().
+/*! \ingroup RAPIDJSON_ERRORS
+
+    This is the prototype for \c GetParseError_X(), where \c X is a locale.
+    User can dynamically change locale in runtime, e.g.:
+\code
+    GetParseErrorFunc GetParseError = GetParseError_En; // or whatever
+    const RAPIDJSON_ERROR_CHARTYPE* s = GetParseError(document.GetParseErrorCode());
+\endcode
+*/
+typedef const RAPIDJSON_ERROR_CHARTYPE* (*GetParseErrorFunc)(ParseErrorCode);
+
+RAPIDJSON_NAMESPACE_END
+
+#ifdef __clang__
+RAPIDJSON_DIAG_POP
+#endif
+
+#endif // RAPIDJSON_ERROR_ERROR_H_

Core/GDCore/Serialization/rapidjson/filereadstream.h

@@ -0,0 +1,99 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_FILEREADSTREAM_H_
+#define RAPIDJSON_FILEREADSTREAM_H_
+
+#include "stream.h"
+#include <cstdio>
+
+#ifdef __clang__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(padded)
+RAPIDJSON_DIAG_OFF(unreachable-code)
+RAPIDJSON_DIAG_OFF(missing-noreturn)
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+//! File byte stream for input using fread().
+/*!
+    \note implements Stream concept
+*/
+class FileReadStream {
+public:
+    typedef char Ch;    //!< Character type (byte).
+
+    //! Constructor.
+    /*!
+        \param fp File pointer opened for read.
+        \param buffer user-supplied buffer.
+        \param bufferSize size of buffer in bytes. Must >=4 bytes.
+    */
+    FileReadStream(std::FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferSize_(bufferSize), bufferLast_(0), current_(buffer_), readCount_(0), count_(0), eof_(false) { 
+        RAPIDJSON_ASSERT(fp_ != 0);
+        RAPIDJSON_ASSERT(bufferSize >= 4);
+        Read();
+    }
+
+    Ch Peek() const { return *current_; }
+    Ch Take() { Ch c = *current_; Read(); return c; }
+    size_t Tell() const { return count_ + static_cast<size_t>(current_ - buffer_); }
+
+    // Not implemented
+    void Put(Ch) { RAPIDJSON_ASSERT(false); }
+    void Flush() { RAPIDJSON_ASSERT(false); } 
+    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
+    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
+
+    // For encoding detection only.
+    const Ch* Peek4() const {
+        return (current_ + 4 <= bufferLast_) ? current_ : 0;
+    }
+
+private:
+    void Read() {
+        if (current_ < bufferLast_)
+            ++current_;
+        else if (!eof_) {
+            count_ += readCount_;
+            readCount_ = fread(buffer_, 1, bufferSize_, fp_);
+            bufferLast_ = buffer_ + readCount_ - 1;
+            current_ = buffer_;
+
+            if (readCount_ < bufferSize_) {
+                buffer_[readCount_] = '\0';
+                ++bufferLast_;
+                eof_ = true;
+            }
+        }
+    }
+
+    std::FILE* fp_;
+    Ch *buffer_;
+    size_t bufferSize_;
+    Ch *bufferLast_;
+    Ch *current_;
+    size_t readCount_;
+    size_t count_;  //!< Number of characters read
+    bool eof_;
+};
+
+RAPIDJSON_NAMESPACE_END
+
+#ifdef __clang__
+RAPIDJSON_DIAG_POP
+#endif
+
+#endif // RAPIDJSON_FILESTREAM_H_

Core/GDCore/Serialization/rapidjson/filewritestream.h

@@ -0,0 +1,104 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_FILEWRITESTREAM_H_
+#define RAPIDJSON_FILEWRITESTREAM_H_
+
+#include "stream.h"
+#include <cstdio>
+
+#ifdef __clang__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(unreachable-code)
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+//! Wrapper of C file stream for input using fread().
+/*!
+    \note implements Stream concept
+*/
+class FileWriteStream {
+public:
+    typedef char Ch;    //!< Character type. Only support char.
+
+    FileWriteStream(std::FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferEnd_(buffer + bufferSize), current_(buffer_) { 
+        RAPIDJSON_ASSERT(fp_ != 0);
+    }
+
+    void Put(char c) { 
+        if (current_ >= bufferEnd_)
+            Flush();
+
+        *current_++ = c;
+    }
+
+    void PutN(char c, size_t n) {
+        size_t avail = static_cast<size_t>(bufferEnd_ - current_);
+        while (n > avail) {
+            std::memset(current_, c, avail);
+            current_ += avail;
+            Flush();
+            n -= avail;
+            avail = static_cast<size_t>(bufferEnd_ - current_);
+        }
+
+        if (n > 0) {
+            std::memset(current_, c, n);
+            current_ += n;
+        }
+    }
+
+    void Flush() {
+        if (current_ != buffer_) {
+            size_t result = fwrite(buffer_, 1, static_cast<size_t>(current_ - buffer_), fp_);
+            if (result < static_cast<size_t>(current_ - buffer_)) {
+                // failure deliberately ignored at this time
+                // added to avoid warn_unused_result build errors
+            }
+            current_ = buffer_;
+        }
+    }
+
+    // Not implemented
+    char Peek() const { RAPIDJSON_ASSERT(false); return 0; }
+    char Take() { RAPIDJSON_ASSERT(false); return 0; }
+    size_t Tell() const { RAPIDJSON_ASSERT(false); return 0; }
+    char* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
+    size_t PutEnd(char*) { RAPIDJSON_ASSERT(false); return 0; }
+
+private:
+    // Prohibit copy constructor & assignment operator.
+    FileWriteStream(const FileWriteStream&);
+    FileWriteStream& operator=(const FileWriteStream&);
+
+    std::FILE* fp_;
+    char *buffer_;
+    char *bufferEnd_;
+    char *current_;
+};
+
+//! Implement specialized version of PutN() with memset() for better performance.
+template<>
+inline void PutN(FileWriteStream& stream, char c, size_t n) {
+    stream.PutN(c, n);
+}
+
+RAPIDJSON_NAMESPACE_END
+
+#ifdef __clang__
+RAPIDJSON_DIAG_POP
+#endif
+
+#endif // RAPIDJSON_FILESTREAM_H_

Core/GDCore/Serialization/rapidjson/fwd.h

@@ -0,0 +1,151 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_FWD_H_
+#define RAPIDJSON_FWD_H_
+
+#include "rapidjson.h"
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+// encodings.h
+
+template<typename CharType> struct UTF8;
+template<typename CharType> struct UTF16;
+template<typename CharType> struct UTF16BE;
+template<typename CharType> struct UTF16LE;
+template<typename CharType> struct UTF32;
+template<typename CharType> struct UTF32BE;
+template<typename CharType> struct UTF32LE;
+template<typename CharType> struct ASCII;
+template<typename CharType> struct AutoUTF;
+
+template<typename SourceEncoding, typename TargetEncoding>
+struct Transcoder;
+
+// allocators.h
+
+class CrtAllocator;
+
+template <typename BaseAllocator>
+class MemoryPoolAllocator;
+
+// stream.h
+
+template <typename Encoding>
+struct GenericStringStream;
+
+typedef GenericStringStream<UTF8<char> > StringStream;
+
+template <typename Encoding>
+struct GenericInsituStringStream;
+
+typedef GenericInsituStringStream<UTF8<char> > InsituStringStream;
+
+// stringbuffer.h
+
+template <typename Encoding, typename Allocator>
+class GenericStringBuffer;
+
+typedef GenericStringBuffer<UTF8<char>, CrtAllocator> StringBuffer;
+
+// filereadstream.h
+
+class FileReadStream;
+
+// filewritestream.h
+
+class FileWriteStream;
+
+// memorybuffer.h
+
+template <typename Allocator>
+struct GenericMemoryBuffer;
+
+typedef GenericMemoryBuffer<CrtAllocator> MemoryBuffer;
+
+// memorystream.h
+
+struct MemoryStream;
+
+// reader.h
+
+template<typename Encoding, typename Derived>
+struct BaseReaderHandler;
+
+template <typename SourceEncoding, typename TargetEncoding, typename StackAllocator>
+class GenericReader;
+
+typedef GenericReader<UTF8<char>, UTF8<char>, CrtAllocator> Reader;
+
+// writer.h
+
+template<typename OutputStream, typename SourceEncoding, typename TargetEncoding, typename StackAllocator, unsigned writeFlags>
+class Writer;
+
+// prettywriter.h
+
+template<typename OutputStream, typename SourceEncoding, typename TargetEncoding, typename StackAllocator, unsigned writeFlags>
+class PrettyWriter;
+
+// document.h
+
+template <typename Encoding, typename Allocator> 
+struct GenericMember;
+
+template <bool Const, typename Encoding, typename Allocator>
+class GenericMemberIterator;
+
+template<typename CharType>
+struct GenericStringRef;
+
+template <typename Encoding, typename Allocator> 
+class GenericValue;
+
+typedef GenericValue<UTF8<char>, MemoryPoolAllocator<CrtAllocator> > Value;
+
+template <typename Encoding, typename Allocator, typename StackAllocator>
+class GenericDocument;
+
+typedef GenericDocument<UTF8<char>, MemoryPoolAllocator<CrtAllocator>, CrtAllocator> Document;
+
+// pointer.h
+
+template <typename ValueType, typename Allocator>
+class GenericPointer;
+
+typedef GenericPointer<Value, CrtAllocator> Pointer;
+
+// schema.h
+
+template <typename SchemaDocumentType>
+class IGenericRemoteSchemaDocumentProvider;
+
+template <typename ValueT, typename Allocator>
+class GenericSchemaDocument;
+
+typedef GenericSchemaDocument<Value, CrtAllocator> SchemaDocument;
+typedef IGenericRemoteSchemaDocumentProvider<SchemaDocument> IRemoteSchemaDocumentProvider;
+
+template <
+    typename SchemaDocumentType,
+    typename OutputHandler,
+    typename StateAllocator>
+class GenericSchemaValidator;
+
+typedef GenericSchemaValidator<SchemaDocument, BaseReaderHandler<UTF8<char>, void>, CrtAllocator> SchemaValidator;
+
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_RAPIDJSONFWD_H_

Core/GDCore/Serialization/rapidjson/internal/biginteger.h

@@ -0,0 +1,290 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_BIGINTEGER_H_
+#define RAPIDJSON_BIGINTEGER_H_
+
+#include "../rapidjson.h"
+
+#if defined(_MSC_VER) && defined(_M_AMD64)
+#include <intrin.h> // for _umul128
+#pragma intrinsic(_umul128)
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+class BigInteger {
+public:
+    typedef uint64_t Type;
+
+    BigInteger(const BigInteger& rhs) : count_(rhs.count_) {
+        std::memcpy(digits_, rhs.digits_, count_ * sizeof(Type));
+    }
+
+    explicit BigInteger(uint64_t u) : count_(1) {
+        digits_[0] = u;
+    }
+
+    BigInteger(const char* decimals, size_t length) : count_(1) {
+        RAPIDJSON_ASSERT(length > 0);
+        digits_[0] = 0;
+        size_t i = 0;
+        const size_t kMaxDigitPerIteration = 19;  // 2^64 = 18446744073709551616 > 10^19
+        while (length >= kMaxDigitPerIteration) {
+            AppendDecimal64(decimals + i, decimals + i + kMaxDigitPerIteration);
+            length -= kMaxDigitPerIteration;
+            i += kMaxDigitPerIteration;
+        }
+
+        if (length > 0)
+            AppendDecimal64(decimals + i, decimals + i + length);
+    }
+    
+    BigInteger& operator=(const BigInteger &rhs)
+    {
+        if (this != &rhs) {
+            count_ = rhs.count_;
+            std::memcpy(digits_, rhs.digits_, count_ * sizeof(Type));
+        }
+        return *this;
+    }
+    
+    BigInteger& operator=(uint64_t u) {
+        digits_[0] = u;            
+        count_ = 1;
+        return *this;
+    }
+
+    BigInteger& operator+=(uint64_t u) {
+        Type backup = digits_[0];
+        digits_[0] += u;
+        for (size_t i = 0; i < count_ - 1; i++) {
+            if (digits_[i] >= backup)
+                return *this; // no carry
+            backup = digits_[i + 1];
+            digits_[i + 1] += 1;
+        }
+
+        // Last carry
+        if (digits_[count_ - 1] < backup)
+            PushBack(1);
+
+        return *this;
+    }
+
+    BigInteger& operator*=(uint64_t u) {
+        if (u == 0) return *this = 0;
+        if (u == 1) return *this;
+        if (*this == 1) return *this = u;
+
+        uint64_t k = 0;
+        for (size_t i = 0; i < count_; i++) {
+            uint64_t hi;
+            digits_[i] = MulAdd64(digits_[i], u, k, &hi);
+            k = hi;
+        }
+        
+        if (k > 0)
+            PushBack(k);
+
+        return *this;
+    }
+
+    BigInteger& operator*=(uint32_t u) {
+        if (u == 0) return *this = 0;
+        if (u == 1) return *this;
+        if (*this == 1) return *this = u;
+
+        uint64_t k = 0;
+        for (size_t i = 0; i < count_; i++) {
+            const uint64_t c = digits_[i] >> 32;
+            const uint64_t d = digits_[i] & 0xFFFFFFFF;
+            const uint64_t uc = u * c;
+            const uint64_t ud = u * d;
+            const uint64_t p0 = ud + k;
+            const uint64_t p1 = uc + (p0 >> 32);
+            digits_[i] = (p0 & 0xFFFFFFFF) | (p1 << 32);
+            k = p1 >> 32;
+        }
+        
+        if (k > 0)
+            PushBack(k);
+
+        return *this;
+    }
+
+    BigInteger& operator<<=(size_t shift) {
+        if (IsZero() || shift == 0) return *this;
+
+        size_t offset = shift / kTypeBit;
+        size_t interShift = shift % kTypeBit;
+        RAPIDJSON_ASSERT(count_ + offset <= kCapacity);
+
+        if (interShift == 0) {
+            std::memmove(&digits_[count_ - 1 + offset], &digits_[count_ - 1], count_ * sizeof(Type));
+            count_ += offset;
+        }
+        else {
+            digits_[count_] = 0;
+            for (size_t i = count_; i > 0; i--)
+                digits_[i + offset] = (digits_[i] << interShift) | (digits_[i - 1] >> (kTypeBit - interShift));
+            digits_[offset] = digits_[0] << interShift;
+            count_ += offset;
+            if (digits_[count_])
+                count_++;
+        }
+
+        std::memset(digits_, 0, offset * sizeof(Type));
+
+        return *this;
+    }
+
+    bool operator==(const BigInteger& rhs) const {
+        return count_ == rhs.count_ && std::memcmp(digits_, rhs.digits_, count_ * sizeof(Type)) == 0;
+    }
+
+    bool operator==(const Type rhs) const {
+        return count_ == 1 && digits_[0] == rhs;
+    }
+
+    BigInteger& MultiplyPow5(unsigned exp) {
+        static const uint32_t kPow5[12] = {
+            5,
+            5 * 5,
+            5 * 5 * 5,
+            5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5
+        };
+        if (exp == 0) return *this;
+        for (; exp >= 27; exp -= 27) *this *= RAPIDJSON_UINT64_C2(0X6765C793, 0XFA10079D); // 5^27
+        for (; exp >= 13; exp -= 13) *this *= static_cast<uint32_t>(1220703125u); // 5^13
+        if (exp > 0)                 *this *= kPow5[exp - 1];
+        return *this;
+    }
+
+    // Compute absolute difference of this and rhs.
+    // Assume this != rhs
+    bool Difference(const BigInteger& rhs, BigInteger* out) const {
+        int cmp = Compare(rhs);
+        RAPIDJSON_ASSERT(cmp != 0);
+        const BigInteger *a, *b;  // Makes a > b
+        bool ret;
+        if (cmp < 0) { a = &rhs; b = this; ret = true; }
+        else         { a = this; b = &rhs; ret = false; }
+
+        Type borrow = 0;
+        for (size_t i = 0; i < a->count_; i++) {
+            Type d = a->digits_[i] - borrow;
+            if (i < b->count_)
+                d -= b->digits_[i];
+            borrow = (d > a->digits_[i]) ? 1 : 0;
+            out->digits_[i] = d;
+            if (d != 0)
+                out->count_ = i + 1;
+        }
+
+        return ret;
+    }
+
+    int Compare(const BigInteger& rhs) const {
+        if (count_ != rhs.count_)
+            return count_ < rhs.count_ ? -1 : 1;
+
+        for (size_t i = count_; i-- > 0;)
+            if (digits_[i] != rhs.digits_[i])
+                return digits_[i] < rhs.digits_[i] ? -1 : 1;
+
+        return 0;
+    }
+
+    size_t GetCount() const { return count_; }
+    Type GetDigit(size_t index) const { RAPIDJSON_ASSERT(index < count_); return digits_[index]; }
+    bool IsZero() const { return count_ == 1 && digits_[0] == 0; }
+
+private:
+    void AppendDecimal64(const char* begin, const char* end) {
+        uint64_t u = ParseUint64(begin, end);
+        if (IsZero())
+            *this = u;
+        else {
+            unsigned exp = static_cast<unsigned>(end - begin);
+            (MultiplyPow5(exp) <<= exp) += u;   // *this = *this * 10^exp + u
+        }
+    }
+
+    void PushBack(Type digit) {
+        RAPIDJSON_ASSERT(count_ < kCapacity);
+        digits_[count_++] = digit;
+    }
+
+    static uint64_t ParseUint64(const char* begin, const char* end) {
+        uint64_t r = 0;
+        for (const char* p = begin; p != end; ++p) {
+            RAPIDJSON_ASSERT(*p >= '0' && *p <= '9');
+            r = r * 10u + static_cast<unsigned>(*p - '0');
+        }
+        return r;
+    }
+
+    // Assume a * b + k < 2^128
+    static uint64_t MulAdd64(uint64_t a, uint64_t b, uint64_t k, uint64_t* outHigh) {
+#if defined(_MSC_VER) && defined(_M_AMD64)
+        uint64_t low = _umul128(a, b, outHigh) + k;
+        if (low < k)
+            (*outHigh)++;
+        return low;
+#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
+        __extension__ typedef unsigned __int128 uint128;
+        uint128 p = static_cast<uint128>(a) * static_cast<uint128>(b);
+        p += k;
+        *outHigh = static_cast<uint64_t>(p >> 64);
+        return static_cast<uint64_t>(p);
+#else
+        const uint64_t a0 = a & 0xFFFFFFFF, a1 = a >> 32, b0 = b & 0xFFFFFFFF, b1 = b >> 32;
+        uint64_t x0 = a0 * b0, x1 = a0 * b1, x2 = a1 * b0, x3 = a1 * b1;
+        x1 += (x0 >> 32); // can't give carry
+        x1 += x2;
+        if (x1 < x2)
+            x3 += (static_cast<uint64_t>(1) << 32);
+        uint64_t lo = (x1 << 32) + (x0 & 0xFFFFFFFF);
+        uint64_t hi = x3 + (x1 >> 32);
+
+        lo += k;
+        if (lo < k)
+            hi++;
+        *outHigh = hi;
+        return lo;
+#endif
+    }
+
+    static const size_t kBitCount = 3328;  // 64bit * 54 > 10^1000
+    static const size_t kCapacity = kBitCount / sizeof(Type);
+    static const size_t kTypeBit = sizeof(Type) * 8;
+
+    Type digits_[kCapacity];
+    size_t count_;
+};
+
+} // namespace internal
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_BIGINTEGER_H_

Core/GDCore/Serialization/rapidjson/internal/diyfp.h

@@ -0,0 +1,258 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+// This is a C++ header-only implementation of Grisu2 algorithm from the publication:
+// Loitsch, Florian. "Printing floating-point numbers quickly and accurately with
+// integers." ACM Sigplan Notices 45.6 (2010): 233-243.
+
+#ifndef RAPIDJSON_DIYFP_H_
+#define RAPIDJSON_DIYFP_H_
+
+#include "../rapidjson.h"
+
+#if defined(_MSC_VER) && defined(_M_AMD64)
+#include <intrin.h>
+#pragma intrinsic(_BitScanReverse64)
+#pragma intrinsic(_umul128)
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+#ifdef __GNUC__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(effc++)
+#endif
+
+#ifdef __clang__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(padded)
+#endif
+
+struct DiyFp {
+    DiyFp() : f(), e() {}
+
+    DiyFp(uint64_t fp, int exp) : f(fp), e(exp) {}
+
+    explicit DiyFp(double d) {
+        union {
+            double d;
+            uint64_t u64;
+        } u = { d };
+
+        int biased_e = static_cast<int>((u.u64 & kDpExponentMask) >> kDpSignificandSize);
+        uint64_t significand = (u.u64 & kDpSignificandMask);
+        if (biased_e != 0) {
+            f = significand + kDpHiddenBit;
+            e = biased_e - kDpExponentBias;
+        } 
+        else {
+            f = significand;
+            e = kDpMinExponent + 1;
+        }
+    }
+
+    DiyFp operator-(const DiyFp& rhs) const {
+        return DiyFp(f - rhs.f, e);
+    }
+
+    DiyFp operator*(const DiyFp& rhs) const {
+#if defined(_MSC_VER) && defined(_M_AMD64)
+        uint64_t h;
+        uint64_t l = _umul128(f, rhs.f, &h);
+        if (l & (uint64_t(1) << 63)) // rounding
+            h++;
+        return DiyFp(h, e + rhs.e + 64);
+#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
+        __extension__ typedef unsigned __int128 uint128;
+        uint128 p = static_cast<uint128>(f) * static_cast<uint128>(rhs.f);
+        uint64_t h = static_cast<uint64_t>(p >> 64);
+        uint64_t l = static_cast<uint64_t>(p);
+        if (l & (uint64_t(1) << 63)) // rounding
+            h++;
+        return DiyFp(h, e + rhs.e + 64);
+#else
+        const uint64_t M32 = 0xFFFFFFFF;
+        const uint64_t a = f >> 32;
+        const uint64_t b = f & M32;
+        const uint64_t c = rhs.f >> 32;
+        const uint64_t d = rhs.f & M32;
+        const uint64_t ac = a * c;
+        const uint64_t bc = b * c;
+        const uint64_t ad = a * d;
+        const uint64_t bd = b * d;
+        uint64_t tmp = (bd >> 32) + (ad & M32) + (bc & M32);
+        tmp += 1U << 31;  /// mult_round
+        return DiyFp(ac + (ad >> 32) + (bc >> 32) + (tmp >> 32), e + rhs.e + 64);
+#endif
+    }
+
+    DiyFp Normalize() const {
+#if defined(_MSC_VER) && defined(_M_AMD64)
+        unsigned long index;
+        _BitScanReverse64(&index, f);
+        return DiyFp(f << (63 - index), e - (63 - index));
+#elif defined(__GNUC__) && __GNUC__ >= 4
+        int s = __builtin_clzll(f);
+        return DiyFp(f << s, e - s);
+#else
+        DiyFp res = *this;
+        while (!(res.f & (static_cast<uint64_t>(1) << 63))) {
+            res.f <<= 1;
+            res.e--;
+        }
+        return res;
+#endif
+    }
+
+    DiyFp NormalizeBoundary() const {
+        DiyFp res = *this;
+        while (!(res.f & (kDpHiddenBit << 1))) {
+            res.f <<= 1;
+            res.e--;
+        }
+        res.f <<= (kDiySignificandSize - kDpSignificandSize - 2);
+        res.e = res.e - (kDiySignificandSize - kDpSignificandSize - 2);
+        return res;
+    }
+
+    void NormalizedBoundaries(DiyFp* minus, DiyFp* plus) const {
+        DiyFp pl = DiyFp((f << 1) + 1, e - 1).NormalizeBoundary();
+        DiyFp mi = (f == kDpHiddenBit) ? DiyFp((f << 2) - 1, e - 2) : DiyFp((f << 1) - 1, e - 1);
+        mi.f <<= mi.e - pl.e;
+        mi.e = pl.e;
+        *plus = pl;
+        *minus = mi;
+    }
+
+    double ToDouble() const {
+        union {
+            double d;
+            uint64_t u64;
+        }u;
+        const uint64_t be = (e == kDpDenormalExponent && (f & kDpHiddenBit) == 0) ? 0 : 
+            static_cast<uint64_t>(e + kDpExponentBias);
+        u.u64 = (f & kDpSignificandMask) | (be << kDpSignificandSize);
+        return u.d;
+    }
+
+    static const int kDiySignificandSize = 64;
+    static const int kDpSignificandSize = 52;
+    static const int kDpExponentBias = 0x3FF + kDpSignificandSize;
+    static const int kDpMaxExponent = 0x7FF - kDpExponentBias;
+    static const int kDpMinExponent = -kDpExponentBias;
+    static const int kDpDenormalExponent = -kDpExponentBias + 1;
+    static const uint64_t kDpExponentMask = RAPIDJSON_UINT64_C2(0x7FF00000, 0x00000000);
+    static const uint64_t kDpSignificandMask = RAPIDJSON_UINT64_C2(0x000FFFFF, 0xFFFFFFFF);
+    static const uint64_t kDpHiddenBit = RAPIDJSON_UINT64_C2(0x00100000, 0x00000000);
+
+    uint64_t f;
+    int e;
+};
+
+inline DiyFp GetCachedPowerByIndex(size_t index) {
+    // 10^-348, 10^-340, ..., 10^340
+    static const uint64_t kCachedPowers_F[] = {
+        RAPIDJSON_UINT64_C2(0xfa8fd5a0, 0x081c0288), RAPIDJSON_UINT64_C2(0xbaaee17f, 0xa23ebf76),
+        RAPIDJSON_UINT64_C2(0x8b16fb20, 0x3055ac76), RAPIDJSON_UINT64_C2(0xcf42894a, 0x5dce35ea),
+        RAPIDJSON_UINT64_C2(0x9a6bb0aa, 0x55653b2d), RAPIDJSON_UINT64_C2(0xe61acf03, 0x3d1a45df),
+        RAPIDJSON_UINT64_C2(0xab70fe17, 0xc79ac6ca), RAPIDJSON_UINT64_C2(0xff77b1fc, 0xbebcdc4f),
+        RAPIDJSON_UINT64_C2(0xbe5691ef, 0x416bd60c), RAPIDJSON_UINT64_C2(0x8dd01fad, 0x907ffc3c),
+        RAPIDJSON_UINT64_C2(0xd3515c28, 0x31559a83), RAPIDJSON_UINT64_C2(0x9d71ac8f, 0xada6c9b5),
+        RAPIDJSON_UINT64_C2(0xea9c2277, 0x23ee8bcb), RAPIDJSON_UINT64_C2(0xaecc4991, 0x4078536d),
+        RAPIDJSON_UINT64_C2(0x823c1279, 0x5db6ce57), RAPIDJSON_UINT64_C2(0xc2109436, 0x4dfb5637),
+        RAPIDJSON_UINT64_C2(0x9096ea6f, 0x3848984f), RAPIDJSON_UINT64_C2(0xd77485cb, 0x25823ac7),
+        RAPIDJSON_UINT64_C2(0xa086cfcd, 0x97bf97f4), RAPIDJSON_UINT64_C2(0xef340a98, 0x172aace5),
+        RAPIDJSON_UINT64_C2(0xb23867fb, 0x2a35b28e), RAPIDJSON_UINT64_C2(0x84c8d4df, 0xd2c63f3b),
+        RAPIDJSON_UINT64_C2(0xc5dd4427, 0x1ad3cdba), RAPIDJSON_UINT64_C2(0x936b9fce, 0xbb25c996),
+        RAPIDJSON_UINT64_C2(0xdbac6c24, 0x7d62a584), RAPIDJSON_UINT64_C2(0xa3ab6658, 0x0d5fdaf6),
+        RAPIDJSON_UINT64_C2(0xf3e2f893, 0xdec3f126), RAPIDJSON_UINT64_C2(0xb5b5ada8, 0xaaff80b8),
+        RAPIDJSON_UINT64_C2(0x87625f05, 0x6c7c4a8b), RAPIDJSON_UINT64_C2(0xc9bcff60, 0x34c13053),
+        RAPIDJSON_UINT64_C2(0x964e858c, 0x91ba2655), RAPIDJSON_UINT64_C2(0xdff97724, 0x70297ebd),
+        RAPIDJSON_UINT64_C2(0xa6dfbd9f, 0xb8e5b88f), RAPIDJSON_UINT64_C2(0xf8a95fcf, 0x88747d94),
+        RAPIDJSON_UINT64_C2(0xb9447093, 0x8fa89bcf), RAPIDJSON_UINT64_C2(0x8a08f0f8, 0xbf0f156b),
+        RAPIDJSON_UINT64_C2(0xcdb02555, 0x653131b6), RAPIDJSON_UINT64_C2(0x993fe2c6, 0xd07b7fac),
+        RAPIDJSON_UINT64_C2(0xe45c10c4, 0x2a2b3b06), RAPIDJSON_UINT64_C2(0xaa242499, 0x697392d3),
+        RAPIDJSON_UINT64_C2(0xfd87b5f2, 0x8300ca0e), RAPIDJSON_UINT64_C2(0xbce50864, 0x92111aeb),
+        RAPIDJSON_UINT64_C2(0x8cbccc09, 0x6f5088cc), RAPIDJSON_UINT64_C2(0xd1b71758, 0xe219652c),
+        RAPIDJSON_UINT64_C2(0x9c400000, 0x00000000), RAPIDJSON_UINT64_C2(0xe8d4a510, 0x00000000),
+        RAPIDJSON_UINT64_C2(0xad78ebc5, 0xac620000), RAPIDJSON_UINT64_C2(0x813f3978, 0xf8940984),
+        RAPIDJSON_UINT64_C2(0xc097ce7b, 0xc90715b3), RAPIDJSON_UINT64_C2(0x8f7e32ce, 0x7bea5c70),
+        RAPIDJSON_UINT64_C2(0xd5d238a4, 0xabe98068), RAPIDJSON_UINT64_C2(0x9f4f2726, 0x179a2245),
+        RAPIDJSON_UINT64_C2(0xed63a231, 0xd4c4fb27), RAPIDJSON_UINT64_C2(0xb0de6538, 0x8cc8ada8),
+        RAPIDJSON_UINT64_C2(0x83c7088e, 0x1aab65db), RAPIDJSON_UINT64_C2(0xc45d1df9, 0x42711d9a),
+        RAPIDJSON_UINT64_C2(0x924d692c, 0xa61be758), RAPIDJSON_UINT64_C2(0xda01ee64, 0x1a708dea),
+        RAPIDJSON_UINT64_C2(0xa26da399, 0x9aef774a), RAPIDJSON_UINT64_C2(0xf209787b, 0xb47d6b85),
+        RAPIDJSON_UINT64_C2(0xb454e4a1, 0x79dd1877), RAPIDJSON_UINT64_C2(0x865b8692, 0x5b9bc5c2),
+        RAPIDJSON_UINT64_C2(0xc83553c5, 0xc8965d3d), RAPIDJSON_UINT64_C2(0x952ab45c, 0xfa97a0b3),
+        RAPIDJSON_UINT64_C2(0xde469fbd, 0x99a05fe3), RAPIDJSON_UINT64_C2(0xa59bc234, 0xdb398c25),
+        RAPIDJSON_UINT64_C2(0xf6c69a72, 0xa3989f5c), RAPIDJSON_UINT64_C2(0xb7dcbf53, 0x54e9bece),
+        RAPIDJSON_UINT64_C2(0x88fcf317, 0xf22241e2), RAPIDJSON_UINT64_C2(0xcc20ce9b, 0xd35c78a5),
+        RAPIDJSON_UINT64_C2(0x98165af3, 0x7b2153df), RAPIDJSON_UINT64_C2(0xe2a0b5dc, 0x971f303a),
+        RAPIDJSON_UINT64_C2(0xa8d9d153, 0x5ce3b396), RAPIDJSON_UINT64_C2(0xfb9b7cd9, 0xa4a7443c),
+        RAPIDJSON_UINT64_C2(0xbb764c4c, 0xa7a44410), RAPIDJSON_UINT64_C2(0x8bab8eef, 0xb6409c1a),
+        RAPIDJSON_UINT64_C2(0xd01fef10, 0xa657842c), RAPIDJSON_UINT64_C2(0x9b10a4e5, 0xe9913129),
+        RAPIDJSON_UINT64_C2(0xe7109bfb, 0xa19c0c9d), RAPIDJSON_UINT64_C2(0xac2820d9, 0x623bf429),
+        RAPIDJSON_UINT64_C2(0x80444b5e, 0x7aa7cf85), RAPIDJSON_UINT64_C2(0xbf21e440, 0x03acdd2d),
+        RAPIDJSON_UINT64_C2(0x8e679c2f, 0x5e44ff8f), RAPIDJSON_UINT64_C2(0xd433179d, 0x9c8cb841),
+        RAPIDJSON_UINT64_C2(0x9e19db92, 0xb4e31ba9), RAPIDJSON_UINT64_C2(0xeb96bf6e, 0xbadf77d9),
+        RAPIDJSON_UINT64_C2(0xaf87023b, 0x9bf0ee6b)
+    };
+    static const int16_t kCachedPowers_E[] = {
+        -1220, -1193, -1166, -1140, -1113, -1087, -1060, -1034, -1007,  -980,
+        -954,  -927,  -901,  -874,  -847,  -821,  -794,  -768,  -741,  -715,
+        -688,  -661,  -635,  -608,  -582,  -555,  -529,  -502,  -475,  -449,
+        -422,  -396,  -369,  -343,  -316,  -289,  -263,  -236,  -210,  -183,
+        -157,  -130,  -103,   -77,   -50,   -24,     3,    30,    56,    83,
+        109,   136,   162,   189,   216,   242,   269,   295,   322,   348,
+        375,   402,   428,   455,   481,   508,   534,   561,   588,   614,
+        641,   667,   694,   720,   747,   774,   800,   827,   853,   880,
+        907,   933,   960,   986,  1013,  1039,  1066
+    };
+    return DiyFp(kCachedPowers_F[index], kCachedPowers_E[index]);
+}
+    
+inline DiyFp GetCachedPower(int e, int* K) {
+
+    //int k = static_cast<int>(ceil((-61 - e) * 0.30102999566398114)) + 374;
+    double dk = (-61 - e) * 0.30102999566398114 + 347;  // dk must be positive, so can do ceiling in positive
+    int k = static_cast<int>(dk);
+    if (dk - k > 0.0)
+        k++;
+
+    unsigned index = static_cast<unsigned>((k >> 3) + 1);
+    *K = -(-348 + static_cast<int>(index << 3));    // decimal exponent no need lookup table
+
+    return GetCachedPowerByIndex(index);
+}
+
+inline DiyFp GetCachedPower10(int exp, int *outExp) {
+     unsigned index = (static_cast<unsigned>(exp) + 348u) / 8u;
+     *outExp = -348 + static_cast<int>(index) * 8;
+     return GetCachedPowerByIndex(index);
+ }
+
+#ifdef __GNUC__
+RAPIDJSON_DIAG_POP
+#endif
+
+#ifdef __clang__
+RAPIDJSON_DIAG_POP
+RAPIDJSON_DIAG_OFF(padded)
+#endif
+
+} // namespace internal
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_DIYFP_H_

Core/GDCore/Serialization/rapidjson/internal/dtoa.h

@@ -0,0 +1,245 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+// This is a C++ header-only implementation of Grisu2 algorithm from the publication:
+// Loitsch, Florian. "Printing floating-point numbers quickly and accurately with
+// integers." ACM Sigplan Notices 45.6 (2010): 233-243.
+
+#ifndef RAPIDJSON_DTOA_
+#define RAPIDJSON_DTOA_
+
+#include "itoa.h" // GetDigitsLut()
+#include "diyfp.h"
+#include "ieee754.h"
+
+RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+#ifdef __GNUC__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(effc++)
+RAPIDJSON_DIAG_OFF(array-bounds) // some gcc versions generate wrong warnings https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59124
+#endif
+
+inline void GrisuRound(char* buffer, int len, uint64_t delta, uint64_t rest, uint64_t ten_kappa, uint64_t wp_w) {
+    while (rest < wp_w && delta - rest >= ten_kappa &&
+           (rest + ten_kappa < wp_w ||  /// closer
+            wp_w - rest > rest + ten_kappa - wp_w)) {
+        buffer[len - 1]--;
+        rest += ten_kappa;
+    }
+}
+
+inline unsigned CountDecimalDigit32(uint32_t n) {
+    // Simple pure C++ implementation was faster than __builtin_clz version in this situation.
+    if (n < 10) return 1;
+    if (n < 100) return 2;
+    if (n < 1000) return 3;
+    if (n < 10000) return 4;
+    if (n < 100000) return 5;
+    if (n < 1000000) return 6;
+    if (n < 10000000) return 7;
+    if (n < 100000000) return 8;
+    // Will not reach 10 digits in DigitGen()
+    //if (n < 1000000000) return 9;
+    //return 10;
+    return 9;
+}
+
+inline void DigitGen(const DiyFp& W, const DiyFp& Mp, uint64_t delta, char* buffer, int* len, int* K) {
+    static const uint32_t kPow10[] = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000 };
+    const DiyFp one(uint64_t(1) << -Mp.e, Mp.e);
+    const DiyFp wp_w = Mp - W;
+    uint32_t p1 = static_cast<uint32_t>(Mp.f >> -one.e);
+    uint64_t p2 = Mp.f & (one.f - 1);
+    unsigned kappa = CountDecimalDigit32(p1); // kappa in [0, 9]
+    *len = 0;
+
+    while (kappa > 0) {
+        uint32_t d = 0;
+        switch (kappa) {
+            case  9: d = p1 /  100000000; p1 %=  100000000; break;
+            case  8: d = p1 /   10000000; p1 %=   10000000; break;
+            case  7: d = p1 /    1000000; p1 %=    1000000; break;
+            case  6: d = p1 /     100000; p1 %=     100000; break;
+            case  5: d = p1 /      10000; p1 %=      10000; break;
+            case  4: d = p1 /       1000; p1 %=       1000; break;
+            case  3: d = p1 /        100; p1 %=        100; break;
+            case  2: d = p1 /         10; p1 %=         10; break;
+            case  1: d = p1;              p1 =           0; break;
+            default:;
+        }
+        if (d || *len)
+            buffer[(*len)++] = static_cast<char>('0' + static_cast<char>(d));
+        kappa--;
+        uint64_t tmp = (static_cast<uint64_t>(p1) << -one.e) + p2;
+        if (tmp <= delta) {
+            *K += kappa;
+            GrisuRound(buffer, *len, delta, tmp, static_cast<uint64_t>(kPow10[kappa]) << -one.e, wp_w.f);
+            return;
+        }
+    }
+
+    // kappa = 0
+    for (;;) {
+        p2 *= 10;
+        delta *= 10;
+        char d = static_cast<char>(p2 >> -one.e);
+        if (d || *len)
+            buffer[(*len)++] = static_cast<char>('0' + d);
+        p2 &= one.f - 1;
+        kappa--;
+        if (p2 < delta) {
+            *K += kappa;
+            int index = -static_cast<int>(kappa);
+            GrisuRound(buffer, *len, delta, p2, one.f, wp_w.f * (index < 9 ? kPow10[-static_cast<int>(kappa)] : 0));
+            return;
+        }
+    }
+}
+
+inline void Grisu2(double value, char* buffer, int* length, int* K) {
+    const DiyFp v(value);
+    DiyFp w_m, w_p;
+    v.NormalizedBoundaries(&w_m, &w_p);
+
+    const DiyFp c_mk = GetCachedPower(w_p.e, K);
+    const DiyFp W = v.Normalize() * c_mk;
+    DiyFp Wp = w_p * c_mk;
+    DiyFp Wm = w_m * c_mk;
+    Wm.f++;
+    Wp.f--;
+    DigitGen(W, Wp, Wp.f - Wm.f, buffer, length, K);
+}
+
+inline char* WriteExponent(int K, char* buffer) {
+    if (K < 0) {
+        *buffer++ = '-';
+        K = -K;
+    }
+
+    if (K >= 100) {
+        *buffer++ = static_cast<char>('0' + static_cast<char>(K / 100));
+        K %= 100;
+        const char* d = GetDigitsLut() + K * 2;
+        *buffer++ = d[0];
+        *buffer++ = d[1];
+    }
+    else if (K >= 10) {
+        const char* d = GetDigitsLut() + K * 2;
+        *buffer++ = d[0];
+        *buffer++ = d[1];
+    }
+    else
+        *buffer++ = static_cast<char>('0' + static_cast<char>(K));
+
+    return buffer;
+}
+
+inline char* Prettify(char* buffer, int length, int k, int maxDecimalPlaces) {
+    const int kk = length + k;  // 10^(kk-1) <= v < 10^kk
+
+    if (0 <= k && kk <= 21) {
+        // 1234e7 -> 12340000000
+        for (int i = length; i < kk; i++)
+            buffer[i] = '0';
+        buffer[kk] = '.';
+        buffer[kk + 1] = '0';
+        return &buffer[kk + 2];
+    }
+    else if (0 < kk && kk <= 21) {
+        // 1234e-2 -> 12.34
+        std::memmove(&buffer[kk + 1], &buffer[kk], static_cast<size_t>(length - kk));
+        buffer[kk] = '.';
+        if (0 > k + maxDecimalPlaces) {
+            // When maxDecimalPlaces = 2, 1.2345 -> 1.23, 1.102 -> 1.1
+            // Remove extra trailing zeros (at least one) after truncation.
+            for (int i = kk + maxDecimalPlaces; i > kk + 1; i--)
+                if (buffer[i] != '0')
+                    return &buffer[i + 1];
+            return &buffer[kk + 2]; // Reserve one zero
+        }
+        else
+            return &buffer[length + 1];
+    }
+    else if (-6 < kk && kk <= 0) {
+        // 1234e-6 -> 0.001234
+        const int offset = 2 - kk;
+        std::memmove(&buffer[offset], &buffer[0], static_cast<size_t>(length));
+        buffer[0] = '0';
+        buffer[1] = '.';
+        for (int i = 2; i < offset; i++)
+            buffer[i] = '0';
+        if (length - kk > maxDecimalPlaces) {
+            // When maxDecimalPlaces = 2, 0.123 -> 0.12, 0.102 -> 0.1
+            // Remove extra trailing zeros (at least one) after truncation.
+            for (int i = maxDecimalPlaces + 1; i > 2; i--)
+                if (buffer[i] != '0')
+                    return &buffer[i + 1];
+            return &buffer[3]; // Reserve one zero
+        }
+        else
+            return &buffer[length + offset];
+    }
+    else if (kk < -maxDecimalPlaces) {
+        // Truncate to zero
+        buffer[0] = '0';
+        buffer[1] = '.';
+        buffer[2] = '0';
+        return &buffer[3];
+    }
+    else if (length == 1) {
+        // 1e30
+        buffer[1] = 'e';
+        return WriteExponent(kk - 1, &buffer[2]);
+    }
+    else {
+        // 1234e30 -> 1.234e33
+        std::memmove(&buffer[2], &buffer[1], static_cast<size_t>(length - 1));
+        buffer[1] = '.';
+        buffer[length + 1] = 'e';
+        return WriteExponent(kk - 1, &buffer[0 + length + 2]);
+    }
+}
+
+inline char* dtoa(double value, char* buffer, int maxDecimalPlaces = 324) {
+    RAPIDJSON_ASSERT(maxDecimalPlaces >= 1);
+    Double d(value);
+    if (d.IsZero()) {
+        if (d.Sign())
+            *buffer++ = '-';     // -0.0, Issue #289
+        buffer[0] = '0';
+        buffer[1] = '.';
+        buffer[2] = '0';
+        return &buffer[3];
+    }
+    else {
+        if (value < 0) {
+            *buffer++ = '-';
+            value = -value;
+        }
+        int length, K;
+        Grisu2(value, buffer, &length, &K);
+        return Prettify(buffer, length, K, maxDecimalPlaces);
+    }
+}
+
+#ifdef __GNUC__
+RAPIDJSON_DIAG_POP
+#endif
+
+} // namespace internal
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_DTOA_