Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

[[ Bug 19962 ]] Various fixes and updates to lc-compile-ffi-java #5646

Merged
livecodeali merged 5 commits into from
Jul 4, 2017
Merged

[[ Bug 19962 ]] Various fixes and updates to lc-compile-ffi-java #5646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
56a41fd
[[ Bug 19962 ]] Fix return type code in binding strings
livecodeali Jun 27, 2017
c073f6f
[[ Bug 19962 ]] Add line continuation before 'binds to' in foreign ha…
livecodeali Jun 27, 2017
583cb98
[[ Bug 19964 ]] Add JChar type
livecodeali Jun 27, 2017
cfcb278
[[ Bug 19962 ]] Use java types for foreign handler binding output fro…
livecodeali Jun 27, 2017
43fb8c2
[[ Bug 19962 ]] Mark generated java foreign handlers as safe
livecodeali Jun 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/lcb/notes/feature-jchar.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# LiveCode Builder Standard Library
## Foreign function interface

* The Java integer primtive type JChar has been added.
This maps to uint16_t.
1 change: 1 addition & 0 deletions libscript/src/java.lcb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ use com.livecode.foreign

public type JBoolean is Bool
public type JByte is Int8
public type JChar is UInt16
public type JShort is Int16
public type JInt is Int32
public type JLong is Int64
Expand Down
103 changes: 55 additions & 48 deletions toolchain/lc-compile-ffi-java/src/generate.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
ResolveIdName(Id -> RealName)
|)

OutputWrite("foreign handler ")
OutputWrite("__safe foreign handler ")
OutputForeignHandlerName(Type, MethodName)
OutputForeignHandlerSignatureWithParameter(Type, Signature, Modifiers)
OutputMethodBindingString(Type, RealName, Signature, Modifiers)
Expand All @@ -120,7 +120,7 @@
ResolveIdName(Id -> RealName)
|)

OutputWrite("foreign handler ")
OutputWrite("__safe foreign handler ")
OutputForeignHandlerName(Type, MethodName)
OutputForeignSignatureWithReturnType(Type, Signature)
OutputConstructorBindingString(Type, RealName, Signature)
Expand All @@ -146,7 +146,7 @@
'action' GenerateForeignGetterOfClass(TYPE, NAME, TYPE, MODIFIER)

'rule' GenerateForeignGetterOfClass(ClassType, Name, VarType, InstanceModifier)
OutputWrite("foreign handler ")
OutputWrite("__safe foreign handler ")
OutputForeignGetterName(ClassType, Name)
OutputForeignGetterSignature(ClassType, Name, VarType, InstanceModifier)
OutputGetVariableBindingString(ClassType, Name, VarType, InstanceModifier)
Expand All @@ -155,7 +155,7 @@
'action' GenerateForeignSetterOfClass(TYPE, NAME, TYPE, MODIFIER)

'rule' GenerateForeignSetterOfClass(ClassType, Name, VarType, InstanceModifier)
OutputWrite("foreign handler ")
OutputWrite("__safe foreign handler ")
OutputForeignSetterName(ClassType, Name)
OutputForeignSetterSignature(ClassType, Name, VarType, InstanceModifier)
OutputSetVariableBindingString(ClassType, Name, VarType, InstanceModifier)
Expand Down Expand Up @@ -267,7 +267,7 @@

