Skip to content

Commit b49e30a

Browse files
committed
Don't have a module called Truffle::Fiddle to avoid conflicts
1 parent 37b70d4 commit b49e30a

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

lib/truffle/truffle/fiddle_backend.rb

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# GNU General Public License version 2, or
77
# GNU Lesser General Public License version 2.1.
88

9-
module Truffle::Fiddle
9+
module Truffle::FiddleBackend
1010

1111
SIZEOF_INT = Truffle::FFI::Pointer.find_type_size(:int)
1212
SIZEOF_LONG = Truffle::FFI::Pointer.find_type_size(:long)
@@ -114,8 +114,8 @@ class DLError < StandardError
114114
SIZEOF_VOIDP = Truffle::FFI::Pointer.find_type_size(:pointer)
115115
SIZEOF_CHAR = Truffle::FFI::Pointer.find_type_size(:char)
116116
SIZEOF_SHORT = Truffle::FFI::Pointer.find_type_size(:short)
117-
SIZEOF_INT = Truffle::Fiddle::SIZEOF_INT
118-
SIZEOF_LONG = Truffle::Fiddle::SIZEOF_LONG
117+
SIZEOF_INT = Truffle::FiddleBackend::SIZEOF_INT
118+
SIZEOF_LONG = Truffle::FiddleBackend::SIZEOF_LONG
119119
SIZEOF_LONG_LONG = Truffle::FFI::Pointer.find_type_size(:long_long)
120120
SIZEOF_FLOAT = Truffle::FFI::Pointer.find_type_size(:float)
121121
SIZEOF_DOUBLE = Truffle::FFI::Pointer.find_type_size(:double)
@@ -126,10 +126,10 @@ class DLError < StandardError
126126
SIZEOF_INTPTR_T = Truffle::FFI::Pointer.find_type_size(:intptr_t)
127127
SIZEOF_UINTPTR_T = Truffle::FFI::Pointer.find_type_size(:uintptr_t)
128128

129-
TYPE_SSIZE_T = Truffle::Fiddle.int_type(SIZEOF_SIZE_T)
130-
TYPE_SIZE_T = -1 * Truffle::Fiddle::SIGNEDNESS_OF_SIZE_T * TYPE_SSIZE_T
131-
TYPE_PTRDIFF_T = Truffle::Fiddle.int_type(SIZEOF_PTRDIFF_T)
132-
TYPE_INTPTR_T = Truffle::Fiddle.int_type(SIZEOF_INTPTR_T)
129+
TYPE_SSIZE_T = Truffle::FiddleBackend.int_type(SIZEOF_SIZE_T)
130+
TYPE_SIZE_T = -1 * Truffle::FiddleBackend::SIGNEDNESS_OF_SIZE_T * TYPE_SSIZE_T
131+
TYPE_PTRDIFF_T = Truffle::FiddleBackend.int_type(SIZEOF_PTRDIFF_T)
132+
TYPE_INTPTR_T = Truffle::FiddleBackend.int_type(SIZEOF_INTPTR_T)
133133
TYPE_UINTPTR_T = -TYPE_INTPTR_T
134134

135135
# Alignment assumed to be the same as size
@@ -178,8 +178,8 @@ class Function
178178
def initialize(ptr, args, ret_type, abi = DEFAULT, name: nil)
179179
@arg_types = args
180180
@ret_type = ret_type
181-
args = args.map { |arg| Truffle::Fiddle.type_to_nfi(arg) }
182-
ret_type = Truffle::Fiddle.type_to_nfi(ret_type)
181+
args = args.map { |arg| Truffle::FiddleBackend.type_to_nfi(arg) }
182+
ret_type = Truffle::FiddleBackend.type_to_nfi(ret_type)
183183
signature = "(#{args.join(',')}):#{ret_type}"
184184

185185
if ptr.is_a?(Closure)
@@ -191,9 +191,9 @@ def initialize(ptr, args, ret_type, abi = DEFAULT, name: nil)
191191
end
192192

193193
def call(*args)
194-
args = (args.zip(@arg_types)).map { |arg, type| Truffle::Fiddle.convert_ruby_to_native(type, arg) }
194+
args = args.zip(@arg_types).map { |arg, type| Truffle::FiddleBackend.convert_ruby_to_native(type, arg) }
195195
ret = @function.call(*args)
196-
Truffle::Fiddle.convert_native_to_ruby(@ret_type, ret)
196+
Truffle::FiddleBackend.convert_native_to_ruby(@ret_type, ret)
197197
end
198198

199199
end

0 commit comments

Comments
 (0)