Various fixes

Author: CedNaru

kt/api-generator/src/main/kotlin/godot/codegen/poet/GenericClassNameInfo.kt

@@ -65,7 +65,16 @@ class GenericClassNameInfo(
             ParameterSpec.builder("p$index", typeVariableName).build()
         }
 
-    fun toLambdaTypeName(returnType: TypeVariableName) =  LambdaTypeName.get(
+    fun toArgumentsString(template: String, indexKey: String): String {
+        return buildString {
+            genericTypes.mapIndexed { index: Int, typeVariableName: TypeVariableName ->
+                if (index != 0) append(",·")
+                append(template.replace(indexKey, index.toString()))
+            }
+        }
+    }
+
+    fun toLambdaTypeName(returnType: TypeVariableName) = LambdaTypeName.get(
         receiver = null,
         parameters = genericTypes
             .mapIndexed { index: Int, typeVariableName: TypeVariableName ->

kt/api-generator/src/main/kotlin/godot/codegen/services/impl/LambdaCallableGenerationService.kt

@@ -1,6 +1,7 @@
 package godot.codegen.services.impl
 
 import com.squareup.kotlinpoet.ANY
+import com.squareup.kotlinpoet.ARRAY
 import com.squareup.kotlinpoet.AnnotationSpec
 import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.CodeBlock
@@ -175,7 +176,7 @@ object LambdaCallableGenerationService : ILambdaCallableGenerationService {
                 )
                 .addProperty(
                     PropertySpec
-                        .builder("container", lambdaContainerClassName.parameterizedBy(genericParameterWithReturn))
+                        .builder(CONTAINER_ARGUMENT_NAME, lambdaContainerClassName.parameterizedBy(genericParameterWithReturn))
                         .addModifiers(KModifier.OVERRIDE)
                         .initializer(
                             CodeBlock.of(
@@ -193,7 +194,7 @@ object LambdaCallableGenerationService : ILambdaCallableGenerationService {
                         .addCode(
                             CodeBlock.of(
                                 buildString {
-                                    append("return·container.unsafeInvoke(")
+                                    append("return·$CONTAINER_ARGUMENT_NAME.unsafeInvoke(")
                                     append(classInfo.toArgumentsString("pINDEX", "INDEX"))
                                     append(')')
                                 }
@@ -251,15 +252,15 @@ object LambdaCallableGenerationService : ILambdaCallableGenerationService {
                         )
                         .addCode(
                             buildString {
-                                append("return·%T(container.returnConverter,·container.typeConverters.take(${remainingParameters}).toTypedArray())·{")
+                                append("return·%T($CONTAINER_ARGUMENT_NAME.returnConverter,·$CONTAINER_ARGUMENT_NAME.typeConverters.take(${remainingParameters}).toTypedArray())·{")
 
                                 for (index in (0..<remainingParameters)) {
                                     if (index != 0) append(",·")
 
                                     append("p${index}:·%T")
                                 }
 
-                                append("·->·container.unsafeInvoke(")
+                                append("·->·$CONTAINER_ARGUMENT_NAME.unsafeInvoke(")
 
                                 for (i in genericParameters.indices) {
                                     if (i != 0) append(",·")

src/jvm_wrapper/kotlin_callable_custom.cpp

@@ -31,8 +31,8 @@ bool LambdaContainer::equals(const LambdaContainer& other) const {
 
 LambdaContainer::LambdaContainer(jni::Env& p_env, jni::JObject p_wrapped, Variant::Type return_type, int p_hash_code, bool p_has_on_cancel) :
   JvmInstanceWrapper(p_env, p_wrapped),
-  has_return_value {return_type != Variant::NIL},
   hash_code {p_hash_code},
+  has_return_value {return_type != Variant::NIL},
   has_on_cancel {p_has_on_cancel},
   has_been_called {false} {}
 

src/jvm_wrapper/memory/transfer_context.cpp

@@ -87,7 +87,6 @@ void TransferContext::icall(JNIEnv* rawEnv, jobject instance, jlong j_ptr, jlong
 
     Callable::CallError r_error {Callable::CallError::CALL_OK};
 
-    Variant ret_value;
     if (unlikely(stack_offset + args_size > MAX_STACK_SIZE)) {
         Variant args[MAX_FUNCTION_ARG_COUNT];
         read_args_to_array(buffer, args, args_size);
@@ -97,7 +96,7 @@ void TransferContext::icall(JNIEnv* rawEnv, jobject instance, jlong j_ptr, jlong
             args_ptr[i] = &args[i];
         }
 
-        method_bind->validated_call(ptr, args_ptr, &ret_value);
+        const Variant& ret_value {method_bind->call(ptr, args_ptr, args_size, r_error)};
         buffer->rewind();
 
         VariantToBuffer::write_variant(ret_value, buffer);
@@ -108,7 +107,7 @@ void TransferContext::icall(JNIEnv* rawEnv, jobject instance, jlong j_ptr, jlong
         const Variant** args_ptr {variant_args_ptr + stack_offset};
 
         stack_offset += args_size;
-        method_bind->validated_call(ptr, args_ptr, &ret_value);
+        const Variant& ret_value {method_bind->call(ptr, args_ptr, args_size, r_error)};
         // Remove Variants so memory can be freed immediately after method call.
         for (uint32_t i = 0; i < args_size; i++) {
             args[i] = Variant();

src/jvm_wrapper/registration/kt_class.cpp

@@ -100,7 +100,6 @@ void KtClass::fetch_methods(jni::Env& env) {
     for (int i = 0; i < functionsArray.length(env); i++) {
         jni::JObject object = functionsArray.get(env, i);
         auto* ktFunction {new KtFunction(env, object)};
-        auto test = methods[ktFunction->get_name()];
         methods[ktFunction->get_name()] = ktFunction;
         JVM_DEV_VERBOSE("Fetched method %s for class %s", ktFunction->get_name(), registered_class_name);
     }

src/lifecycle/jvm_manager.cpp

@@ -43,6 +43,7 @@ CreateJavaVM get_create_jvm_function(void* lib_handle) {
 #else
     // Sanity check in case we mess up preprocessors
     JVM_DEV_ASSERT(false, "Current configuration doesn't provide a way to create a JVM!");
+    return nullptr;
 #endif
 }
 

src/lifecycle/jvm_user_configuration.cpp

@@ -278,9 +278,11 @@ void JvmUserConfiguration::parse_command_line(const List<String>& args, HashMap<
             configuration_map[JVM_ARGUMENTS_CMD_IDENTIFIER] = arr;
         }
 
+#ifdef DEV_ENABLED
         for (const auto& map_element : configuration_map) {
             JVM_DEV_VERBOSE("Value for commandline argument: %s -> %s", map_element.key, map_element.value);
         }
+#endif
     }
 }