Use the new syntax when generating expressions and actions for proper…

…ties (#5976)
4ian · Nov 29, 2023 · 3744e98 · 3744e98
1 parent b6a1332
commit 3744e98
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 19 deletions.
diff --git a/Core/GDCore/IDE/PropertyFunctionGenerator.cpp b/Core/GDCore/IDE/PropertyFunctionGenerator.cpp
@@ -128,11 +128,7 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
     } else {
       gd::Instruction action;
       action.SetType("SetReturn" + numberOrString);
-      gd::String receiver = isBehavior ? "Object.Behavior::" : "Object.";
-      gd::String propertyPrefix =
-          (isSharedProperties ? "SharedProperty" : "Property");
-      action.AddParameter(receiver + propertyPrefix + property.GetName() +
-                          "()");
+      action.AddParameter(property.GetName());
       event.GetActions().Insert(action, 0);
     }
   }
@@ -233,15 +229,13 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
       gd::Instruction action;
       action.SetType(setterType);
       action.AddParameter("Object");
-      gd::String parameterGetterCall =
-          "GetArgumentAs" + numberOrString + "(\"Value\")";
       if (isBehavior) {
         action.AddParameter("Behavior");
         action.AddParameter("=");
-        action.AddParameter(parameterGetterCall);
+        action.AddParameter("Value");
       } else {
         action.AddParameter("=");
-        action.AddParameter(parameterGetterCall);
+        action.AddParameter("Value");
       }
       event.GetActions().Insert(action, 0);
     }

diff --git a/Core/tests/PropertyFunctionGenerator.cpp b/Core/tests/PropertyFunctionGenerator.cpp
@@ -91,8 +91,7 @@ TEST_CASE("PropertyFunctionGenerator", "[common]") {
       auto &getterAction = getterEvent.GetActions().at(0);
       REQUIRE(getterAction.GetType() == "SetReturnNumber");
       REQUIRE(getterAction.GetParametersCount() == 1);
-      REQUIRE(getterAction.GetParameter(0).GetPlainString() ==
-              "Object.Behavior::PropertyMovementAngle()");
+      REQUIRE(getterAction.GetParameter(0).GetPlainString() == "MovementAngle");
     }
     {
       auto &setter =
@@ -124,8 +123,7 @@ TEST_CASE("PropertyFunctionGenerator", "[common]") {
       REQUIRE(setterAction.GetParameter(0).GetPlainString() == "Object");
       REQUIRE(setterAction.GetParameter(1).GetPlainString() == "Behavior");
       REQUIRE(setterAction.GetParameter(2).GetPlainString() == "=");
-      REQUIRE(setterAction.GetParameter(3).GetPlainString() ==
-              "GetArgumentAsNumber(\"Value\")");
+      REQUIRE(setterAction.GetParameter(3).GetPlainString() == "Value");
     }
   }
 
@@ -343,8 +341,7 @@ TEST_CASE("PropertyFunctionGenerator", "[common]") {
       auto &getterAction = getterEvent.GetActions().at(0);
       REQUIRE(getterAction.GetType() == "SetReturnNumber");
       REQUIRE(getterAction.GetParametersCount() == 1);
-      REQUIRE(getterAction.GetParameter(0).GetPlainString() ==
-              "Object.PropertyMovementAngle()");
+      REQUIRE(getterAction.GetParameter(0).GetPlainString() == "MovementAngle");
     }
     {
       auto &setter =
@@ -375,8 +372,7 @@ TEST_CASE("PropertyFunctionGenerator", "[common]") {
       REQUIRE(setterAction.GetParametersCount() == 3);
       REQUIRE(setterAction.GetParameter(0).GetPlainString() == "Object");
       REQUIRE(setterAction.GetParameter(1).GetPlainString() == "=");
-      REQUIRE(setterAction.GetParameter(2).GetPlainString() ==
-              "GetArgumentAsNumber(\"Value\")");
+      REQUIRE(setterAction.GetParameter(2).GetPlainString() == "Value");
     }
   }
 
@@ -578,8 +574,7 @@ TEST_CASE("PropertyFunctionGenerator", "[common]") {
       auto &getterAction = getterEvent.GetActions().at(0);
       REQUIRE(getterAction.GetType() == "SetReturnNumber");
       REQUIRE(getterAction.GetParametersCount() == 1);
-      REQUIRE(getterAction.GetParameter(0).GetPlainString() ==
-              "Object.Behavior::SharedPropertyMovementAngle()");
+      REQUIRE(getterAction.GetParameter(0).GetPlainString() == "MovementAngle");
     }
     {
       auto &setter =