Refactor and fix `make_virtuals.py` #85770

Repiteo · 2023-12-05T01:55:54Z

Adds EncodeT type casting on EncodeT assignment in order to support enum classes as arguments. Went unnoticed because there's currently no enum classes as arguments for any GDVIRTUAL, but if that changes in the future they'll be supported.
Generated output reformatted to be comparable to clang-formatted code, without compromising readability in the python file. Most notably unified inconsistencies in tabs/spaces & removed any blank lines after formatting finalized.

akien-mga · 2023-12-05T14:05:30Z

Could you split the changes into two commits? (Can still be in this same PR.)

It's pretty difficult to review the actual logic changes you made amidst the codestyle refactoring.

Repiteo · 2023-12-05T14:37:06Z

You bet; the commits are now separated!

akien-mga · 2023-12-05T16:27:10Z

I checked the diff between the file generated by this PR and applying clang-format on it (and removing spaces before vertically aligned \), seems like we're missing a space:

--- gdvirtual.gen.inc2	2023-12-05 17:24:29.568423641 +0100
+++ gdvirtual.gen.inc3	2023-12-05 17:26:12.070466405 +0100
@@ -302,7 +302,7 @@
 			Callable::CallError ce;\
 			Variant vargs[1] = { Variant(arg1) };\
 			const Variant *vargptrs[1] = { &vargs[0] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,1, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 1, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -372,7 +372,7 @@
 			Callable::CallError ce;\
 			Variant vargs[1] = { Variant(arg1) };\
 			const Variant *vargptrs[1] = { &vargs[0] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,1, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 1, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\
@@ -449,7 +449,7 @@
 			Callable::CallError ce;\
 			Variant vargs[1] = { Variant(arg1) };\
 			const Variant *vargptrs[1] = { &vargs[0] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,1, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 1, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -519,7 +519,7 @@
 			Callable::CallError ce;\
 			Variant vargs[1] = { Variant(arg1) };\
 			const Variant *vargptrs[1] = { &vargs[0] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,1, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 1, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\
@@ -598,7 +598,7 @@
 			Callable::CallError ce;\
 			Variant vargs[2] = { Variant(arg1), Variant(arg2) };\
 			const Variant *vargptrs[2] = { &vargs[0], &vargs[1] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,2, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 2, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -671,7 +671,7 @@
 			Callable::CallError ce;\
 			Variant vargs[2] = { Variant(arg1), Variant(arg2) };\
 			const Variant *vargptrs[2] = { &vargs[0], &vargs[1] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,2, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 2, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\
@@ -751,7 +751,7 @@
 			Callable::CallError ce;\
 			Variant vargs[2] = { Variant(arg1), Variant(arg2) };\
 			const Variant *vargptrs[2] = { &vargs[0], &vargs[1] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,2, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 2, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -824,7 +824,7 @@
 			Callable::CallError ce;\
 			Variant vargs[2] = { Variant(arg1), Variant(arg2) };\
 			const Variant *vargptrs[2] = { &vargs[0], &vargs[1] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,2, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 2, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\
@@ -906,7 +906,7 @@
 			Callable::CallError ce;\
 			Variant vargs[3] = { Variant(arg1), Variant(arg2), Variant(arg3) };\
 			const Variant *vargptrs[3] = { &vargs[0], &vargs[1], &vargs[2] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,3, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 3, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -982,7 +982,7 @@
 			Callable::CallError ce;\
 			Variant vargs[3] = { Variant(arg1), Variant(arg2), Variant(arg3) };\
 			const Variant *vargptrs[3] = { &vargs[0], &vargs[1], &vargs[2] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,3, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 3, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\
@@ -1065,7 +1065,7 @@
 			Callable::CallError ce;\
 			Variant vargs[3] = { Variant(arg1), Variant(arg2), Variant(arg3) };\
 			const Variant *vargptrs[3] = { &vargs[0], &vargs[1], &vargs[2] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,3, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 3, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -1141,7 +1141,7 @@
 			Callable::CallError ce;\
 			Variant vargs[3] = { Variant(arg1), Variant(arg2), Variant(arg3) };\
 			const Variant *vargptrs[3] = { &vargs[0], &vargs[1], &vargs[2] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,3, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 3, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\
@@ -1226,7 +1226,7 @@
 			Callable::CallError ce;\
 			Variant vargs[4] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4) };\
 			const Variant *vargptrs[4] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,4, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 4, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -1305,7 +1305,7 @@
 			Callable::CallError ce;\
 			Variant vargs[4] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4) };\
 			const Variant *vargptrs[4] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,4, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 4, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\
@@ -1391,7 +1391,7 @@
 			Callable::CallError ce;\
 			Variant vargs[4] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4) };\
 			const Variant *vargptrs[4] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,4, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 4, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -1470,7 +1470,7 @@
 			Callable::CallError ce;\
 			Variant vargs[4] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4) };\
 			const Variant *vargptrs[4] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,4, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 4, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\
@@ -1558,7 +1558,7 @@
 			Callable::CallError ce;\
 			Variant vargs[5] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5) };\
 			const Variant *vargptrs[5] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,5, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 5, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -1640,7 +1640,7 @@
 			Callable::CallError ce;\
 			Variant vargs[5] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5) };\
 			const Variant *vargptrs[5] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,5, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 5, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\
