1 files changed, 38 insertions, 41 deletions
diff --git a/tools/testfiles/tstr-1.ddl b/tools/testfiles/tstr-1.ddl
index 532ed5e..198fa51 100644
--- a/tools/testfiles/tstr-1.ddl
+++ b/tools/testfiles/tstr-1.ddl
@@ -4,15 +4,16 @@ Expected output for 'h5dump tstr.h5'
 HDF5 "tstr.h5" {
 GROUP "/" {
    DATASET "comp1" {
-      DATATYPE {
-         H5T_ARRAY [8][10] of H5T_STD_I32BE "int_array";
-         H5T_ARRAY [3][4] of          { STRSIZE 32;
-           STRPAD H5T_STR_SPACEPAD;
-           CSET H5T_CSET_ASCII;
-           CTYPE H5T_C_S1;
-         } "string";
-      } 
-      DATASPACE { SIMPLE ( 3, 6 ) / ( 3, 6 ) } 
+      DATATYPE  H5T_COMPOUND {
+         H5T_ARRAY { [8][10] H5T_STD_I32BE } "int_array";
+         H5T_ARRAY { [3][4] H5T_STRING {
+            STRSIZE 32;
+            STRPAD H5T_STR_SPACEPAD;
+            CSET H5T_CSET_ASCII;
+            CTYPE H5T_C_S1;
+         } } "string";
+      }        
+      DATASPACE  SIMPLE { ( 3, 6 ) / ( 3, 6 ) } 
       DATA {
          {
             [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81, 
@@ -251,14 +252,13 @@ GROUP "/" {
       } 
    } 
    DATASET "string1" {
-      DATATYPE {
-         { STRSIZE 5;
-           STRPAD H5T_STR_NULLTERM;
-           CSET H5T_CSET_ASCII;
-           CTYPE H5T_C_S1;
-         }
-      } 
-      DATASPACE { SIMPLE ( 3, 4 ) / ( 3, 4 ) } 
+      DATATYPE  H5T_STRING {
+            STRSIZE 5;
+            STRPAD H5T_STR_NULLTERM;
+            CSET H5T_CSET_ASCII;
+            CTYPE H5T_C_S1;
+         }        
+      DATASPACE  SIMPLE { ( 3, 4 ) / ( 3, 4 ) } 
       DATA {
          "s1", "s2", "s3", "s4",
          "s5", "s6", "s7", "s8",
@@ -266,14 +266,13 @@ GROUP "/" {
       } 
    } 
    DATASET "string2" {
-      DATATYPE {
-         { STRSIZE 11;
-           STRPAD H5T_STR_SPACEPAD;
-           CSET H5T_CSET_ASCII;
-           CTYPE H5T_C_S1;
-         }
-      } 
-      DATASPACE { SIMPLE ( 20 ) / ( 20 ) } 
+      DATATYPE  H5T_STRING {
+            STRSIZE 11;
+            STRPAD H5T_STR_SPACEPAD;
+            CSET H5T_CSET_ASCII;
+            CTYPE H5T_C_S1;
+         }        
+      DATASPACE  SIMPLE { ( 20 ) / ( 20 ) } 
       DATA {
          "ab cd ef1  ", "ab cd ef2  ", "ab cd ef3  ", "ab cd ef4  ",
          "ab cd ef5  ", "ab cd ef6  ", "ab cd ef7  ", "ab cd ef8  ",
@@ -283,14 +282,13 @@ GROUP "/" {
       } 
    } 
    DATASET "string3" {
-      DATATYPE {
-         { STRSIZE 8;
-           STRPAD H5T_STR_NULLPAD;
-           CSET H5T_CSET_ASCII;
-           CTYPE H5T_C_S1;
-         }
-      } 
-      DATASPACE { SIMPLE ( 27 ) / ( 27 ) } 
+      DATATYPE  H5T_STRING {
+            STRSIZE 8;
+            STRPAD H5T_STR_NULLPAD;
+            CSET H5T_CSET_ASCII;
+            CTYPE H5T_C_S1;
+         }        
+      DATASPACE  SIMPLE { ( 27 ) / ( 27 ) } 
       DATA {
          "abcd0\000\000\000", "abcd1\000\000\000", "abcd2\000\000\000",
          "abcd3\000\000\000", "abcd4\000\000\000", "abcd5\000\000\000",
@@ -304,14 +302,13 @@ GROUP "/" {
       } 
    } 
    DATASET "string4" {
-      DATATYPE {
-         { STRSIZE 168;
-           STRPAD H5T_STR_SPACEPAD;
-           CSET H5T_CSET_ASCII;
-           CTYPE H5T_C_S1;
-         }
-      } 
-      DATASPACE { SIMPLE ( 3 ) / ( 3 ) } 
+      DATATYPE  H5T_STRING {
+            STRSIZE 168;
+            STRPAD H5T_STR_SPACEPAD;
+            CSET H5T_CSET_ASCII;
+            CTYPE H5T_C_S1;
+         }        
+      DATASPACE  SIMPLE { ( 3 ) / ( 3 ) } 
       DATA {
          "s1234567890123456789                                                                                                                                                    ",
          "s1234567890123456789                                                                                                                                                    ",