hg/stx-libbasic: comparison ExternalLibraryFunction.st

equal deleted inserted replaced

-:cbcc99660889
+:209adc65cf44
 "call the function with no arguments"
 self hasCode ifFalse:[
 self prepareInvoke.
 ].
-^ self invokeFFIwithArguments:nil forCPPInstance:nil
+^ self invokeFFIwithArguments:nil forInstance:nil
 "Modified (comment): / 04-03-2019 / 09:41:20 / Claus Gittinger"
 !
 invokeCPPVirtualOn:anInstance
 "call a CPP virtual function with no arguments"
 self hasCode ifFalse:[
 self prepareInvoke.
 ].
-^ self invokeFFIwithArguments:nil forCPPInstance:anInstance
+^ self invokeFFIwithArguments:nil forInstance:anInstance
 "Modified (comment): / 04-03-2019 / 09:39:27 / Claus Gittinger"
 !
 invokeCPPVirtualOn:anInstance with:arg
 self hasCode ifFalse:[
 self prepareInvoke.
 ].
 ^ self
 invokeFFIwithArguments:(Array with:arg)
-forCPPInstance:anInstance
+forInstance:anInstance
 "Modified (comment): / 04-03-2019 / 09:39:34 / Claus Gittinger"
 !
 invokeCPPVirtualOn:anInstance with:arg1 with:arg2
 self hasCode ifFalse:[
 self prepareInvoke.
 ].
 ^ self
 invokeFFIwithArguments:(Array with:arg1 with:arg2)
-forCPPInstance:anInstance
+forInstance:anInstance
 "Modified (comment): / 04-03-2019 / 09:39:38 / Claus Gittinger"
 !
 invokeCPPVirtualOn:anInstance with:arg1 with:arg2 with:arg3
 self hasCode ifFalse:[
 self prepareInvoke.
 ].
 ^ self
 invokeFFIwithArguments:(Array with:arg1 with:arg2 with:arg3)
-forCPPInstance:anInstance
+forInstance:anInstance
 "Modified (comment): / 04-03-2019 / 09:39:43 / Claus Gittinger"
 !
 invokeCPPVirtualOn:anInstance with:arg1 with:arg2 with:arg3 with:arg4
 self hasCode ifFalse:[
 self prepareInvoke.
 ].
 ^ self
 invokeFFIwithArguments:(Array with:arg1 with:arg2 with:arg3 with:arg4)
-forCPPInstance:anInstance
+forInstance:anInstance
 "Modified (comment): / 04-03-2019 / 09:39:48 / Claus Gittinger"
 !
 invokeCPPVirtualOn:anInstance withArguments:args
 self hasCode ifFalse:[
 self prepareInvoke.
 ].
 ^ self
 invokeFFIwithArguments:args
-forCPPInstance:anInstance
+forInstance:anInstance
 "Modified (comment): / 04-03-2019 / 09:39:57 / Claus Gittinger"
 !
 invokeObjCOn:anInstance
 "call an ObjC method with no arguments"
 self hasCode ifFalse:[
 self prepareObjCInvoke.
 ].
-^ self invokeFFIwithArguments:nil forCPPInstance:anInstance
+^ self invokeFFIwithArguments:nil forInstance:anInstance
 "Created: / 04-03-2019 / 09:12:12 / Claus Gittinger"
 !
 invokeObjCOn:anInstance withArguments:args
 "call an ObjC method with up to maxArgs (15) arguments"
 self hasCode ifFalse:[
 self prepareObjCInvoke.
 ].
-^ self invokeFFIwithArguments:args forCPPInstance:anInstance
+^ self invokeFFIwithArguments:args forInstance:anInstance
 "Created: / 04-03-2019 / 09:39:03 / Claus Gittinger"
 !
 invokeWith:arg
 "call the function with 1 argument"
 self hasCode ifFalse:[
 self prepareInvoke.
 ].
-^ self invokeFFIwithArguments:(Array with:arg) forCPPInstance:nil
+^ self invokeFFIwithArguments:(Array with:arg) forInstance:nil
 "Modified (comment): / 04-03-2019 / 09:41:14 / Claus Gittinger"
 !
 invokeWith:arg1 with:arg2
 "call the function with 2 arguments"
 self hasCode ifFalse:[
 self prepareInvoke.
 ].
-^ self invokeFFIwithArguments:(Array with:arg1 with:arg2) forCPPInstance:nil
+^ self invokeFFIwithArguments:(Array with:arg1 with:arg2) forInstance:nil
 "Modified (comment): / 04-03-2019 / 09:41:07 / Claus Gittinger"
 !
 invokeWith:arg1 with:arg2 with:arg3
 "call the function with 3 arguments"
 self hasCode ifFalse:[
 self prepareInvoke.
 ].