@@ -1729,7 +1729,7 @@
 			Callable::CallError ce;\
 			Variant vargs[5] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5) };\
 			const Variant *vargptrs[5] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,5, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 5, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -1811,7 +1811,7 @@
 			Callable::CallError ce;\
 			Variant vargs[5] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5) };\
 			const Variant *vargptrs[5] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,5, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 5, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\
@@ -1902,7 +1902,7 @@
 			Callable::CallError ce;\
 			Variant vargs[6] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6) };\
 			const Variant *vargptrs[6] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,6, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 6, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -1987,7 +1987,7 @@
 			Callable::CallError ce;\
 			Variant vargs[6] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6) };\
 			const Variant *vargptrs[6] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,6, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 6, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\
@@ -2079,7 +2079,7 @@
 			Callable::CallError ce;\
 			Variant vargs[6] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6) };\
 			const Variant *vargptrs[6] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,6, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 6, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -2164,7 +2164,7 @@
 			Callable::CallError ce;\
 			Variant vargs[6] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6) };\
 			const Variant *vargptrs[6] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,6, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 6, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\
@@ -2258,7 +2258,7 @@
 			Callable::CallError ce;\
 			Variant vargs[7] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7) };\
 			const Variant *vargptrs[7] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,7, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 7, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -2346,7 +2346,7 @@
 			Callable::CallError ce;\
 			Variant vargs[7] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7) };\
 			const Variant *vargptrs[7] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,7, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 7, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\
@@ -2441,7 +2441,7 @@
 			Callable::CallError ce;\
 			Variant vargs[7] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7) };\
 			const Variant *vargptrs[7] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,7, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 7, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -2529,7 +2529,7 @@
 			Callable::CallError ce;\
 			Variant vargs[7] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7) };\
 			const Variant *vargptrs[7] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,7, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 7, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\
@@ -2626,7 +2626,7 @@
 			Callable::CallError ce;\
 			Variant vargs[8] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7), Variant(arg8) };\
 			const Variant *vargptrs[8] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6], &vargs[7] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,8, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 8, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -2717,7 +2717,7 @@
 			Callable::CallError ce;\
 			Variant vargs[8] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7), Variant(arg8) };\
 			const Variant *vargptrs[8] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6], &vargs[7] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,8, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 8, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\
@@ -2815,7 +2815,7 @@
 			Callable::CallError ce;\
 			Variant vargs[8] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7), Variant(arg8) };\
 			const Variant *vargptrs[8] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6], &vargs[7] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,8, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 8, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -2906,7 +2906,7 @@
 			Callable::CallError ce;\
 			Variant vargs[8] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7), Variant(arg8) };\
 			const Variant *vargptrs[8] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6], &vargs[7] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,8, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 8, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\
@@ -3006,7 +3006,7 @@
 			Callable::CallError ce;\
 			Variant vargs[9] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7), Variant(arg8), Variant(arg9) };\
 			const Variant *vargptrs[9] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6], &vargs[7], &vargs[8] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,9, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 9, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -3100,7 +3100,7 @@
 			Callable::CallError ce;\
 			Variant vargs[9] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7), Variant(arg8), Variant(arg9) };\
 			const Variant *vargptrs[9] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6], &vargs[7], &vargs[8] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,9, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 9, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\
