* ext/fiddle/fiddle.c: adding alignment constants for compatibility

  with DL.
* ext/fiddle/fiddle.h: ditto
* ext/fiddle/lib/fiddle/cparser.rb: importing the C parser for DL
  backwards compatibility.
* ext/fiddle/lib/fiddle/import.rb: importing the import DSL for DL
  backwards compatibility.
* ext/fiddle/lib/fiddle/pack.rb: importing structure pack for DL
  backwards compatibility.
* ext/fiddle/lib/fiddle/value.rb: ditto
* ext/fiddle/lib/fiddle/struct.rb: importing struct DSL for DL backwards
  compatibility.
* test/dl/test_c_struct_entry.rb: importing tests
* test/dl/test_c_union_entity.rb: ditto
* test/dl/test_cparser.rb: ditto
* test/dl/test_import.rb: ditto
* test/fiddle/test_c_struct_entry.rb: ditto
* test/fiddle/test_c_union_entity.rb: ditto
* test/fiddle/test_cparser.rb: ditto
* test/fiddle/test_import.rb: ditto

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

1 files changed, 33 insertions, 32 deletions

diff --git a/test/dl/test_c_struct_entry.rb b/test/dl/test_c_struct_entry.rb
index 414f17ba53..a7a0e34644 100644
--- a/test/dl/test_c_struct_entry.rb
+++ b/test/dl/test_c_struct_entry.rb
@@ -2,52 +2,53 @@ require_relative 'test_base'
 
 require 'dl/struct'
 
-class DL::TestCStructEntity < DL::TestBase
-  def test_class_size
-    types = [DL::TYPE_DOUBLE, DL::TYPE_CHAR]
+module DL
+  class TestCStructEntity < TestBase
+    def test_class_size
+      types = [TYPE_DOUBLE, TYPE_CHAR]
 
-    size = DL::CStructEntity.size types
+      size = CStructEntity.size types
 
-    alignments = types.map { |type| DL::PackInfo::ALIGN_MAP[type] }
+      alignments = types.map { |type| PackInfo::ALIGN_MAP[type] }
 
-    expected = DL::PackInfo.align 0, alignments[0]
-    expected += DL::PackInfo::SIZE_MAP[DL::TYPE_DOUBLE]
+      expected = PackInfo.align 0, alignments[0]
+      expected += PackInfo::SIZE_MAP[TYPE_DOUBLE]
 
-    expected = DL::PackInfo.align expected, alignments[1]
-    expected += DL::PackInfo::SIZE_MAP[DL::TYPE_CHAR]
+      expected = PackInfo.align expected, alignments[1]
+      expected += PackInfo::SIZE_MAP[TYPE_CHAR]
 
-    expected = DL::PackInfo.align expected, alignments.max
+      expected = PackInfo.align expected, alignments.max
 
-    assert_equal expected, size
-  end
+      assert_equal expected, size
+    end
 
-  def test_class_size_with_count
-    size = DL::CStructEntity.size([[DL::TYPE_DOUBLE, 2], [DL::TYPE_CHAR, 20]])
+    def test_class_size_with_count
+      size = CStructEntity.size([[TYPE_DOUBLE, 2], [TYPE_CHAR, 20]])
 
-    types = [DL::TYPE_DOUBLE, DL::TYPE_CHAR]
-    alignments = types.map { |type| DL::PackInfo::ALIGN_MAP[type] }
+      types = [TYPE_DOUBLE, TYPE_CHAR]
+      alignments = types.map { |type| PackInfo::ALIGN_MAP[type] }
 
-    expected = DL::PackInfo.align 0, alignments[0]
-    expected += DL::PackInfo::SIZE_MAP[DL::TYPE_DOUBLE] * 2
+      expected = PackInfo.align 0, alignments[0]
+      expected += PackInfo::SIZE_MAP[TYPE_DOUBLE] * 2
 
-    expected = DL::PackInfo.align expected, alignments[1]
-    expected += DL::PackInfo::SIZE_MAP[DL::TYPE_CHAR] * 20
+      expected = PackInfo.align expected, alignments[1]
+      expected += PackInfo::SIZE_MAP[TYPE_CHAR] * 20
 
-    expected = DL::PackInfo.align expected, alignments.max
+      expected = PackInfo.align expected, alignments.max
 
-    assert_equal expected, size
-  end
+      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]
+    def test_set_ctypes
+      union = CStructEntity.malloc [TYPE_INT, 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
+      # 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']
+      assert_equal 1, union['long']
+      assert_equal 2, union['int']
+    end
   end
 end
-