[Experimental][WIP] Batch actions related to the same objects

.vscode/settings.json

@@ -77,7 +77,9 @@
         "cstdint": "cpp",
         "forward_list": "cpp",
         "mutex": "cpp",
-        "__hash": "cpp"
+        "__hash": "cpp",
+        "__debug": "cpp",
+        "__threading_support": "cpp"
     },
     "files.exclude": {
         "Binaries/*build*": true,

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -447,33 +447,21 @@ gd::String EventsCodeGenerator::GenerateConditionsListCode(
   return outputCode;
 }
 
-/**
+// TODO: Could be moved to a EventsValidator
- * Generate code for an action.
+void EventsCodeGenerator::ValidateAction(
- */
+    gd::InstructionMetadata& instructionMetadata, gd::Instruction& action) {
-gd::String EventsCodeGenerator::GenerateActionCode(
-    gd::Instruction& action, EventsCodeGenerationContext& context) {
-  gd::String actionCode;
-
-  gd::InstructionMetadata instrInfos =
-      MetadataProvider::GetActionMetadata(platform, action.GetType());
-
-  AddIncludeFiles(instrInfos.codeExtraInformation.GetIncludeFiles());
-
-  if (instrInfos.codeExtraInformation.HasCustomCodeGenerator()) {
-    return instrInfos.codeExtraInformation.customCodeGenerator(
-        action, *this, context);
-  }
-
   // Be sure there is no lack of parameter.
-  while (action.GetParameters().size() < instrInfos.parameters.size()) {
+  while (action.GetParameters().size() <
+         instructionMetadata.parameters.size()) {
     vector<gd::Expression> parameters = action.GetParameters();
     parameters.push_back(gd::Expression(""));
     action.SetParameters(parameters);
   }
 
   // Verify that there are not mismatch between object type in parameters
-  for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
+  for (std::size_t pNb = 0; pNb < instructionMetadata.parameters.size();
-    if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].type)) {
+       ++pNb) {
+    if (ParameterMetadata::IsObject(instructionMetadata.parameters[pNb].type)) {
       gd::String objectInParameter = action.GetParameter(pNb).GetPlainString();
       if (!GetObjectsAndGroups().HasObjectNamed(objectInParameter) &&
           !GetGlobalObjectsAndGroups().HasObjectNamed(objectInParameter) &&
@@ -482,89 +470,18 @@ gd::String EventsCodeGenerator::GenerateActionCode(
               objectInParameter)) {
         action.SetParameter(pNb, gd::Expression(""));
         action.SetType("");
-      } else if (!instrInfos.parameters[pNb].supplementaryInformation.empty() &&
+      } else if (!instructionMetadata.parameters[pNb]
+                      .supplementaryInformation.empty() &&
                  gd::GetTypeOfObject(GetGlobalObjectsAndGroups(),
                                      GetObjectsAndGroups(),
                                      objectInParameter) !=
-                     instrInfos.parameters[pNb].supplementaryInformation) {
+                     instructionMetadata.parameters[pNb]
+                         .supplementaryInformation) {
         action.SetParameter(pNb, gd::Expression(""));
         action.SetType("");
       }
     }
   }
-
-  // Call free function first if available
-  if (MetadataProvider::HasAction(platform, action.GetType())) {
-    vector<gd::String> arguments = GenerateParametersCodes(
-        action.GetParameters(), instrInfos.parameters, context);
-    actionCode += GenerateFreeAction(arguments, instrInfos, context);
-  }
-
-  // Call object function if available
-  gd::String objectName = action.GetParameters().empty()
-                              ? ""
-                              : action.GetParameter(0).GetPlainString();
-  gd::String objectType = gd::GetTypeOfObject(
-      GetGlobalObjectsAndGroups(), GetObjectsAndGroups(), objectName);
-  if (MetadataProvider::HasObjectAction(
-          platform, objectType, action.GetType()) &&
-      !instrInfos.parameters.empty()) {
-    std::vector<gd::String> realObjects =
-        ExpandObjectsName(objectName, context);
-    for (std::size_t i = 0; i < realObjects.size(); ++i) {
-      // Setup context
-      const ObjectMetadata& objInfo =
-          MetadataProvider::GetObjectMetadata(platform, objectType);
-      AddIncludeFiles(objInfo.includeFiles);
-      context.SetCurrentObject(realObjects[i]);
-      context.ObjectsListNeeded(realObjects[i]);
-
-      // Prepare arguments and generate the whole action code
-      vector<gd::String> arguments = GenerateParametersCodes(
-          action.GetParameters(), instrInfos.parameters, context);
-      actionCode += GenerateObjectAction(
-          realObjects[i], objInfo, arguments, instrInfos, context);
-
-      context.SetNoCurrentObject();
-    }
-  }
-
-  // Assign to a behavior member function if found
-  gd::String behaviorType =
-      gd::GetTypeOfBehavior(GetGlobalObjectsAndGroups(),
-                            GetObjectsAndGroups(),
-                            action.GetParameters().size() < 2
-                                ? ""
-                                : action.GetParameter(1).GetPlainString());
-  if (MetadataProvider::HasBehaviorAction(
-          platform, behaviorType, action.GetType()) &&
-      instrInfos.parameters.size() >= 2) {
-    std::vector<gd::String> realObjects =
-        ExpandObjectsName(objectName, context);
-    for (std::size_t i = 0; i < realObjects.size(); ++i) {
-      // Setup context
-      const BehaviorMetadata& autoInfo =
-          MetadataProvider::GetBehaviorMetadata(platform, behaviorType);
-      AddIncludeFiles(autoInfo.includeFiles);
-      context.SetCurrentObject(realObjects[i]);
-      context.ObjectsListNeeded(realObjects[i]);
-
-      // Prepare arguments and generate the whole action code
-      vector<gd::String> arguments = GenerateParametersCodes(
-          action.GetParameters(), instrInfos.parameters, context);
-      actionCode +=
-          GenerateBehaviorAction(realObjects[i],
-                                 action.GetParameter(1).GetPlainString(),
-                                 autoInfo,
-                                 arguments,
-                                 instrInfos,
-                                 context);
-
-      context.SetNoCurrentObject();
-    }
-  }
-
-  return actionCode;
 }
 
 /**
@@ -573,17 +490,169 @@ gd::String EventsCodeGenerator::GenerateActionCode(
 gd::String EventsCodeGenerator::GenerateActionsListCode(
     gd::InstructionsList& actions, EventsCodeGenerationContext& context) {
   gd::String outputCode;
+
+  // Generation of actions related to a same object (or same group)
+  // is batched, so that we only iterate once on the objects, and not
+  // one time for every action.
+  gd::String batchedObjectName;
+  gd::String batchedObjectType;
+  std::vector<gd::Instruction*> batchedActions;
+  auto generateBatchedObjectActionsCode = [&]() {
+    if (batchedActions.empty()) {
+      return gd::String("");
+    }
+
+    gd::String batchedActionsCode;
+
+    std::vector<gd::String> realObjects =
+        ExpandObjectsName(batchedObjectName, context);
+    for (std::size_t i = 0; i < realObjects.size(); ++i) {
+      // Setup context
+      context.SetCurrentObject(realObjects[i]);
+      context.ObjectsListNeeded(realObjects[i]);
+
+      gd::String actionsCode =
+          batchedActions.size() > 1
+              ? "/*Batching for " + batchedObjectName + "*/\n"
+              : "/*No batching for " + batchedObjectName + "*/\n";
+
+      for (auto& actionPtr : batchedActions) {
+        auto& action = *actionPtr;
+        gd::InstructionMetadata instrInfos =
+            MetadataProvider::GetActionMetadata(platform, action.GetType());
+
+        if (MetadataProvider::HasObjectAction(
+                platform, batchedObjectType, action.GetType()) &&
+            !instrInfos.parameters.empty()) {
+          const ObjectMetadata& objInfo =
+              MetadataProvider::GetObjectMetadata(platform, batchedObjectType);
+          AddIncludeFiles(objInfo.includeFiles);
+
+          // Prepare arguments and generate the whole action code
+          vector<gd::String> arguments = GenerateParametersCodes(
+              action.GetParameters(),
+              instrInfos.parameters,
+              context);  // TODO: FACTOR or move into Generate function?
+          actionsCode += GenerateObjectAction(
+              realObjects[i], objInfo, arguments, instrInfos, context);
+        } else {
+          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) {
+            // Setup context
+            const BehaviorMetadata& autoInfo =
+                MetadataProvider::GetBehaviorMetadata(platform, behaviorType);
+            AddIncludeFiles(autoInfo.includeFiles);
+
+            // Prepare arguments and generate the whole action code
+            vector<gd::String> arguments = GenerateParametersCodes(
+                action.GetParameters(),
+                instrInfos.parameters,
+                context);  // TODO: FACTOR or move into Generate function?
+            actionsCode +=
+                GenerateBehaviorAction(realObjects[i],
+                                       action.GetParameter(1).GetPlainString(),
+                                       autoInfo,
+                                       arguments,
+                                       instrInfos,
+                                       context);
+          }
+        }
+      }
+      batchedActionsCode +=
+          GenerateObjectLoop(realObjects[i], context, actionsCode); //TODO: use for conditions too
+      context.SetNoCurrentObject();
+    }
+
+    batchedObjectName = "";
+    batchedObjectType = "";
+    batchedActions.clear();
+
+    return batchedActionsCode;
+  };
+
+  // Defer the generation of the object (or behavior) action.
+  auto batchObjectAction = [&](const gd::String& objectName,
+                               const gd::String& objectType,
+                               gd::Instruction& action) {
+    gd::String outputCode;
+    if (objectName != batchedObjectName || objectType != batchedObjectType) {
+      // Dump any batched action for a different object before.
+      outputCode += generateBatchedObjectActionsCode();
+      batchedObjectName = objectName;
+      batchedObjectType = objectType;
+    }
+
+    batchedActions.push_back(&action);
+
+    return outputCode;
+  };
+
   for (std::size_t aId = 0; aId < actions.size(); ++aId) {
+    gd::Instruction& action = actions[aId];
     gd::InstructionMetadata instrInfos =
         MetadataProvider::GetActionMetadata(platform, actions[aId].GetType());
 
-    gd::String actionCode = GenerateActionCode(actions[aId], context);
+    AddIncludeFiles(instrInfos.codeExtraInformation.GetIncludeFiles());
 
-    outputCode += "{";
+    // Generate custom code if needed
-    if (!actions[aId].GetType().empty()) outputCode += actionCode;
+    if (instrInfos.codeExtraInformation.HasCustomCodeGenerator()) {
-    outputCode += "}";
+      outputCode += generateBatchedObjectActionsCode();  // Dump any batched
+                                                         // action before.
+      outputCode += instrInfos.codeExtraInformation.customCodeGenerator(
+          action, *this, context);
+    } else {
+      // No custom code
+      ValidateAction(instrInfos, action);
+
+      // Call free function first if available
+      if (MetadataProvider::HasAction(platform, action.GetType())) {
+        outputCode += generateBatchedObjectActionsCode();  // Dump any batched
+                                                           // action before.
+
+        vector<gd::String> arguments = GenerateParametersCodes(
+            action.GetParameters(),
+            instrInfos.parameters,
+            context);  // TODO: FACTOR or move into Generate function?
+        outputCode += 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()) {
+        outputCode += batchObjectAction(objectName, objectType, action);
+      }
+
+      // 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) {
+        outputCode += batchObjectAction(objectName, objectType, action);
+      }
+    }
   }
 
