libfoundation: Make java ffi map int types correctly

runrevmark · runrevmark · commit ec2a26c55bd3 · 2017-03-23T12:43:37.000Z
This patch ensures that java uses appropriate mappings to the
sized integer types.

Additionally it adds J* type definitions to the java lcb module
to make foreign methods types clearer to express.
diff --git a/libfoundation/src/foundation-java-private.cpp b/libfoundation/src/foundation-java-private.cpp
@@ -44,8 +44,14 @@ int MCJavaMapTypeCode(MCStringRef p_type_code)
 
 static bool __GetExpectedTypeCode(MCTypeInfoRef p_type, MCJavaType& r_code)
 {
-    if (p_type == kMCIntTypeInfo)
+    if (p_type == kMCInt8TypeInfo)
+        r_code = kMCJavaTypeByte;
+    else if (p_type == kMCInt16TypeInfo)
+        r_code = kMCJavaTypeShort;
+    else if (p_type == kMCInt32TypeInfo)
         r_code = kMCJavaTypeInt;
+    else if (p_type == kMCInt64TypeInfo)
+        r_code = kMCJavaTypeLong;
     else if (p_type == kMCBoolTypeInfo)
         r_code = kMCJavaTypeBoolean;
     else if (p_type == kMCFloatTypeInfo)
@@ -80,11 +86,6 @@ static bool __MCTypeInfoConformsToJavaType(MCTypeInfoRef p_type, MCJavaType p_co
     if (!__GetExpectedTypeCode(p_type, t_code))
         return false;
     
-    // Just allow long and int interchangeably for now
-    if (t_code == kMCJavaTypeInt &&
-        p_code == kMCJavaTypeLong)
-        return true;
-    
     return t_code == p_code;
 }
 
diff --git a/libscript/src/java.lcb b/libscript/src/java.lcb
@@ -34,6 +34,14 @@ module com.livecode.java
 
 use com.livecode.foreign
 
+public type JBoolean is CBool
+public type JByte is Int8
+public type JShort is Int16
+public type JInt is Int32
+public type JLong is Int64
+public type JFloat is CFloat
+public type JDouble is CDouble
+
 public foreign type JObject binds to "MCJavaObjectTypeInfo"
 public type JString is JObject
 public type JByteArray is JObject
diff --git a/tests/lcb/stdlib/java.lcb b/tests/lcb/stdlib/java.lcb
@@ -120,7 +120,7 @@ public handler TestGetConstant()
 		when tPiTrunc is 3
 end handler
 
-foreign handler CallJavaAdd(in pLeft as CInt, in pRight as CInt) returns CInt binds to "java:java.lang.Math>addExact(JJ)J!static"
+foreign handler CallJavaAdd(in pLeft as JLong, in pRight as JLong) returns JLong binds to "java:java.lang.Math>addExact(JJ)J!static"
 
 public handler TestCallStaticMethod()
 	variable tLeft as Number
