[svn-r7401] Purpose:

    Code cleanup

Description:
    Remove various "fixtype" routines which duplicate (and actually pre-date)
    the functionality in H5Tget_native_type in favor of having the tools call
    H5Tget_native_type().  This provides the same functionality (actually better
    functionality, since the old "fixtype" routines didn't handle alignment of
    compound fields correctly) and reduces the amount of code to maintain.

    Add additional tests to dump out a "complex" compound datatype which
    exercises more code in the library for aligning compound fields correctly.

Platforms tested:
    FreeBSD 4.8 (sleipnir)
    h5committest

3 files changed, 239 insertions, 0 deletions

diff --git a/tools/testfiles/tcomp-4.ddl b/tools/testfiles/tcomp-4.ddl
new file mode 100644
index 0000000..3860087
--- /dev/null
+++ b/tools/testfiles/tcomp-4.ddl
@@ -0,0 +1,109 @@
+#############################
+Expected output for 'h5dump tcompound_complex.h5'
+#############################
+HDF5 "tcompound_complex.h5" {
+GROUP "/" {
+   DATASET "CompoundComplex" {
+      DATATYPE  H5T_COMPOUND {
+         H5T_STD_I32BE "a_name";
+         H5T_ARRAY { [4] H5T_STRING {
+            STRSIZE H5T_VARIABLE;
+            STRPAD H5T_STR_NULLTERM;
+            CSET H5T_CSET_ASCII;
+            CTYPE H5T_C_S1;
+         } } "b_name";
+         H5T_STRING {
+            STRSIZE 6;
+            STRPAD H5T_STR_NULLTERM;
+            CSET H5T_CSET_ASCII;
+            CTYPE H5T_C_S1;
+         } "c_name";
+         H5T_ARRAY { [5][6] H5T_STD_I16BE } "d_name";
+         H5T_IEEE_F32BE "e_name";
+         H5T_ARRAY { [10] H5T_IEEE_F64BE } "f_name";
+         H5T_STD_I8LE "g_name";
+      }        
+      DATASPACE  SIMPLE { ( 6 ) / ( 6 ) } 
+      DATA {
+         {
+            0,
+            [ "A fight is a contract that takes two people to honor.", "A combative stance means that you've accepted the contract.", "In which case, you deserve what you get.", "  --  Professor Cheng Man-ch'ing" ],
+            "Hello!",
+            [ 0, 1, 2, 3, 4, 5, 
+               1, 2, 3, 4, 5, 6, 
+               2, 3, 4, 5, 6, 7, 
+               3, 4, 5, 6, 7, 8, 
+               4, 5, 6, 7, 8, 9 ],
+            0,
+            [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ],
+            109
+         },
+         {
+            1,
+            [ "A fight is a contract that takes two people to honor.", "A combative stance means that you've accepted the contract.", "In which case, you deserve what you get.", "  --  Professor Cheng Man-ch'ing" ],
+            "Hello!",
+            [ 1, 2, 3, 4, 5, 6, 
+               2, 3, 4, 5, 6, 7, 
+               3, 4, 5, 6, 7, 8, 
+               4, 5, 6, 7, 8, 9, 
+               5, 6, 7, 8, 9, 10 ],
+            0.96,
+            [ 1024.96, 1024.96, 1024.96, 1024.96, 1024.96, 1024.96, 1024.96, 1024.96, 1024.96, 1024.96 ],
+            109
+         },
+         {
+            2,
+            [ "A fight is a contract that takes two people to honor.", "A combative stance means that you've accepted the contract.", "In which case, you deserve what you get.", "  --  Professor Cheng Man-ch'ing" ],
+            "Hello!",
+            [ 2, 3, 4, 5, 6, 7, 
+               3, 4, 5, 6, 7, 8, 
+               4, 5, 6, 7, 8, 9, 
+               5, 6, 7, 8, 9, 10, 
+               6, 7, 8, 9, 10, 11 ],
+            1.92,
+            [ 2049.93, 2049.93, 2049.93, 2049.93, 2049.93, 2049.93, 2049.93, 2049.93, 2049.93, 2049.93 ],
+            109
+         },
+         {
+            3,
+            [ "A fight is a contract that takes two people to honor.", "A combative stance means that you've accepted the contract.", "In which case, you deserve what you get.", "  --  Professor Cheng Man-ch'ing" ],
+            "Hello!",
+            [ 3, 4, 5, 6, 7, 8, 
+               4, 5, 6, 7, 8, 9, 
+               5, 6, 7, 8, 9, 10, 
+               6, 7, 8, 9, 10, 11, 
+               7, 8, 9, 10, 11, 12 ],
+            2.88,
+            [ 3074.89, 3074.89, 3074.89, 3074.89, 3074.89, 3074.89, 3074.89, 3074.89, 3074.89, 3074.89 ],
+            109
+         },
+         {
+            4,
+            [ "A fight is a contract that takes two people to honor.", "A combative stance means that you've accepted the contract.", "In which case, you deserve what you get.", "  --  Professor Cheng Man-ch'ing" ],
+            "Hello!",
+            [ 4, 5, 6, 7, 8, 9, 
+               5, 6, 7, 8, 9, 10, 
+               6, 7, 8, 9, 10, 11, 
+               7, 8, 9, 10, 11, 12, 
+               8, 9, 10, 11, 12, 13 ],
+            3.84,
+            [ 4099.85, 4099.85, 4099.85, 4099.85, 4099.85, 4099.85, 4099.85, 4099.85, 4099.85, 4099.85 ],
+            109
+         },
+         {
+            5,
+            [ "A fight is a contract that takes two people to honor.", "A combative stance means that you've accepted the contract.", "In which case, you deserve what you get.", "  --  Professor Cheng Man-ch'ing" ],
+            "Hello!",
+            [ 5, 6, 7, 8, 9, 10, 
+               6, 7, 8, 9, 10, 11, 
+               7, 8, 9, 10, 11, 12, 
+               8, 9, 10, 11, 12, 13, 
+               9, 10, 11, 12, 13, 14 ],
+            4.8,
+            [ 5124.82, 5124.82, 5124.82, 5124.82, 5124.82, 5124.82, 5124.82, 5124.82, 5124.82, 5124.82 ],
+            109
+         }
+      } 
+   } 
+} 
+} 
diff --git a/tools/testfiles/tcompound_complex.h5 b/tools/testfiles/tcompound_complex.h5
new file mode 100644
index 0000000..5eed316
--- /dev/null
+++ b/tools/testfiles/tcompound_complex.h5
diff --git a/tools/testfiles/tcompound_complex.h5.xml b/tools/testfiles/tcompound_complex.h5.xml
new file mode 100644
index 0000000..9dd41c3
--- /dev/null
+++ b/tools/testfiles/tcompound_complex.h5.xml
@@ -0,0 +1,130 @@
+#############################
+Expected output for 'h5dump --xml tcompound_complex.h5'
+#############################
+<?xml version="1.0" encoding="UTF-8"?>
+<hdf5:HDF5-File xmlns:hdf5="http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdf.ncsa.uiuc.edu/DTDs/HDF5File http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.xsd">
+<hdf5:RootGroup OBJ-XID="xid_928" H5Path="/">
+   <hdf5:Dataset Name="CompoundComplex" OBJ-XID="xid_976" H5Path= "/CompoundComplex" Parents="xid_928" H5ParentPaths="/">
+      <hdf5:StorageLayout>
+         <hdf5:ContiguousLayout/>
+      </hdf5:StorageLayout>
+         <hdf5:FillValueInfo FillTime="FillOnAlloc" AllocationTime="Late">
+         <hdf5:FillValue>
+               <hdf5:Data>
+                  <!-- Compound fill not yet implemented. -->
+                  <hdf5:NoData />
+               </hdf5:Data>
+         </hdf5:FillValue>
+      </hdf5:FillValueInfo>
+      <hdf5:Dataspace>
+         <hdf5:SimpleDataspace Ndims="1">
+            <hdf5:Dimension  DimSize="6" MaxDimSize="6"/>
+         </hdf5:SimpleDataspace>
+      </hdf5:Dataspace>
+      <hdf5:DataType>
+         <hdf5:CompoundType>
+            <hdf5:Field FieldName="a_name">
+               <hdf5:DataType>
+                  <hdf5:AtomicType>
+                     <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                  </hdf5:AtomicType>
+               </hdf5:DataType>
+            </hdf5:Field>
+            <hdf5:Field FieldName="b_name">
+               <hdf5:DataType>
+                  <hdf5:ArrayType Ndims="1">
+                     <hdf5:ArrayDimension DimSize="4" DimPerm="0"/>
+                     <hdf5:DataType>
+                        <hdf5:AtomicType>
+                           <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="H5T_VARIABLE" StrPad="H5T_STR_NULLTERM"/>
+                        </hdf5:AtomicType>
+                     </hdf5:DataType>
+                  </hdf5:ArrayType>
+               </hdf5:DataType>
+            </hdf5:Field>
+            <hdf5:Field FieldName="c_name">
+               <hdf5:DataType>
+                  <hdf5:AtomicType>
+                     <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="6" StrPad="H5T_STR_NULLTERM"/>
+                  </hdf5:AtomicType>
+               </hdf5:DataType>
+            </hdf5:Field>
+            <hdf5:Field FieldName="d_name">
+               <hdf5:DataType>
+                  <hdf5:ArrayType Ndims="2">
+                     <hdf5:ArrayDimension DimSize="5" DimPerm="0"/>
+                     <hdf5:ArrayDimension DimSize="6" DimPerm="1"/>
+                     <hdf5:DataType>
+                        <hdf5:AtomicType>
+                           <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="2" />
+                        </hdf5:AtomicType>
+                     </hdf5:DataType>
+                  </hdf5:ArrayType>
+               </hdf5:DataType>
+            </hdf5:Field>
+            <hdf5:Field FieldName="e_name">
+               <hdf5:DataType>
+                  <hdf5:AtomicType>
+                     <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                  </hdf5:AtomicType>
+               </hdf5:DataType>
+            </hdf5:Field>
+            <hdf5:Field FieldName="f_name">
+               <hdf5:DataType>
+                  <hdf5:ArrayType Ndims="1">
+                     <hdf5:ArrayDimension DimSize="10" DimPerm="0"/>
+                     <hdf5:DataType>
+                        <hdf5:AtomicType>
+                           <hdf5:FloatType ByteOrder="BE" Size="8" SignBitLocation="63" ExponentBits="11" ExponentLocation="52" MantissaBits="52" MantissaLocation="0" />
+                        </hdf5:AtomicType>
+                     </hdf5:DataType>
+                  </hdf5:ArrayType>
+               </hdf5:DataType>
+            </hdf5:Field>
+            <hdf5:Field FieldName="g_name">
+               <hdf5:DataType>
+                  <hdf5:AtomicType>
+                     <hdf5:IntegerType ByteOrder="LE" Sign="true" Size="1" />
+                  </hdf5:AtomicType>
+               </hdf5:DataType>
+            </hdf5:Field>
+         </hdf5:CompoundType>
+      </hdf5:DataType>
+   <!-- Note: format of compound data not specified -->
+      <hdf5:Data>
+         <hdf5:DataFromFile>
+         0  "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." "  --  Professor Cheng Man-ch'ing"  "Hello!"  0 1 2 3 4 5 
+               1 2 3 4 5 6 
+               2 3 4 5 6 7 
+               3 4 5 6 7 8 
+               4 5 6 7 8 9  0  0 0 0 0 0 0 0 0 0 0  109 
+         1  "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." "  --  Professor Cheng Man-ch'ing"  "Hello!"  1 2 3 4 5 6 
+               2 3 4 5 6 7 
+               3 4 5 6 7 8 
+               4 5 6 7 8 9 
+               5 6 7 8 9 10  0.96  1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 1024.96  109 
+         2  "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." "  --  Professor Cheng Man-ch'ing"  "Hello!"  2 3 4 5 6 7 
+               3 4 5 6 7 8 
+               4 5 6 7 8 9 
+               5 6 7 8 9 10 
+               6 7 8 9 10 11  1.92  2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 2049.93  109 
+         3  "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." "  --  Professor Cheng Man-ch'ing"  "Hello!"  3 4 5 6 7 8 
+               4 5 6 7 8 9 
+               5 6 7 8 9 10 
+               6 7 8 9 10 11 
+               7 8 9 10 11 12  2.88  3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 3074.89  109 
+         4  "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." "  --  Professor Cheng Man-ch'ing"  "Hello!"  4 5 6 7 8 9 
+               5 6 7 8 9 10 
+               6 7 8 9 10 11 
+               7 8 9 10 11 12 
+               8 9 10 11 12 13  3.84  4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 4099.85  109 
+         5  "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." "  --  Professor Cheng Man-ch'ing"  "Hello!"  5 6 7 8 9 10 
+               6 7 8 9 10 11 
+               7 8 9 10 11 12 
+               8 9 10 11 12 13 
+               9 10 11 12 13 14  4.8  5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 5124.82  109
+         </hdf5:DataFromFile>
+      </hdf5:Data>
+   </hdf5:Dataset>
+</hdf5:RootGroup>
+</hdf5:HDF5-File>