+  // Dump any remaining batched actions.
+  outputCode += generateBatchedObjectActionsCode();
+
   return outputCode;
 }
 
@@ -1029,6 +1098,18 @@ gd::String EventsCodeGenerator::GenerateFreeAction(
   return call + ";\n";
 }
 
+gd::String EventsCodeGenerator::GenerateObjectLoop(
+    const gd::String& objectName,
+    gd::EventsCodeGenerationContext& context,
+    const gd::String& innerLoopCode) {
+  gd::String loopCode; //TODO: For GDCpp
+  loopCode += "foreach("+objectName+") {\n";
+  loopCode += "    " + innerLoopCode + ";\n";
+  loopCode += "}\n";
+
+  return loopCode;
+}
+
 gd::String EventsCodeGenerator::GenerateObjectAction(
     const gd::String& objectName,
     const gd::ObjectMetadata& objInfo,
@@ -1054,14 +1135,13 @@ gd::String EventsCodeGenerator::GenerateObjectAction(
           instrInfos.codeExtraInformation.functionCallName,
           2);
 
-    return "For each picked object \"" + objectName + "\", call " + call +
+    return "For object \"" + objectName + "\", call " + call + ".\n";
-           ".\n";
   } else {
     gd::String argumentsStr = GenerateArgumentsList(arguments, 1);
 
     call = instrInfos.codeExtraInformation.functionCallName + "(" +
            argumentsStr + ")";
-    return "For each picked object \"" + objectName + "\", call " + call + "(" +
+    return "For object \"" + objectName + "\", call " + call + "(" +
            argumentsStr + ").\n";
   }
 }