@@ -3201,7 +3201,7 @@
 			Callable::CallError ce;\
 			Variant vargs[9] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7), Variant(arg8), Variant(arg9) };\
 			const Variant *vargptrs[9] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6], &vargs[7], &vargs[8] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,9, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 9, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -3295,7 +3295,7 @@
 			Callable::CallError ce;\
 			Variant vargs[9] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7), Variant(arg8), Variant(arg9) };\
 			const Variant *vargptrs[9] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6], &vargs[7], &vargs[8] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,9, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 9, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\
@@ -3398,7 +3398,7 @@
 			Callable::CallError ce;\
 			Variant vargs[10] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7), Variant(arg8), Variant(arg9), Variant(arg10) };\
 			const Variant *vargptrs[10] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6], &vargs[7], &vargs[8], &vargs[9] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,10, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 10, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -3495,7 +3495,7 @@
 			Callable::CallError ce;\
 			Variant vargs[10] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7), Variant(arg8), Variant(arg9), Variant(arg10) };\
 			const Variant *vargptrs[10] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6], &vargs[7], &vargs[8], &vargs[9] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,10, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 10, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\
@@ -3599,7 +3599,7 @@
 			Callable::CallError ce;\
 			Variant vargs[10] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7), Variant(arg8), Variant(arg9), Variant(arg10) };\
 			const Variant *vargptrs[10] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6], &vargs[7], &vargs[8], &vargs[9] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,10, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 10, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -3696,7 +3696,7 @@
 			Callable::CallError ce;\
 			Variant vargs[10] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7), Variant(arg8), Variant(arg9), Variant(arg10) };\
 			const Variant *vargptrs[10] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6], &vargs[7], &vargs[8], &vargs[9] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,10, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 10, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\
@@ -3802,7 +3802,7 @@
 			Callable::CallError ce;\
 			Variant vargs[11] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7), Variant(arg8), Variant(arg9), Variant(arg10), Variant(arg11) };\
 			const Variant *vargptrs[11] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6], &vargs[7], &vargs[8], &vargs[9], &vargs[10] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,11, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 11, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -3902,7 +3902,7 @@
 			Callable::CallError ce;\
 			Variant vargs[11] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7), Variant(arg8), Variant(arg9), Variant(arg10), Variant(arg11) };\
 			const Variant *vargptrs[11] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6], &vargs[7], &vargs[8], &vargs[9], &vargs[10] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,11, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 11, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\
@@ -4009,7 +4009,7 @@
 			Callable::CallError ce;\
 			Variant vargs[11] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7), Variant(arg8), Variant(arg9), Variant(arg10), Variant(arg11) };\
 			const Variant *vargptrs[11] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6], &vargs[7], &vargs[8], &vargs[9], &vargs[10] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,11, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 11, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -4109,7 +4109,7 @@
 			Callable::CallError ce;\
 			Variant vargs[11] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7), Variant(arg8), Variant(arg9), Variant(arg10), Variant(arg11) };\
 			const Variant *vargptrs[11] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6], &vargs[7], &vargs[8], &vargs[9], &vargs[10] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,11, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 11, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\
@@ -4218,7 +4218,7 @@
 			Callable::CallError ce;\
 			Variant vargs[12] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7), Variant(arg8), Variant(arg9), Variant(arg10), Variant(arg11), Variant(arg12) };\
 			const Variant *vargptrs[12] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6], &vargs[7], &vargs[8], &vargs[9], &vargs[10], &vargs[11] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,12, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 12, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -4321,7 +4321,7 @@
 			Callable::CallError ce;\
 			Variant vargs[12] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7), Variant(arg8), Variant(arg9), Variant(arg10), Variant(arg11), Variant(arg12) };\
 			const Variant *vargptrs[12] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6], &vargs[7], &vargs[8], &vargs[9], &vargs[10], &vargs[11] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,12, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 12, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\