-^ self invokeFFIwithArguments:(Array with:arg1 with:arg2 with:arg3) forCPPInstance:nil
+^ self invokeFFIwithArguments:(Array with:arg1 with:arg2 with:arg3) forInstance:nil
 "Modified (comment): / 04-03-2019 / 09:41:01 / Claus Gittinger"
 !
 invokeWith:arg1 with:arg2 with:arg3 with:arg4
 "call the function with 4 arguments"
 self hasCode ifFalse:[
 self prepareInvoke.
 ].
-^ self invokeFFIwithArguments:(Array with:arg1 with:arg2 with:arg3 with:arg4) forCPPInstance:nil
+^ self invokeFFIwithArguments:(Array with:arg1 with:arg2 with:arg3 with:arg4) forInstance:nil
 "Modified (comment): / 04-03-2019 / 09:40:56 / Claus Gittinger"
 !
 invokeWithArguments:argArray
 "call the function with up to maxArgs (15) arguments"
 self hasCode ifFalse:[
 self prepareInvoke.
 ].
-^ self invokeFFIwithArguments:argArray forCPPInstance:nil
+^ self invokeFFIwithArguments:argArray forInstance:nil
 "Modified: / 01-08-2006 / 16:04:08 / cg"
 "Modified (comment): / 04-03-2019 / 09:40:48 / Claus Gittinger"
 ! !
 ! !
 !ExternalLibraryFunction methodsFor:'private-invoking'!
 invokeCPPVirtualFFIOn:instance withArguments:arguments
-^ self invokeFFIwithArguments:arguments forCPPInstance:instance
+^ self invokeFFIwithArguments:arguments forInstance:instance
 "Modified: / 01-08-2006 / 13:55:30 / cg"
 !
 invokeFFIWithArguments:arguments
-^ self invokeFFIwithArguments:arguments forCPPInstance:nil
+^ self invokeFFIwithArguments:arguments forInstance:nil
 "Modified: / 01-08-2006 / 13:55:35 / cg"
 !
-invokeFFIwithArguments:argumentsOrNilIn forCPPInstance:aReceiverOrNil
+invokeFFIwithArguments:argumentsOrNilIn forInstance:aReceiverOrNil
 "basic invoke mechanism. Calls the function represented by the receiver with argumentsOrNil.
 For cplusplus, aReceiverOrNil is required to be an externalStructure like object;
 for objectiveC, it must be an ObjectiveC object"
 |argTypeSymbols returnTypeSymbol failureCode failureArgNr failureInfo returnValue stClass vtOffset
 ((oldReturnType ~= returnType) or:[oldArgumentTypes ~= argumentTypes]) ifTrue:[
 thisContext restart
 ].
 ].
 (failureCode == #BadArgForAsyncCall) ifTrue:[
-^ self tryAgainWithAsyncSafeArguments:argumentsOrNil forCPPInstance:aReceiverOrNil
+^ self tryAgainWithAsyncSafeArguments:argumentsOrNil forInstance:aReceiverOrNil
 ].
 (failureCode == #FFINotSupported) ifTrue:[
 ^ self primitiveFailed:'FFI support missing in this build'.
 ].
 "Modified: / 15-05-2017 / 19:48:52 / mawalch"
 "Modified: / 01-08-2017 / 14:03:52 / cg"
 "Modified: / 01-03-2019 / 15:40:14 / Claus Gittinger"
 !
-tryAgainWithAsyncSafeArguments:argumentsOrNil forCPPInstance:aReceiverOrNil
+tryAgainWithAsyncSafeArguments:argumentsOrNil forInstance:aReceiverOrNil
 "invoked by the call primitive, iff GC-unsave arguments where passed to the call.
 Here, allocate non-movable blocks of memory and copy the arguments into them,
 then try the call again, copy changed values back, and release the memeory."
 |saveArguments anyBadArg result originalToSaveArgMapping|
 anyBadArg ifFalse:[
 	"avoid recursion..."
 	^ self primitiveFailed
 ].
-result := self invokeFFIwithArguments:saveArguments forCPPInstance:aReceiverOrNil.
+result := self invokeFFIwithArguments:saveArguments forInstance:aReceiverOrNil.
 "/ copy back !!
 originalToSaveArgMapping keysAndValuesDo:[:arg :saveArg |
 	arg isSymbol ifFalse:[
 	    arg replaceFrom:1 to:(arg size) with:saveArg startingAt:1.

changeset 23829	209adc65cf44
parent 23828	cbcc99660889
child 23831	c741a73646f0