@@ -1091,14 +1171,14 @@ gd::String EventsCodeGenerator::GenerateBehaviorAction(
           arguments,
           instrInfos.codeExtraInformation.functionCallName,
           2);
-    return "For each picked object \"" + objectName + "\", call " + call +
+    return "For object \"" + objectName + "\", call " + call +
            " for behavior \"" + behaviorName + "\".\n";
   } else {
     gd::String argumentsStr = GenerateArgumentsList(arguments, 2);
 
     call = instrInfos.codeExtraInformation.functionCallName + "(" +
            argumentsStr + ")";
-    return "For each picked object \"" + objectName + "\", call " + call + "(" +
+    return "For object \"" + objectName + "\", call " + call + "(" +
            argumentsStr + ")" + " for behavior \"" + behaviorName + "\".\n";
   }
 }

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h

@@ -147,19 +147,6 @@ class GD_CORE_API EventsCodeGenerator {
                                    gd::String returnBoolean,
                                    EventsCodeGenerationContext& context);
 
-  /**
-   * \brief Generate code for a single action
-   *
-   * The generation is really done in GenerateFreeAction/GenerateObjectAction or
-   * GenerateBehaviorAction.
-   *
-   * \param condition instruction to be done.
-   * \param context Context used for generation
-   * \return Code
-   */
-  gd::String GenerateActionCode(gd::Instruction& action,
-                                EventsCodeGenerationContext& context);
-
   /**
    * \brief Generate code for declaring objects lists.
    *
@@ -659,6 +646,11 @@ class GD_CORE_API EventsCodeGenerator {
       const gd::InstructionMetadata& instrInfos,
       gd::EventsCodeGenerationContext& context);
 
+  virtual gd::String GenerateObjectLoop(
+      const gd::String& objectName,
+      gd::EventsCodeGenerationContext& context,
+      const gd::String& innerLoopCode);
+      
   virtual gd::String GenerateObjectAction(
       const gd::String& objectName,
       const gd::ObjectMetadata& objInfo,
@@ -714,6 +706,8 @@ class GD_CORE_API EventsCodeGenerator {
   virtual gd::String GenerateArgumentsList(
       const std::vector<gd::String>& arguments, size_t startFrom = 0);
 
+  void ValidateAction(gd::InstructionMetadata & instructionMetadata, gd::Instruction& action);
+
   const gd::Platform& platform;  ///< The platform being used.
 
   gd::ObjectsContainer& globalObjectsAndGroups;

GDJS/GDJS/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -483,18 +483,16 @@ gd::String EventsCodeGenerator::GenerateObjectAction(
     const std::vector<gd::String>& arguments,
     const gd::InstructionMetadata& instrInfos,
     gd::EventsCodeGenerationContext& context) {
-  gd::String actionCode;
-
   // Prepare call
   gd::String objectPart = GetObjectListName(objectName, context) + "[i].";
 
   // Create call
-  gd::String call;
+  gd::String callCode;
   if (instrInfos.codeExtraInformation.type == "number" ||
       instrInfos.codeExtraInformation.type == "string") {
     if (instrInfos.codeExtraInformation.accessType ==
         gd::InstructionMetadata::ExtraInformation::MutatorAndOrAccessor)
-      call = GenerateOperatorCall(
+      callCode = GenerateOperatorCall(
           instrInfos,
           arguments,
           objectPart + instrInfos.codeExtraInformation.functionCallName,
@@ -503,29 +501,23 @@ gd::String EventsCodeGenerator::GenerateObjectAction(
           1);
     else if (instrInfos.codeExtraInformation.accessType ==
              gd::InstructionMetadata::ExtraInformation::Mutators)
-      call = GenerateMutatorCall(
+      callCode = GenerateMutatorCall(
           instrInfos,
           arguments,
           objectPart + instrInfos.codeExtraInformation.functionCallName,
           1);
     else
-      call = GenerateCompoundOperatorCall(
+      callCode = GenerateCompoundOperatorCall(
           instrInfos,
           arguments,
           objectPart + instrInfos.codeExtraInformation.functionCallName,
           1);
   } else {
-    call = objectPart + instrInfos.codeExtraInformation.functionCallName + "(" +
+    callCode = objectPart + instrInfos.codeExtraInformation.functionCallName +
-           GenerateArgumentsList(arguments, 1) + ")";
+               "(" + GenerateArgumentsList(arguments, 1) + ")";
   }
 
-  actionCode +=
+  return callCode + ";\n";
-      "for(var i = 0, len = " + GetObjectListName(objectName, context) +
-      ".length ;i < len;++i) {\n";
-  actionCode += "    " + call + ";\n";
-  actionCode += "}\n";
-
-  return actionCode;
 }
 
 gd::String EventsCodeGenerator::GenerateBehaviorAction(
@@ -535,20 +527,17 @@ gd::String EventsCodeGenerator::GenerateBehaviorAction(
     const std::vector<gd::String>& arguments,
     const gd::InstructionMetadata& instrInfos,
     gd::EventsCodeGenerationContext& context) {
-  gd::String actionCode;
-
   // Prepare call
-  // Add a static_cast if necessary
   gd::String objectPart = GetObjectListName(objectName, context) +
                           "[i].getBehavior(\"" + behaviorName + "\").";
 
   // Create call
-  gd::String call;
+  gd::String callCode;
   if ((instrInfos.codeExtraInformation.type == "number" ||
        instrInfos.codeExtraInformation.type == "string")) {
     if (instrInfos.codeExtraInformation.accessType ==
         gd::InstructionMetadata::ExtraInformation::MutatorAndOrAccessor)
-      call = GenerateOperatorCall(
+      callCode = GenerateOperatorCall(
           instrInfos,
           arguments,
           objectPart + instrInfos.codeExtraInformation.functionCallName,
@@ -557,19 +546,19 @@ gd::String EventsCodeGenerator::GenerateBehaviorAction(
           2);
     else if (instrInfos.codeExtraInformation.accessType ==
              gd::InstructionMetadata::ExtraInformation::Mutators)
-      call = GenerateMutatorCall(
+      callCode = GenerateMutatorCall(
           instrInfos,
           arguments,
           objectPart + instrInfos.codeExtraInformation.functionCallName,
           2);
     else
-      call = GenerateCompoundOperatorCall(
+      callCode = GenerateCompoundOperatorCall(
           instrInfos,
           arguments,
           objectPart + instrInfos.codeExtraInformation.functionCallName,
           2);
   } else {
-    call = objectPart + instrInfos.codeExtraInformation.functionCallName + "(" +
+    callCode = objectPart + instrInfos.codeExtraInformation.functionCallName + "(" +
            GenerateArgumentsList(arguments, 2) + ")";
   }
 
@@ -581,15 +570,23 @@ gd::String EventsCodeGenerator::GenerateBehaviorAction(
     cout << "Error: bad behavior \"" << behaviorName
          << "\" requested for object \'" << objectName
          << "\" (action: " << instrInfos.GetFullName() << ")." << endl;
-  } else {
+    return "";
-    actionCode +=
-        "for(var i = 0, len = " + GetObjectListName(objectName, context) +
-        ".length ;i < len;++i) {\n";
-    actionCode += "    " + call + ";\n";
-    actionCode += "}\n";
   }
 
-  return actionCode;
+  return callCode + ";\n";
+}
+
+gd::String EventsCodeGenerator::GenerateObjectLoop(
+    const gd::String& objectName,
+    gd::EventsCodeGenerationContext& context,
+    const gd::String& innerLoopCode) {
+  gd::String loopCode;
+  loopCode += "for(var i = 0, len = " + GetObjectListName(objectName, context) +
+              ".length ;i < len;++i) {\n";
+  loopCode += "    " + innerLoopCode + "\n";
+  loopCode += "}\n";
+
+  return loopCode;
 }
 
 gd::String EventsCodeGenerator::GetObjectListName(

GDJS/GDJS/Events/CodeGeneration/EventsCodeGenerator.h

@@ -197,6 +197,11 @@ class EventsCodeGenerator : public gd::EventsCodeGenerator {
       bool conditionInverted,
       gd::EventsCodeGenerationContext& context);
 
+  virtual gd::String GenerateObjectLoop(
+      const gd::String& objectName,
+      gd::EventsCodeGenerationContext& context,
+      const gd::String& innerLoopCode);
+
   virtual gd::String GenerateObjectAction(
       const gd::String& objectName,
       const gd::ObjectMetadata& objInfo,