mirror of
https://github.com/ruby/ruby.git
synced 2025-09-15 08:33:58 +02:00
* ext/fiddle/fiddle.c: adding alignment constants for compatibility
with DL. * ext/fiddle/fiddle.h: ditto * ext/fiddle/lib/fiddle/cparser.rb: importing the C parser for DL backwards compatibility. * ext/fiddle/lib/fiddle/import.rb: importing the import DSL for DL backwards compatibility. * ext/fiddle/lib/fiddle/pack.rb: importing structure pack for DL backwards compatibility. * ext/fiddle/lib/fiddle/value.rb: ditto * ext/fiddle/lib/fiddle/struct.rb: importing struct DSL for DL backwards compatibility. * test/dl/test_c_struct_entry.rb: importing tests * test/dl/test_c_union_entity.rb: ditto * test/dl/test_cparser.rb: ditto * test/dl/test_import.rb: ditto * test/fiddle/test_c_struct_entry.rb: ditto * test/fiddle/test_c_union_entity.rb: ditto * test/fiddle/test_cparser.rb: ditto * test/fiddle/test_import.rb: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37914 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tenderlove
parent
118d9f43c8
commit
0713f89944
16 changed files with 1316 additions and 61 deletions
|
|
@ -2,52 +2,53 @@ require_relative 'test_base'
|
|||
|
||||
require 'dl/struct'
|
||||
|
||||
class DL::TestCStructEntity < DL::TestBase
|
||||
def test_class_size
|
||||
types = [DL::TYPE_DOUBLE, DL::TYPE_CHAR]
|
||||
module DL
|
||||
class TestCStructEntity < TestBase
|
||||
def test_class_size
|
||||
types = [TYPE_DOUBLE, TYPE_CHAR]
|
||||
|
||||
size = DL::CStructEntity.size types
|
||||
size = CStructEntity.size types
|
||||
|
||||
alignments = types.map { |type| DL::PackInfo::ALIGN_MAP[type] }
|
||||
alignments = types.map { |type| PackInfo::ALIGN_MAP[type] }
|
||||
|
||||
expected = DL::PackInfo.align 0, alignments[0]
|
||||
expected += DL::PackInfo::SIZE_MAP[DL::TYPE_DOUBLE]
|
||||
expected = PackInfo.align 0, alignments[0]
|
||||
expected += PackInfo::SIZE_MAP[TYPE_DOUBLE]
|
||||
|
||||
expected = DL::PackInfo.align expected, alignments[1]
|
||||
expected += DL::PackInfo::SIZE_MAP[DL::TYPE_CHAR]
|
||||
expected = PackInfo.align expected, alignments[1]
|
||||
expected += PackInfo::SIZE_MAP[TYPE_CHAR]
|
||||
|
||||
expected = DL::PackInfo.align expected, alignments.max
|
||||
expected = PackInfo.align expected, alignments.max
|
||||
|
||||
assert_equal expected, size
|
||||
end
|
||||
assert_equal expected, size
|
||||
end
|
||||
|
||||
def test_class_size_with_count
|
||||
size = DL::CStructEntity.size([[DL::TYPE_DOUBLE, 2], [DL::TYPE_CHAR, 20]])
|
||||
def test_class_size_with_count
|
||||
size = CStructEntity.size([[TYPE_DOUBLE, 2], [TYPE_CHAR, 20]])
|
||||
|
||||
types = [DL::TYPE_DOUBLE, DL::TYPE_CHAR]
|
||||
alignments = types.map { |type| DL::PackInfo::ALIGN_MAP[type] }
|
||||
types = [TYPE_DOUBLE, TYPE_CHAR]
|
||||
alignments = types.map { |type| PackInfo::ALIGN_MAP[type] }
|
||||
|
||||
expected = DL::PackInfo.align 0, alignments[0]
|
||||
expected += DL::PackInfo::SIZE_MAP[DL::TYPE_DOUBLE] * 2
|
||||
expected = PackInfo.align 0, alignments[0]
|
||||
expected += PackInfo::SIZE_MAP[TYPE_DOUBLE] * 2
|
||||
|
||||
expected = DL::PackInfo.align expected, alignments[1]
|
||||
expected += DL::PackInfo::SIZE_MAP[DL::TYPE_CHAR] * 20
|
||||
expected = PackInfo.align expected, alignments[1]
|
||||
expected += PackInfo::SIZE_MAP[TYPE_CHAR] * 20
|
||||
|
||||
expected = DL::PackInfo.align expected, alignments.max
|
||||
expected = PackInfo.align expected, alignments.max
|
||||
|
||||
assert_equal expected, size
|
||||
end
|
||||
assert_equal expected, size
|
||||
end
|
||||
|
||||
def test_set_ctypes
|
||||
union = DL::CStructEntity.malloc [DL::TYPE_INT, DL::TYPE_LONG]
|
||||
union.assign_names %w[int long]
|
||||
def test_set_ctypes
|
||||
union = CStructEntity.malloc [TYPE_INT, TYPE_LONG]
|
||||
union.assign_names %w[int long]
|
||||
|
||||
# this test is roundabout because the stored ctypes are not accessible
|
||||
union['long'] = 1
|
||||
union['int'] = 2
|
||||
# this test is roundabout because the stored ctypes are not accessible
|
||||
union['long'] = 1
|
||||
union['int'] = 2
|
||||
|
||||
assert_equal 1, union['long']
|
||||
assert_equal 2, union['int']
|
||||
assert_equal 1, union['long']
|
||||
assert_equal 2, union['int']
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -2,29 +2,30 @@ require_relative 'test_base'
|
|||
|
||||
require 'dl/struct'
|
||||
|
||||
class DL::TestCUnionEntity < DL::TestBase
|
||||
def test_class_size
|
||||
size = DL::CUnionEntity.size([DL::TYPE_DOUBLE, DL::TYPE_CHAR])
|
||||
module DL
|
||||
class TestCUnionEntity < TestBase
|
||||
def test_class_size
|
||||
size = CUnionEntity.size([TYPE_DOUBLE, TYPE_CHAR])
|
||||
|
||||
assert_equal DL::SIZEOF_DOUBLE, size
|
||||
end
|
||||
assert_equal SIZEOF_DOUBLE, size
|
||||
end
|
||||
|
||||
def test_class_size_with_count
|
||||
size = DL::CUnionEntity.size([[DL::TYPE_DOUBLE, 2], [DL::TYPE_CHAR, 20]])
|
||||
def test_class_size_with_count
|
||||
size = CUnionEntity.size([[TYPE_DOUBLE, 2], [TYPE_CHAR, 20]])
|
||||
|
||||
assert_equal DL::SIZEOF_CHAR * 20, size
|
||||
end
|
||||
assert_equal SIZEOF_CHAR * 20, size
|
||||
end
|
||||
|
||||
def test_set_ctypes
|
||||
union = DL::CUnionEntity.malloc [DL::TYPE_INT, DL::TYPE_LONG]
|
||||
union.assign_names %w[int long]
|
||||
def test_set_ctypes
|
||||
union = CUnionEntity.malloc [TYPE_INT, TYPE_LONG]
|
||||
union.assign_names %w[int long]
|
||||
|
||||
# this test is roundabout because the stored ctypes are not accessible
|
||||
union['long'] = 1
|
||||
assert_equal 1, union['long']
|
||||
# this test is roundabout because the stored ctypes are not accessible
|
||||
union['long'] = 1
|
||||
assert_equal 1, union['long']
|
||||
|
||||
union['int'] = 1
|
||||
assert_equal 1, union['int']
|
||||
union['int'] = 1
|
||||
assert_equal 1, union['int']
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -4,30 +4,30 @@ require 'dl/cparser'
|
|||
|
||||
module DL
|
||||
class TestCParser < TestBase
|
||||
include DL::CParser
|
||||
include CParser
|
||||
|
||||
def test_uint_ctype
|
||||
assert_equal(-DL::TYPE_INT, parse_ctype('uint'))
|
||||
assert_equal(-TYPE_INT, parse_ctype('uint'))
|
||||
end
|
||||
|
||||
def test_size_t_ctype
|
||||
assert_equal(DL::TYPE_SIZE_T, parse_ctype("size_t"))
|
||||
assert_equal(TYPE_SIZE_T, parse_ctype("size_t"))
|
||||
end
|
||||
|
||||
def test_ssize_t_ctype
|
||||
assert_equal(DL::TYPE_SSIZE_T, parse_ctype("ssize_t"))
|
||||
assert_equal(TYPE_SSIZE_T, parse_ctype("ssize_t"))
|
||||
end
|
||||
|
||||
def test_ptrdiff_t_ctype
|
||||
assert_equal(DL::TYPE_PTRDIFF_T, parse_ctype("ptrdiff_t"))
|
||||
assert_equal(TYPE_PTRDIFF_T, parse_ctype("ptrdiff_t"))
|
||||
end
|
||||
|
||||
def test_intptr_t_ctype
|
||||
assert_equal(DL::TYPE_INTPTR_T, parse_ctype("intptr_t"))
|
||||
assert_equal(TYPE_INTPTR_T, parse_ctype("intptr_t"))
|
||||
end
|
||||
|
||||
def test_uintptr_t_ctype
|
||||
assert_equal(DL::TYPE_UINTPTR_T, parse_ctype("uintptr_t"))
|
||||
assert_equal(TYPE_UINTPTR_T, parse_ctype("uintptr_t"))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ module DL
|
|||
]
|
||||
|
||||
CallCallback = bind("void call_callback(void*, void*)"){|ptr1, ptr2|
|
||||
f = Function.new(CFunc.new(ptr1.to_i, DL::TYPE_VOID, "<anonymous>"), [TYPE_VOIDP])
|
||||
f = Function.new(CFunc.new(ptr1.to_i, TYPE_VOID, "<anonymous>"), [TYPE_VOIDP])
|
||||
f.call(ptr2)
|
||||
}
|
||||
CarriedFunction = bind("void callback_function(void*)", :carried, 0)
|
||||
|
|
@ -45,7 +45,7 @@ module DL
|
|||
def test_ensure_call_dlload
|
||||
err = assert_raises(RuntimeError) do
|
||||
Class.new do
|
||||
extend DL::Importer
|
||||
extend Importer
|
||||
extern "void *strcpy(char*, char*)"
|
||||
end
|
||||
end
|
||||
|
|
@ -59,7 +59,7 @@ module DL
|
|||
end
|
||||
|
||||
def test_sizeof()
|
||||
assert_equal(DL::SIZEOF_VOIDP, LIBC.sizeof("FILE*"))
|
||||
assert_equal(SIZEOF_VOIDP, LIBC.sizeof("FILE*"))
|
||||
assert_equal(LIBC::MyStruct.size(), LIBC.sizeof(LIBC::MyStruct))
|
||||
end
|
||||
|
||||
|
|
@ -71,7 +71,7 @@ module DL
|
|||
end
|
||||
|
||||
def test_io()
|
||||
if( RUBY_PLATFORM != DL::BUILD_RUBY_PLATFORM )
|
||||
if( RUBY_PLATFORM != BUILD_RUBY_PLATFORM )
|
||||
return
|
||||
end
|
||||
io_in,io_out = IO.pipe()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue