lcb: Minor cleanup

runrevmark · runrevmark · commit c9e84471092f · 2017-04-03T15:13:28.000+01:00
This patch cleans up a number of minor things in the patch. Including:

  - ensuring the java type definitions use machine types, and not C
    types

  - using the correct int for the bind to MCDataCreateWithBytes

  - adding some missing new types to the docs
diff --git a/docs/guides/LiveCode Builder Language Reference.md b/docs/guides/LiveCode Builder Language Reference.md
@@ -464,6 +464,8 @@ There are aliases for the Java primitive types:
  - JShort maps to Int16
  - JInt maps to Int32
  - JLong maps to Int64
+ - JFloat maps to Float32
+ - JDouble maps to Float64
 
 All the primitive types above will implicitly bridge between corresponding
 high level types:
diff --git a/docs/lcb/notes/feature-sized_ints.md b/docs/lcb/notes/feature-sized_ints.md
@@ -12,6 +12,6 @@ version: 9.0.0-dp-7
   CUInt, CSLong, CULong, CSLongLong and CULongLong have been added.
   These all map to their corresponding C counterparts.
 
-* The Java integer primtive types JByte, JShort, JInt, JLong,
+* The Java integer primtive types JBoolean, JByte, JShort, JInt, JLong,
   JFloat and JDouble have been added. These map to int8_t,
   int16_t, int32_t, int64_t, float and double.
diff --git a/libfoundation/src/foundation-foreign.cpp b/libfoundation/src/foundation-foreign.cpp
@@ -628,9 +628,8 @@ template <typename TypeDesc>
 bool doimport(void *contents, bool p_release, MCValueRef& r_value)
 {
     static_assert(TypeDesc::is_bridgable, "This type is not bridgable");
-    bool t_success = DoImport<TypeDesc>::doimport(*static_cast<typename TypeDesc::c_type *>(contents),
+    return DoImport<TypeDesc>::doimport(*static_cast<typename TypeDesc::c_type *>(contents),
                                         reinterpret_cast<typename TypeDesc::bridge_type&>(r_value));
-    return t_success;
 }
 
 /* ---------- bool specializations */
diff --git a/libscript/src/java.lcb b/libscript/src/java.lcb
@@ -39,8 +39,8 @@ 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 type JFloat is Float32
+public type JDouble is Float64
 
 public foreign type JObject binds to "MCJavaObjectTypeInfo"
 public type JString is JObject
diff --git a/tests/lcb/stdlib/java.lcb b/tests/lcb/stdlib/java.lcb
@@ -40,7 +40,7 @@ end handler
 
 foreign handler CreateJavaString(in pBytes as JByteArray) returns JString binds to "java:java.lang.String>new([B)"
 
-foreign handler MCDataCreateWithBytes(in pBytes as ZStringNative, in pCount as CUInt, out rData as Data) returns JBoolean binds to "<builtin>"
+foreign handler MCDataCreateWithBytes(in pBytes as ZStringNative, in pCount as LCUIndex, out rData as Data) returns CBool binds to "<builtin>"
 
 public handler TestCreateJString()
    	if not the operating system is in ["mac", "linux"] then

Original file line number	Diff line number	Diff line change
`@@ -628,9 +628,8 @@ template <typename TypeDesc>`
`628`	`628`	`bool doimport(void *contents, bool p_release, MCValueRef& r_value)`
`629`	`629`	`{`
`630`	`630`	`static_assert(TypeDesc::is_bridgable, "This type is not bridgable");`
`631`		`- bool t_success = DoImport<TypeDesc>::doimport(static_cast<typename TypeDesc::c_type >(contents),`
	`631`	`+ return DoImport<TypeDesc>::doimport(static_cast<typename TypeDesc::c_type >(contents),`
`632`	`632`	`reinterpret_cast<typename TypeDesc::bridge_type&>(r_value));`
`633`		`- return t_success;`
`634`	`633`	`}`
`635`	`634`
`636`	`635`	`/* ---------- bool specializations */`