kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/dl/lib/dl/struct.rb (DL::CStructEntity::size): Refactored ::size

Browse source 
to remove unused variables and simplify using newer ruby features.
* test/dl/test_c_struct_entry.rb:  Test to validate refactoring

Reviewed by Aaron Patterson


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2012-05-31 00:27:34 +00:00
parent 0381ab0769
commit 40cf3e0cca
3 changed files with 64 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Thu May 31 09:27:06 2012 Eric Hodel <drbrain@segment7.net>
* ext/dl/lib/dl/struct.rb (DL::CStructEntity::size): Refactored ::size
to remove unused variables and simplify using newer ruby features.
* test/dl/test_c_struct_entry.rb: Test to validate refactoring
Thu May 31 08:40:34 2012 Eric Hodel <drbrain@segment7.net>
* ext/dl/lib/dl/struct.rb (DL::CUnionEntity#set_ctypes): Refactored

32
ext/dl/lib/dl/struct.rb
View file

@ -93,26 +93,18 @@ module DL
# => 24
def CStructEntity.size(types)
offset = 0
max_align = 0
types.each_with_index{|t,i|
orig_offset = offset
if( t.is_a?(Array) )
align = PackInfo::ALIGN_MAP[t[0]]
offset = PackInfo.align(orig_offset, align)
size = offset - orig_offset
offset += (PackInfo::SIZE_MAP[t[0]] * t[1])
else
align = PackInfo::ALIGN_MAP[t]
offset = PackInfo.align(orig_offset, align)
size = offset - orig_offset
offset += PackInfo::SIZE_MAP[t]
end
if (max_align < align)
max_align = align
end
}
offset = PackInfo.align(offset, max_align)
offset
max_align = types.map { |type, count = 1|
last_offset = offset
align = PackInfo::ALIGN_MAP[type]
offset = PackInfo.align(last_offset, align) +
(PackInfo::SIZE_MAP[type] * count)
align
}.max
PackInfo.align(offset, max_align)
end
# Wraps the C pointer +addr+ as a C struct with the given +types+. The C

46
test/dl/test_c_struct_entry.rb Normal file
View file

@ -0,0 +1,46 @@
require_relative 'test_base'
require 'dl/cparser'
class DL::TestCStructEntity < DL::TestBase
def test_class_size
types = [DL::TYPE_DOUBLE, DL::TYPE_CHAR]
size = DL::CStructEntity.size types
alignments = types.map { |type| DL::PackInfo::ALIGN_MAP[type] }
expected = DL::PackInfo.align 0, alignments[0]
expected += DL::PackInfo::SIZE_MAP[DL::TYPE_DOUBLE]
expected = DL::PackInfo.align expected, alignments[1]
expected += DL::PackInfo::SIZE_MAP[DL::TYPE_CHAR]
expected = DL::PackInfo.align expected, alignments.max
assert_equal expected, size
end
def test_class_size_with_count
size = DL::CStructEntity.size([[DL::TYPE_DOUBLE, 2], [DL::TYPE_CHAR, 20]])
assert_equal DL::TYPE_DOUBLE * 2 + DL::SIZEOF_CHAR * 20, size
end
def test_class_size_with_count
size = DL::CStructEntity.size([[DL::TYPE_DOUBLE, 2], [DL::TYPE_CHAR, 20]])
types = [DL::TYPE_DOUBLE, DL::TYPE_CHAR]
alignments = types.map { |type| DL::PackInfo::ALIGN_MAP[type] }
expected = DL::PackInfo.align 0, alignments[0]
expected += DL::PackInfo::SIZE_MAP[DL::TYPE_DOUBLE] * 2
expected = DL::PackInfo.align expected, alignments[1]
expected += DL::PackInfo::SIZE_MAP[DL::TYPE_CHAR] * 20
expected = DL::PackInfo.align expected, alignments.max
assert_equal expected, size
end
end