From bda662b5c5ff5855516a34b6dfe754b78c903434 Mon Sep 17 00:00:00 2001 From: Guille Polito Date: Tue, 24 Sep 2019 16:17:58 +0200 Subject: [PATCH] internal renames module => library --- src/UnifiedFFI/FFICalloutAPI.class.st | 2 +- .../FFICalloutMethodBuilder.class.st | 30 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/UnifiedFFI/FFICalloutAPI.class.st b/src/UnifiedFFI/FFICalloutAPI.class.st index 3dc85b08c3c..174ab33424f 100644 --- a/src/UnifiedFFI/FFICalloutAPI.class.st +++ b/src/UnifiedFFI/FFICalloutAPI.class.st @@ -105,7 +105,7 @@ FFICalloutAPI >> function: functionSignature library: moduleNameOrLibrary [ builder signature: functionSignature; sender: sender; - module: moduleNameOrLibrary ]. + library: moduleNameOrLibrary ]. ffiMethod selector: sender selector; methodClass: sender methodClass. "Replace with generated ffi method, but save old one for future use" diff --git a/src/UnifiedFFI/FFICalloutMethodBuilder.class.st b/src/UnifiedFFI/FFICalloutMethodBuilder.class.st index 4bc6e198381..b076247dfd0 100644 --- a/src/UnifiedFFI/FFICalloutMethodBuilder.class.st +++ b/src/UnifiedFFI/FFICalloutMethodBuilder.class.st @@ -10,8 +10,8 @@ Class { 'requestor', 'sender', 'signature', - 'module', - 'functionResolutionStrategies' + 'functionResolutionStrategies', + 'library' ], #category : #'UnifiedFFI-Callouts' } @@ -66,7 +66,7 @@ FFICalloutMethodBuilder >> createFFICalloutLiteralFromSpec: functionSpec [ externalFunction := ExternalLibraryFunction name: functionSpec functionName - module: self moduleName + module: self libraryName callType: self callType returnType: functionSpec returnType externalTypeWithArity argumentTypes: (functionSpec arguments collect: #externalTypeWithArity). @@ -131,29 +131,29 @@ FFICalloutMethodBuilder >> initializeCalloutAPI: aCalloutAPI [ ] { #category : #accessing } -FFICalloutMethodBuilder >> method [ - ^ self sender method -] - -{ #category : #accessing } -FFICalloutMethodBuilder >> module [ - ^ module +FFICalloutMethodBuilder >> library [ + ^ library ] { #category : #accessing } -FFICalloutMethodBuilder >> module: moduleNameOrLibraryClass [ +FFICalloutMethodBuilder >> library: aLibrary [ "A module can be a string with a path to the library or a reference to a class who is child of FFILibrary. Example: 'libc' or LibC" - module := moduleNameOrLibraryClass + library := aLibrary ] { #category : #accessing } -FFICalloutMethodBuilder >> moduleName [ +FFICalloutMethodBuilder >> libraryName [ "Answer the module name, who can come from a string with the path to the module or a reference to a class who is child of FFILibrary" - self module ifNil: [ ^ nil ]. - ^ self module asFFILibrary libraryName + self library ifNil: [ ^ nil ]. + ^ self library asFFILibrary libraryName +] + +{ #category : #accessing } +FFICalloutMethodBuilder >> method [ + ^ self sender method ] { #category : #private }