diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ext/dl/lib/dl/struct.rb | 15 | ||||
-rw-r--r-- | test/dl/test_c_union_entity.rb | 12 |
3 files changed, 20 insertions, 13 deletions
@@ -1,3 +1,9 @@ +Thu May 31 08:40:34 2012 Eric Hodel <drbrain@segment7.net> + + * ext/dl/lib/dl/struct.rb (DL::CUnionEntity#set_ctypes): Refactored + #set_types to reuse DL::CUnionEntity::size + * test/dl/test_c_union_entity.rb: Added test + Thu May 31 08:20:14 2012 Eric Hodel <drbrain@segment7.net> * ext/dl/lib/dl/struct.rb (DL::CUnionEntity::size): Fixed ::size to diff --git a/ext/dl/lib/dl/struct.rb b/ext/dl/lib/dl/struct.rb index 23f28bbaa3..628adb21c2 100644 --- a/ext/dl/lib/dl/struct.rb +++ b/ext/dl/lib/dl/struct.rb @@ -242,19 +242,8 @@ module DL # Given +types+, calculate the necessary offset and for each union member def set_ctypes(types) @ctypes = types - @offset = [] - @size = 0 - types.each_with_index{|t,i| - @offset[i] = 0 - if( t.is_a?(Array) ) - size = SIZE_MAP[t[0]] * t[1] - else - size = SIZE_MAP[t] - end - if( size > @size ) - @size = size - end - } + @offset = Array.new(types.length, 0) + @size = self.class.size types end end end diff --git a/test/dl/test_c_union_entity.rb b/test/dl/test_c_union_entity.rb index 8c72a664eb..128ca4cd5c 100644 --- a/test/dl/test_c_union_entity.rb +++ b/test/dl/test_c_union_entity.rb @@ -14,5 +14,17 @@ class DL::TestCUnionEntity < DL::TestBase assert_equal DL::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] + + # 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'] + end end |