Codegen property template; ignore differences in property array when compiling for 4.1 but running in 4.2

Author: lilizoey

.github/FUNDING.yml

@@ -1,3 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
 # These are supported funding model platforms
 
 # Up to 4 GitHub Sponsors usernames

godot-core/src/builtin/variant/impls.rs

@@ -21,7 +21,7 @@ use sys::GodotFfi;
 //
 // Thus we can use `init` to indicate when it must be initialized in 4.0.
 macro_rules! impl_ffi_variant {
-    ($T:ty, $from_fn:ident, $to_fn:ident $(; $gd_ty:ident)?) => {
+    ($T:ty, $from_fn:ident, $to_fn:ident $(; $godot_type_name:ident)?) => {
         impl GodotFfiVariant for $T {
             fn ffi_to_variant(&self) -> Variant {
                 let variant = unsafe {
@@ -74,7 +74,7 @@ macro_rules! impl_ffi_variant {
                 Some(ffi)
             }
 
-            impl_ffi_variant!(@godot_type_name $T $(, $gd_ty)?);
+            impl_ffi_variant!(@godot_type_name $T $(, $godot_type_name)?);
         }
     };
 
@@ -84,9 +84,9 @@ macro_rules! impl_ffi_variant {
         }
     };
 
-    (@godot_type_name $T:ty, $gd_ty:ident) => {
+    (@godot_type_name $T:ty, $godot_type_name:ident) => {
         fn godot_type_name() -> String {
-            stringify!($gd_ty).into()
+            stringify!($godot_type_name).into()
         }
     };
 }
@@ -108,7 +108,7 @@ mod impls {
     impl_ffi_variant!(Vector4, vector4_to_variant, vector4_from_variant);
     impl_ffi_variant!(Vector2i, vector2i_to_variant, vector2i_from_variant);
     impl_ffi_variant!(Vector3i, vector3i_to_variant, vector3i_from_variant);
-    impl_ffi_variant!(Vector4i, vector3i_to_variant, vector3i_from_variant);
+    impl_ffi_variant!(Vector4i, vector4i_to_variant, vector4i_from_variant);
     impl_ffi_variant!(Quaternion, quaternion_to_variant, quaternion_from_variant);
     impl_ffi_variant!(Color, color_to_variant, color_from_variant);
     impl_ffi_variant!(GodotString, string_to_variant, string_from_variant; String);

godot-core/src/property.rs

@@ -321,12 +321,12 @@ mod export_impls {
     use godot_ffi as sys;
 
     macro_rules! impl_property_by_clone {
-        ($Ty:ty => $variant_type:ident; no_export) => {
+        ($Ty:ty => $variant_type:ident, no_export) => {
             impl_property_by_clone!(@property $Ty => $variant_type);
             impl_property_by_clone!(@type_string_hint $Ty, $variant_type);
         };
 
-        ($Ty:ty => $variant_type:ident, $type_string_name:ident; no_export) => {
+        ($Ty:ty => $variant_type:ident, no_export; $type_string_name:ident) => {
             impl_property_by_clone!(@property $Ty => $variant_type);
             impl_property_by_clone!(@type_string_hint $Ty, $type_string_name);
         };
@@ -337,7 +337,7 @@ mod export_impls {
             impl_property_by_clone!(@type_string_hint $Ty, $variant_type);
         };
 
-        ($Ty:ty => $variant_type:ident, $type_string_name:ident) => {
+        ($Ty:ty => $variant_type:ident; $type_string_name:ident) => {
             impl_property_by_clone!(@property $Ty => $variant_type);
             impl_property_by_clone!(@export $Ty);
             impl_property_by_clone!(@type_string_hint $Ty, $type_string_name);
@@ -377,7 +377,7 @@ mod export_impls {
     }
 
     // Bounding Boxes
-    impl_property_by_clone!(Aabb => Aabb, AABB);
+    impl_property_by_clone!(Aabb => Aabb; AABB);
     impl_property_by_clone!(Rect2 => Rect2);
     impl_property_by_clone!(Rect2i => Rect2i);
 
@@ -418,28 +418,28 @@ mod export_impls {
     impl_property_by_clone!(PackedColorArray => PackedColorArray);
 
     // Primitives
-    impl_property_by_clone!(f64 => Float, float);
-    impl_property_by_clone!(i64 => Int, int);
-    impl_property_by_clone!(bool => Bool, bool);
+    impl_property_by_clone!(f64 => Float; float);
+    impl_property_by_clone!(i64 => Int; int);
+    impl_property_by_clone!(bool => Bool; bool);
 
     // Godot uses f64 internally for floats, and if Godot tries to pass an invalid f32 into a rust property
     // then the property will just round the value or become inf.
-    impl_property_by_clone!(f32 => Float, float);
+    impl_property_by_clone!(f32 => Float; float);
 
     // Godot uses i64 internally for integers, and if Godot tries to pass an invalid integer into a property
     // accepting one of the below values then rust will panic. In the editor this will appear as the property
     // failing to be set to a value and an error printed in the console. During runtime this will crash the
     // program and print the panic from rust stating that the property cannot store the value.
-    impl_property_by_clone!(i32 => Int, int);
-    impl_property_by_clone!(i16 => Int, int);
-    impl_property_by_clone!(i8 => Int, int);
-    impl_property_by_clone!(u32 => Int, int);
-    impl_property_by_clone!(u16 => Int, int);
-    impl_property_by_clone!(u8 => Int, int);
+    impl_property_by_clone!(i32 => Int; int);
+    impl_property_by_clone!(i16 => Int; int);
+    impl_property_by_clone!(i8 => Int; int);
+    impl_property_by_clone!(u32 => Int; int);
+    impl_property_by_clone!(u16 => Int; int);
+    impl_property_by_clone!(u8 => Int; int);
 
     // Callables are useless when exported to the editor, so we only need to make them available as
     // properties.
-    impl_property_by_clone!(Callable => Callable; no_export);
+    impl_property_by_clone!(Callable => Callable, no_export);
 
     // RIDs when exported act slightly weird. They are largely read-only, however you can reset them to their
     // default value. This seems to me very unintuitive. Since if we are storing an RID we would likely not
@@ -448,7 +448,7 @@ mod export_impls {
     //
     // Additionally, RIDs aren't persistent, and can sometimes behave a bit weirdly when passed from the
     // editor to the runtime.
-    impl_property_by_clone!(Rid => Rid, RID; no_export);
+    impl_property_by_clone!(Rid => Rid, no_export; RID);
 
     // impl_property_by_clone!(Signal => Signal);
 }

itest/godot/.godot/global_script_class_cache.cfg

@@ -5,12 +5,6 @@ list=Array[Dictionary]([{
 "language": &"GDScript",
 "path": "res://TestRunner.gd"
 }, {
-"base": &"Node",
-"class": &"PropertyTemplateGDScript",
-"icon": "",
-"language": &"GDScript",
-"path": "res://PropertyTemplate.gd"
-}, {
 "base": &"RefCounted",
 "class": &"TestStats",
 "icon": "",

itest/godot/PropertyTemplate.gd

@@ -53,15 +53,15 @@ func _ready():
 			if method_name.begins_with("test_"):
 				gdscript_tests.push_back(await suite.run_test(suite, method_name))
 
-	var property_template = PropertyTemplateGDScript.new()
+	var property_tests = load("res://gen/GenPropertyTests.gd").new()
 
 	var success: bool = rust_runner.run_all_tests(
 		gdscript_tests,
 		gdscript_suites.size(),
 		allow_focus,
 		self,
 		filters,
-		property_template
+		property_tests
 	)
 
 	if success: