[[ Bug 19962 ]] Fix return type code in binding strings

livecodeali · livecodeali · commit 56a41fdab23f · 2017-06-27T17:08:12.000+01:00
diff --git a/toolchain/lc-compile-ffi-java/src/generate.g b/toolchain/lc-compile-ffi-java/src/generate.g
@@ -324,7 +324,7 @@
 		OutputWrite("(")
         OutputJavaParams(Params)
         OutputWrite(")")
-        OutputJavaTypeCode(ReturnType)
+        OutputJavaReturnTypeCode(ReturnType)
 		
 'action' OutputJavaParams(PARAMETERLIST)
 
@@ -960,6 +960,15 @@
 
     'rule' OutputJavaTypeCode(nil):
 
+-- Ensure return type code is always specified as V if returning nothing
+'action' OutputJavaReturnTypeCode(TYPE)
+
+    'rule' OutputJavaReturnTypeCode(nil):
+        OutputWrite("V")
+
+    'rule' OutputJavaReturnTypeCode(Type):
+        OutputJavaTypeCode(Type)
+
 'action' OutputJavaArrayTypeCode(TYPE, INT)
 
     -- output java array
