summaryrefslogtreecommitdiff
path: root/ext/dl/lib
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-30 23:20:29 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-30 23:20:29 +0000
commitf1cb6ea08f8fc897d914fc7c2c23701471657e4f (patch)
tree6e29502811c45344ef835ace340dd23e5d99a82c /ext/dl/lib
parente88c8880b13462be0e3f109bb61daa306d9ed1f9 (diff)
* ext/dl/lib/dl/struct.rb (DL::CUnionEntity::size): Fixed ::size to
return the size of the union. * test/dl/test_c_union_entity.rb: Test for DL::CUnionEntity::size Reviewed by Aaron Patterson git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35848 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/dl/lib')
-rw-r--r--ext/dl/lib/dl/struct.rb14
1 files changed, 3 insertions, 11 deletions
diff --git a/ext/dl/lib/dl/struct.rb b/ext/dl/lib/dl/struct.rb
index 27f6b42fd2..23f28bbaa3 100644
--- a/ext/dl/lib/dl/struct.rb
+++ b/ext/dl/lib/dl/struct.rb
@@ -234,17 +234,9 @@ module DL
# DL::TYPE_VOIDP])
# => 8
def CUnionEntity.size(types)
- size = 0
- types.each_with_index{|t,i|
- if( t.is_a?(Array) )
- tsize = PackInfo::SIZE_MAP[t[0]] * t[1]
- else
- tsize = PackInfo::SIZE_MAP[t]
- end
- if( tsize > size )
- size = tsize
- end
- }
+ types.map { |type, count = 1|
+ PackInfo::SIZE_MAP[type] * count
+ }.max
end
# Given +types+, calculate the necessary offset and for each union member