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#set_ctypes): Refactored

Browse source 
#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
This commit is contained in:
drbrain 2012-05-31 22:07:09 +00:00
parent 4f69926f75
commit fe962cde15
3 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Fri Jun 1 06:57:10 2012 Eric Hodel <drbrain@segment7.net>
* 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.
Fri Jun 1 06:40:25 2012 Eric Hodel <drbrain@segment7.net>
* object.c (Init_Object): Restored Kernel documentation based on

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

@ -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+

12
test/dl/test_c_struct_entry.rb
View file

@ -37,5 +37,17 @@ class DL::TestCStructEntity < DL::TestBase
assert_equal expected, size
end
def test_set_ctypes
union = DL::CStructEntity.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
union['int'] = 2
assert_equal 1, union['long']
assert_equal 2, union['int']
end
end