[[ ExternalsApiV5 ]] Fixed parameter list generation for indirect return types.

runrevmark · runrevmark · commit cba7eedb271a · 2013-09-06T10:07:58.000+01:00
[[ ExternalsApiV5 ]] Fixed revtestexternal lcidl for Android (one method wasn't being declared as Java).
diff --git a/lcidlc/src/InterfaceGenerate.cpp b/lcidlc/src/InterfaceGenerate.cpp
@@ -687,6 +687,7 @@ static int64_t InterfaceResolveEnumElement(InterfaceRef self, NameRef p_name, Va
 	return 0;
 }
 
+#if NOT_USED
 static void InterfaceGenerateMethodStubContext(InterfaceRef self, CoderRef p_coder, Handler *p_handler, bool p_in)
 {
 	NameRef t_name;
@@ -831,7 +832,6 @@ static void InterfaceGenerateJavaMethodStub(InterfaceRef self, CoderRef p_coder,
 	CoderWriteLine(p_coder, "}");
 }
 
-#ifdef NOT_READY
 static void InterfaceGenerateNativeMethodStub(InterfaceRef self, CoderRef p_coder, Handler *p_handler)
 {
 	NameRef t_name;
@@ -918,7 +918,6 @@ static void InterfaceGenerateNativeMethodStub(InterfaceRef self, CoderRef p_code
 	
 	MCCStringFree(t_native_name);
 }
-#endif
 
 static void InterfaceGenerateJavaHandlerStubParameters(InterfaceRef self, CoderRef p_coder, Handler *p_handler, HandlerVariant *p_variant)
 {
@@ -934,18 +933,6 @@ static void InterfaceGenerateJavaHandlerStubParameters(InterfaceRef self, CoderR
 	}
 }
 
-static char *InterfaceGenerateJavaHandlerStubSignature(InterfaceRef self, Handler *p_handler, HandlerVariant *p_variant)
-{
-	char *t_signature;
-	t_signature = nil;
-	MCCStringAppend(t_signature, "(");
-	for(uindex_t i = 0; i < p_variant -> parameter_count; i++)
-		MCCStringAppend(t_signature, native_type_to_java_sig(NativeTypeFromName(p_variant -> parameters[i] . type)));
-	MCCStringAppend(t_signature, ")");
-	MCCStringAppend(t_signature, p_variant -> return_type != nil ? native_type_to_java_sig(NativeTypeFromName(p_variant -> return_type)) : "V");
-	return t_signature;
-}
-
 static void InterfaceGenerateJavaHandlerStub(InterfaceRef self, CoderRef p_coder, Handler *p_handler, HandlerVariant *p_variant)
 {	
 	// Compute the return types for various contexts.
@@ -1027,6 +1014,20 @@ static void InterfaceGenerateJavaHandlerStub(InterfaceRef self, CoderRef p_coder
 
 }
 
+#endif
+
+static char *InterfaceGenerateJavaHandlerStubSignature(InterfaceRef self, Handler *p_handler, HandlerVariant *p_variant)
+{
+	char *t_signature;
+	t_signature = nil;
+	MCCStringAppend(t_signature, "(");
+	for(uindex_t i = 0; i < p_variant -> parameter_count; i++)
+		MCCStringAppend(t_signature, native_type_to_java_sig(NativeTypeFromName(p_variant -> parameters[i] . type)));
+	MCCStringAppend(t_signature, ")");
+	MCCStringAppend(t_signature, p_variant -> return_type != nil ? native_type_to_java_sig(NativeTypeFromName(p_variant -> return_type)) : "V");
+	return t_signature;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 struct MappedParameter
@@ -1251,7 +1252,11 @@ static void InterfaceGenerateVariant(InterfaceRef self, CoderRef p_coder, Handle
 			CoderWrite(p_coder, "%s(", NameGetCString(t_variant -> binding));
         
         for(uint32_t k = 0; k < p_variant -> parameter_count; k++)
-            CoderWrite(p_coder, ", %s", t_mapped_params[k] . var_name);
+		{
+			if (k > 0 || t_variant -> return_type_indirect)
+				CoderWrite(p_coder, ", ");
+            CoderWrite(p_coder, "%s", t_mapped_params[k] . var_name);
+		}
 			
         CoderWrite(p_coder, ")");
 		
@@ -1297,11 +1302,7 @@ static void InterfaceGenerateVariant(InterfaceRef self, CoderRef p_coder, Handle
 			CoderWrite(p_coder, "__java_env -> CallStaticVoidMethod(s_java_class, s_method");
 		
         for(uint32_t k = 0; k < p_variant -> parameter_count; k++)
-		{
-			HandlerParameter *t_parameter;
-			t_parameter = &p_variant -> parameters[k];
-			CoderWrite(p_coder, ", param__%s", NameGetCString(t_parameter -> name));
-		}
+			CoderWrite(p_coder, ", %s", t_mapped_params[k] . var_name);
         
 		CoderWrite(p_coder, ")");
 		CoderEndStatement(p_coder);
diff --git a/revtestexternal/revtestexternal.lcidl b/revtestexternal/revtestexternal.lcidl
@@ -33,6 +33,7 @@ command revTestExternalTestWait
 
 command revTestExternalTestArrays
 
+use java on android
 command revTestExternalTestPostAndSend
 
 use none on linux, windows, android
