* 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

Reviewed by Aaron Paterson


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35849 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 13 deletions

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