[[ Bug 20527 ]] Fix incorrect java binding string parsing

livecodeali · livecodeali · commit d0a45281cbdf · 2017-10-09T17:55:42.000+01:00
diff --git a/docs/lcb/notes/20527.md b/docs/lcb/notes/20527.md
@@ -0,0 +1,4 @@
+# LiveCode Builder Foreign Function Interface
+
+# [20527] Parse complex java binding strings correctly
+
diff --git a/libfoundation/src/foundation-java-private.cpp b/libfoundation/src/foundation-java-private.cpp
@@ -124,6 +124,9 @@ static bool __NextArgument(MCStringRef p_arguments, MCRange& x_range)
         
         // Consume the ;
         t_length++;
+        
+        // Correct the length for the starting point
+        t_length -= x_range.offset;
     }
     
     x_range . length = t_length;
diff --git a/tests/lcb/stdlib/java.lcb b/tests/lcb/stdlib/java.lcb
@@ -345,4 +345,27 @@ public handler TestNativeTypeAfterObjectType()
 	end unsafe
 end handler
 
+__safe foreign handler RegionMatches(in pString as JString, in pCaseless as JBoolean, in pOffset as JInt, in pOther as JString, in pOtherOffset as JInt, in pLength as JInt) returns JBoolean binds to "java:java.lang.String>regionMatches(ZILjava/lang/String;II)Z"
+
+public handler TestBindingStringObjectTypeInMiddle()
+	if not the operating system is in ["mac", "linux"] then
+		skip test "called foreign handler with signature Ljava/lang/CharSequence;I" because "not implemented on" && the operating system
+		return
+	end if
+	
+	if the operating system is "linux" then
+		skip test "called foreign handler with signature Ljava/lang/CharSequence;I" because "bug 19934"
+		return
+	end if
+	
+	variable tString as JString
+	put StringToJString("something") into tString
+	
+	variable tOther as JString
+	put StringToJString("NOTHING") into tOther
+	
+	test "called foreign handler with signature (ZILjava/lang/String;II)Z" when \
+		RegionMatches(tString, true, 4, tOther, 2, 5)
+end handler 
+
 end module
diff --git a/tests/lcb/vm/foreign-binding.lcb b/tests/lcb/vm/foreign-binding.lcb
@@ -33,7 +33,7 @@ end handler
 ---------
 
 foreign handler CreateJavaObject() returns JObject binds to "java:java.lang.Object>new()"
-foreign handler CreateJavaObjectDoesntExist() returns JObject binds to "java:java.lang.Object>new_doesnt_exist()"
+foreign handler CreateJavaObjectDoesntExist() returns JObject binds to "java:java.lang.Object>new_doesnt_exist()Ljava/lang/Object;"
 
 private handler TestForeignBinding_NonExistentJava()
    unsafe

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +# LiveCode Builder Foreign Function Interface
++
 +# [20527] Parse complex java binding strings correctly
++
Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,9 @@ static bool __NextArgument(MCStringRef p_arguments, MCRange& x_range)`
`124`	`124`
`125`	`125`	`// Consume the ;`
`126`	`126`	`t_length++;`
	`127`	`+`
	`128`	`+ // Correct the length for the starting point`
	`129`	`+ t_length -= x_range.offset;`
`127`	`130`	`}`
`128`	`131`
`129`	`132`	`x_range . length = t_length;`