@@ -4431,7 +4431,7 @@
 			Callable::CallError ce;\
 			Variant vargs[12] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7), Variant(arg8), Variant(arg9), Variant(arg10), Variant(arg11), Variant(arg12) };\
 			const Variant *vargptrs[12] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6], &vargs[7], &vargs[8], &vargs[9], &vargs[10], &vargs[11] };\
-			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,12, ce);\
+			_script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 12, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				return true;\
 			}\
@@ -4534,7 +4534,7 @@
 			Callable::CallError ce;\
 			Variant vargs[12] = { Variant(arg1), Variant(arg2), Variant(arg3), Variant(arg4), Variant(arg5), Variant(arg6), Variant(arg7), Variant(arg8), Variant(arg9), Variant(arg10), Variant(arg11), Variant(arg12) };\
 			const Variant *vargptrs[12] = { &vargs[0], &vargs[1], &vargs[2], &vargs[3], &vargs[4], &vargs[5], &vargs[6], &vargs[7], &vargs[8], &vargs[9], &vargs[10], &vargs[11] };\
-			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs,12, ce);\
+			Variant ret = _script_instance->callp(_gdvirtual_##m_name##_sn, (const Variant **)vargptrs, 12, ce);\
 			if (ce.error == Callable::CallError::CALL_OK) {\
 				r_ret = VariantCaster<m_ret>::cast(ret);\
 				return true;\

Output reformatted to be comparable to clang-formatted code, without compromising readability

• Adding EncodeT type casting allows generated code to support enum classes.

akien-mga

The code refactoring looks good, and the fix seems fine too.

yedpodtrzitko · 2023-12-07T17:17:27Z

There's a folder which pytest tests which run some sanity check within the CI. It could be nice to add a test for generate_version() to have an automated check that the actual output matches the expected output.

YuriSizov · 2023-12-08T15:32:36Z

I think we can do this in a follow-up, but it's not a bad idea overall.

YuriSizov · 2023-12-08T16:24:09Z

Thanks!

Repiteo requested a review from a team as a code owner December 5, 2023 01:55

akien-mga added enhancement topic:buildsystem topic:codestyle labels Dec 5, 2023

akien-mga added this to the 4.x milestone Dec 5, 2023

Repiteo force-pushed the make-virtuals-refactor-and-fix branch from 1516848 to 4148176 Compare December 5, 2023 14:33

Repiteo added 2 commits December 5, 2023 10:37

Refactor make_virtuals.py

ceb6dad

Output reformatted to be comparable to clang-formatted code, without compromising readability

Fix EncodeT assignment in make_virtuals.py

c9a4086

• Adding EncodeT type casting allows generated code to support enum classes.

Repiteo force-pushed the make-virtuals-refactor-and-fix branch from 0fd9961 to c9a4086 Compare December 5, 2023 16:39

akien-mga approved these changes Dec 5, 2023

View reviewed changes

akien-mga modified the milestones: 4.x, 4.3 Dec 5, 2023

YuriSizov merged commit f160575 into godotengine:master Dec 8, 2023

Repiteo deleted the make-virtuals-refactor-and-fix branch December 9, 2023 00:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor and fix `make_virtuals.py` #85770

Refactor and fix `make_virtuals.py` #85770

Repiteo commented Dec 5, 2023

akien-mga commented Dec 5, 2023

Repiteo commented Dec 5, 2023

akien-mga commented Dec 5, 2023

akien-mga left a comment

yedpodtrzitko commented Dec 7, 2023 •

edited

Loading

YuriSizov commented Dec 8, 2023

YuriSizov commented Dec 8, 2023

Refactor and fix make_virtuals.py #85770

Refactor and fix make_virtuals.py #85770

Conversation

Repiteo commented Dec 5, 2023

akien-mga commented Dec 5, 2023

Repiteo commented Dec 5, 2023

akien-mga commented Dec 5, 2023

akien-mga left a comment

Choose a reason for hiding this comment

yedpodtrzitko commented Dec 7, 2023 • edited Loading

YuriSizov commented Dec 8, 2023

YuriSizov commented Dec 8, 2023

Refactor and fix `make_virtuals.py` #85770

Refactor and fix `make_virtuals.py` #85770

yedpodtrzitko commented Dec 7, 2023 •

edited

Loading