'rule' OutputMethodBindingStringInstance(ClassType, MethodName, Signature, InstanceModifier):
TypeToQualifiedName(ClassType -> QualifiedClass)
OutputWriteI(" binds to \"java:", QualifiedClass, ">")
OutputWriteI(" \\\nbinds to \"java:", QualifiedClass, ">")
OutputWriteI("", MethodName, "")
OutputJavaSignature(Signature)
(|
Expand All @@ -281,7 +281,7 @@

'rule' OutputConstructorBindingString(ClassType, MethodName, Signature):
TypeToQualifiedName(ClassType -> QualifiedClass)
OutputWriteI(" binds to \"java:", QualifiedClass, ">")
OutputWriteI(" \\\nbinds to \"java:", QualifiedClass, ">")
OutputWrite("new")
OutputJavaSignature(Signature)
OutputWrite("\"")
Expand All @@ -290,7 +290,7 @@

'rule' OutputSetVariableBindingString(ClassType, FieldName, VarType, InstanceModifier):
TypeToQualifiedName(ClassType -> QualifiedClass)
OutputWriteI(" binds to \"java:", QualifiedClass, ">")
OutputWriteI(" \\\nbinds to \"java:", QualifiedClass, ">")
OutputWriteI("set.", FieldName, "")
OutputWrite("(")
OutputJavaTypeCode(VarType)
Expand All @@ -306,7 +306,7 @@

'rule' OutputGetVariableBindingString(ClassType, FieldName, VarType, InstanceModifier):
TypeToQualifiedName(ClassType -> QualifiedClass)
OutputWriteI(" binds to \"java:", QualifiedClass, ">")
OutputWriteI(" \\\nbinds to \"java:", QualifiedClass, ">")
OutputWriteI("get.", FieldName, "")
OutputWrite("(")
OutputWrite(")")
Expand All @@ -324,7 +324,7 @@
OutputWrite("(")
OutputJavaParams(Params)
OutputWrite(")")
OutputJavaTypeCode(ReturnType)
OutputJavaReturnTypeCode(ReturnType)

'action' OutputJavaParams(PARAMETERLIST)

Expand Down Expand Up @@ -447,13 +447,11 @@

'rule' OutputCallForeignConstructor(ObjType, Name, signature(Params, nil))
OutputConvertToForeignParams(Params)
OutputWrite("\tunsafe\n\t\t")
OutputWrite("return ")
OutputWrite("\treturn ")
OutputForeignHandlerName(ObjType, Name)
OutputWrite("(")
OutputForeignCallParams(Params)
OutputWrite(")\n")
OutputWrite("\tend unsafe\n")

'action' OutputCallForeignHandlerParams(TYPE, NAME, PARAMETERLIST, MODIFIER)

Expand Down Expand Up @@ -488,56 +486,56 @@
OutputConvertToForeignParams(Params)
(|
where(ReturnType -> nil)
OutputWrite("\tunsafe\n\t\t")
OutputWrite("\t")
OutputCallForeignHandlerParams(ObjType, Name, Params, InstanceModifier)
OutputWrite("\n")
OutputWrite("\tend unsafe\n")
||
OutputWrite("\tvariable tJNIResult as ")
(|
RequiresConversion(ReturnType)
OutputWrite("\tvariable tJNIResult as ")
GenerateJavaType(ReturnType)
OutputWrite("\n\tput ")
OutputCallForeignHandlerParams(ObjType, Name, Params, InstanceModifier)
OutputWrite(" into tJNIResult\n")
OutputWrapperReturn(ReturnType)
||
GenerateType(ReturnType)
OutputWrite("\treturn ")
OutputCallForeignHandlerParams(ObjType, Name, Params, InstanceModifier)
|)
OutputWrite("\n\tunsafe\n")
OutputWrite("\t\tput ")
OutputCallForeignHandlerParams(ObjType, Name, Params, InstanceModifier)
OutputWrite(" into tJNIResult\n")
OutputWrite("\tend unsafe\n")
OutputWrapperReturn(ReturnType)
OutputWrite("\n")
|)

'action' OutputForeignGetter(TYPE, NAME, MODIFIER)

'rule' OutputForeignGetter(ObjType, Name, class):
OutputForeignGetterName(ObjType, Name)
OutputWrite("(pObj)")

'rule' OutputForeignGetter(ObjType, Name, Instance):
OutputForeignGetterName(ObjType, Name)
OutputWrite("()")

'action' OutputCallForeignGetter(TYPE, NAME, TYPE, MODIFIER)

'rule' OutputCallForeignGetter(ObjType, Name, Type, InstanceModifier)
OutputWrite("\tvariable tJNIResult as ")
(|
RequiresConversion(Type)
OutputWrite("\tvariable tJNIResult as ")
GenerateJavaType(Type)
OutputWrite("\n\tput ")
OutputForeignGetter(ObjType, Name, InstanceModifier)
OutputWrite(" into tJNIResult\n")
OutputWrapperReturn(Type)
||
GenerateType(Type)
|)
OutputWrite("\n\tunsafe\n")
OutputWrite("\t\tput ")
OutputForeignGetterName(ObjType, Name)
OutputWrite("(")
(|
where(InstanceModifier -> class)
||
OutputWrite("pObj")
OutputWrite("\treturn ")
OutputForeignGetter(ObjType, Name, InstanceModifier)
|)
OutputWrite(")")
OutputWrite(" into tJNIResult\n")
OutputWrite("\tend unsafe\n")
OutputWrapperReturn(Type)


'action' OutputCallForeignSetter(TYPE, NAME, TYPE, MODIFIER)

'rule' OutputCallForeignSetter(ObjType, Name, Type, InstanceModifier)
OutputConvertToForeignParameter(Name, Type)
OutputWrite("\tunsafe\n\t\t")
OutputWrite("\t")
OutputForeignSetterName(ObjType, Name)
OutputWrite("(")
(|
Expand All @@ -552,7 +550,7 @@
OutputWriteI("pParam_", Name, "")
|)
OutputWrite(")")
OutputWrite("\n\tend unsafe\n")
OutputWrite("\n")

'action' OutputConvertToForeignParams(PARAMETERLIST)

Expand Down Expand Up @@ -808,28 +806,28 @@
'action' GenerateJavaType(TYPE)

'rule' GenerateJavaType(byte):
OutputWrite("CInt")
OutputWrite("JByte")

'rule' GenerateJavaType(short):
OutputWrite("CInt")
OutputWrite("JShort")

'rule' GenerateJavaType(int):
OutputWrite("CInt")
OutputWrite("JInt")

'rule' GenerateJavaType(long):
OutputWrite("CInt")
OutputWrite("JLong")

'rule' GenerateJavaType(float):
OutputWrite("CFloat")
OutputWrite("JFloat")

'rule' GenerateJavaType(double):
OutputWrite("CDouble")
OutputWrite("JDouble")

'rule' GenerateJavaType(boolean):
OutputWrite("CBool")
OutputWrite("JBoolean")

'rule' GenerateJavaType(char):
OutputWrite("CInt")
OutputWrite("JChar")

'rule' GenerateJavaType(string):
OutputWrite("JString")
Expand Down Expand Up @@ -960,6 +958,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
Expand Down