diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-31 22:07:09 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-31 22:07:09 +0000 |
| commit | fe962cde158562e0d41b61ea48267cf0413f190c (patch) | |
| tree | fa18528c4fde8113be78f74ad8d40a7947a9a754 /ext | |
| parent | 4f69926f75cd90822408c915c2b4ec637c749dd1 (diff) | |
* ext/dl/lib/dl/struct.rb (DL::CStructEntity#set_ctypes): Refactored
#set_ctypes using newer ruby features to simplify its implementation.
* test/dl/test_c_struct_entry.rb (class DL): Test to verify
refactoring.
Reviewed by Aaron Patterson.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35857 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/dl/lib/dl/struct.rb | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/ext/dl/lib/dl/struct.rb b/ext/dl/lib/dl/struct.rb index e6f7ba710b..37cb3b5120 100644 --- a/ext/dl/lib/dl/struct.rb +++ b/ext/dl/lib/dl/struct.rb @@ -127,27 +127,20 @@ module DL @ctypes = types @offset = [] offset = 0 - max_align = 0 - types.each_with_index{|t,i| + + max_align = types.map { |type, count = 1| orig_offset = offset - if( t.is_a?(Array) ) - align = ALIGN_MAP[t[0]] - else - align = ALIGN_MAP[t] - end + align = ALIGN_MAP[type] offset = PackInfo.align(orig_offset, align) - @offset[i] = offset - if( t.is_a?(Array) ) - offset += (SIZE_MAP[t[0]] * t[1]) - else - offset += SIZE_MAP[t] - end - if (max_align < align) - max_align = align - end - } - offset = PackInfo.align(offset, max_align) - @size = offset + + @offset << offset + + offset += (SIZE_MAP[type] * count) + + align + }.max + + @size = PackInfo.align(offset, max_align) end # Fetch struct member +name+ |