Add CallableX and MethodCallableX classes (#829)

Author: CedNaru

harness/tests/src/main/kotlin/godot/tests/callable/CallableMethodBindTest.kt

@@ -4,9 +4,12 @@ import godot.api.Node
 import godot.annotation.RegisterClass
 import godot.annotation.RegisterFunction
 import godot.annotation.RegisterProperty
-import godot.core.MethodCallable
+import godot.core.Callable0
+import godot.core.Callable1
+import godot.core.Callable2
+import godot.core.Callable3
 import godot.core.VariantArray
-import godot.core.toGodotName
+import godot.core.callable3
 import godot.core.variantArrayOf
 import godot.global.GD
 
@@ -17,22 +20,28 @@ class CallableMethodBindTest: Node() {
 
     @RegisterFunction
     fun callWithMethodWithAllBinds() {
-        MethodCallable(this, CallableMethodBindTest::readySignalMethodBindTest.toGodotName()).bindUnsafe(1, 2, 3).callUnsafe()
+        val unboundCallable: Callable3<Unit, Int, Int, Int> = callable3(CallableMethodBindTest::readySignalMethodBindTest)
+        val boundCallable: Callable0<Unit> = unboundCallable.bind(1, 2, 3)
+        boundCallable.call()
     }
 
     @RegisterFunction
     fun callWithMethodWithTwoBinds() {
-        MethodCallable(this, CallableMethodBindTest::readySignalMethodBindTest.toGodotName()).bindUnsafe(2, 3).callUnsafe(0)
+        val unboundCallable: Callable3<Unit, Int, Int, Int> = callable3(CallableMethodBindTest::readySignalMethodBindTest)
+        val boundCallable: Callable1<Unit, Int> = unboundCallable.bind(5, 6)
+        boundCallable.call(4)
     }
 
     @RegisterFunction
     fun callWithMethodWithOneBind() {
-        MethodCallable(this, CallableMethodBindTest::readySignalMethodBindTest.toGodotName()).bindUnsafe(3).callUnsafe(0, 0)
+        val unboundCallable: Callable3<Unit, Int, Int, Int> = callable3(CallableMethodBindTest::readySignalMethodBindTest)
+        val boundCallable: Callable2<Unit, Int, Int> = unboundCallable.bind(9)
+        boundCallable.call(7, 8)
     }
 
     @RegisterFunction
     fun callWithMethodWithNoBind() {
-        MethodCallable(this, CallableMethodBindTest::readySignalMethodBindTest.toGodotName()).bindUnsafe().callUnsafe(0, 0, 0)
+        callable3(CallableMethodBindTest::readySignalMethodBindTest).call(10, 11, 12)
     }
 
     @RegisterFunction

harness/tests/test/unit/test_callable_method_bind.gd

@@ -26,17 +26,17 @@ func test_method_bind_passing_correct_binds_with_one_args_provided() -> void:
 	binds_test_script.call_with_method_with_two_binds()
 	assert_eq(
 		binds_test_script.method_binds[0],
-		0,
+		4,
 		"Incorrect bind value passed"
 	)
 	assert_eq(
 		binds_test_script.method_binds[1],
-		2,
+		5,
 		"Incorrect bind value passed"
 	)
 	assert_eq(
 		binds_test_script.method_binds[2],
-		3,
+		6,
 		"Incorrect bind value passed"
 	)
 	binds_test_script.free()
@@ -46,17 +46,17 @@ func test_method_bind_passing_correct_binds_with_two_args_provided() -> void:
 	binds_test_script.call_with_method_with_one_bind()
 	assert_eq(
 		binds_test_script.method_binds[0],
-		0,
+		7,
 		"Incorrect bind value passed"
 	)
 	assert_eq(
 		binds_test_script.method_binds[1],
-		0,
+		8,
 		"Incorrect bind value passed"
 	)
 	assert_eq(
 		binds_test_script.method_binds[2],
-		3,
+		9,
 		"Incorrect bind value passed"
 	)
 	binds_test_script.free()
@@ -66,17 +66,17 @@ func test_method_bind_passing_correct_binds_with_three_args_provided() -> void:
 	binds_test_script.call_with_method_with_no_bind()
 	assert_eq(
 		binds_test_script.method_binds[0],
-		0,
+		10,
 		"Incorrect bind value passed"
 	)
 	assert_eq(
 		binds_test_script.method_binds[1],
-		0,
+		11,
 		"Incorrect bind value passed"
 	)
 	assert_eq(
 		binds_test_script.method_binds[2],
-		0,
+		12,
 		"Incorrect bind value passed"
 	)
 	binds_test_script.free()