[svn-r8758] Purpose:

h5dump new feature, bug fix

Description:
added the dump of unmamed types to the file contents
fixed a bug in the type array, it was printing invalid characters with the array indices option on

Solution:

Platforms tested:
linux
AIX
solaris

Misc. update:

1 files changed, 200 insertions, 200 deletions

diff --git a/tools/testfiles/tstr-1.ddl b/tools/testfiles/tstr-1.ddl
index e564a89..eb47202 100644
--- a/tools/testfiles/tstr-1.ddl
+++ b/tools/testfiles/tstr-1.ddl
@@ -15,239 +15,239 @@ GROUP "/" {
       }
       DATASPACE  SIMPLE { ( 3, 6 ) / ( 3, 6 ) }
       DATA {
-        (0,0), {
+        (0,0): {
             [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81,
-        %s       1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
-        %s       4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-        %s       9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ],
+                1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
+                4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
+                9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
-        (0,1), {
+        (0,1): {
             [ 1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
-        %s       4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-        %s       9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ],
+                4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
+                9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
-        (0,2), {
+        (0,2): {
             [ 4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-        %s       9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ],
+                9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
-        (0,3), {
+        (0,3): {
             [ 9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-        %s       100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ],
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
+                100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
-        (0,4), {
+        (0,4): {
             [ 16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-        %s       100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
-        %s       121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ],
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
+                100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
+                121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
-        (0,5), {
+        (0,5): {
             [ 25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-        %s       100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
-        %s       121, 144, 169, 196, 225, 256, 289, 324, 361, 400,
-        %s       144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ],
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
+                100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
+                121, 144, 169, 196, 225, 256, 289, 324, 361, 400,
+                144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
-        (1,0), {
+        (1,0): {
             [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81,
-        %s       1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
-        %s       4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-        %s       9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ],
+                1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
+                4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
+                9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
-        (1,1), {
+        (1,1): {
             [ 1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
-        %s       4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-        %s       9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ],
+                4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
+                9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
-        (1,2), {
+        (1,2): {
             [ 4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-        %s       9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ],
+                9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
-        (1,3), {
+        (1,3): {
             [ 9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-        %s       100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ],
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
+                100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
-        (1,4), {
+        (1,4): {
             [ 16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-        %s       100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
-        %s       121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ],
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
+                100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
+                121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
-        (1,5), {
+        (1,5): {
             [ 25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-        %s       100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
-        %s       121, 144, 169, 196, 225, 256, 289, 324, 361, 400,
-        %s       144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ],
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
+                100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
+                121, 144, 169, 196, 225, 256, 289, 324, 361, 400,
+                144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
-        (2,0), {
+        (2,0): {
             [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81,
-        %s       1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
-        %s       4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-        %s       9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ],
+                1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
+                4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
+                9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
-        (2,1), {
+        (2,1): {
             [ 1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
-        %s       4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-        %s       9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ],
+                4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
+                9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
-        (2,2), {
+        (2,2): {
             [ 4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
-        %s       9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ],
+                9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
-        (2,3), {
+        (2,3): {
             [ 9, 16, 25, 36, 49, 64, 81, 100, 121, 144,
-        %s       16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-        %s       100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ],
+                16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
+                100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
-        (2,4), {
+        (2,4): {
             [ 16, 25, 36, 49, 64, 81, 100, 121, 144, 169,
-        %s       25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-        %s       100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
-        %s       121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ],
+                25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
+                100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
+                121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          },
-        (2,5), {
+        (2,5): {
             [ 25, 36, 49, 64, 81, 100, 121, 144, 169, 196,
-        %s       36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
-        %s       49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
-        %s       64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
-        %s       81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
-        %s       100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
-        %s       121, 144, 169, 196, 225, 256, 289, 324, 361, 400,
-        %s       144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ],
+                36, 49, 64, 81, 100, 121, 144, 169, 196, 225,
+                49, 64, 81, 100, 121, 144, 169, 196, 225, 256,
+                64, 81, 100, 121, 144, 169, 196, 225, 256, 289,
+                81, 100, 121, 144, 169, 196, 225, 256, 289, 324,
+                100, 121, 144, 169, 196, 225, 256, 289, 324, 361,
+                121, 144, 169, 196, 225, 256, 289, 324, 361, 400,
+                144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ],
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
-        %s       "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678",
+                "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ]
          }
       }
    }
@@ -260,9 +260,9 @@ GROUP "/" {
          }
       DATASPACE  SIMPLE { ( 3, 4 ) / ( 3, 4 ) }
       DATA {
-        (0,0), "s1", "s2", "s3", "s4",
-        (1,0), "s5", "s6", "s7", "s8",
-        (2,0), "s9", "s0", "s1", "s2"
+        (0,0): "s1", "s2", "s3", "s4",
+        (1,0): "s5", "s6", "s7", "s8",
+        (2,0): "s9", "s0", "s1", "s2"
       }
    }
    DATASET "string2" {
@@ -274,11 +274,11 @@ GROUP "/" {
          }
       DATASPACE  SIMPLE { ( 20 ) / ( 20 ) }
       DATA {
-        (0), "ab cd ef1  ", "ab cd ef2  ", "ab cd ef3  ", "ab cd ef4  ",
-        (4), "ab cd ef5  ", "ab cd ef6  ", "ab cd ef7  ", "ab cd ef8  ",
-        (8), "ab cd ef9  ", "ab cd ef0  ", "ab cd ef1  ", "ab cd ef2  ",
-        (12), "ab cd ef3  ", "ab cd ef4  ", "ab cd ef5  ", "ab cd ef6  ",
-        (16), "ab cd ef7  ", "ab cd ef8  ", "ab cd ef9  ", "ab cd ef0  "
+        (0): "ab cd ef1  ", "ab cd ef2  ", "ab cd ef3  ", "ab cd ef4  ",
+        (4): "ab cd ef5  ", "ab cd ef6  ", "ab cd ef7  ", "ab cd ef8  ",
+        (8): "ab cd ef9  ", "ab cd ef0  ", "ab cd ef1  ", "ab cd ef2  ",
+        (12): "ab cd ef3  ", "ab cd ef4  ", "ab cd ef5  ", "ab cd ef6  ",
+        (16): "ab cd ef7  ", "ab cd ef8  ", "ab cd ef9  ", "ab cd ef0  "
       }
    }
    DATASET "string3" {
@@ -290,15 +290,15 @@ GROUP "/" {
          }
       DATASPACE  SIMPLE { ( 27 ) / ( 27 ) }
       DATA {
-        (0), "abcd0\000\000\000", "abcd1\000\000\000", "abcd2\000\000\000",
-        (3), "abcd3\000\000\000", "abcd4\000\000\000", "abcd5\000\000\000",
-        (6), "abcd6\000\000\000", "abcd7\000\000\000", "abcd8\000\000\000",
-        (9), "abcd9\000\000\000", "abcd0\000\000\000", "abcd1\000\000\000",
-        (12), "abcd2\000\000\000", "abcd3\000\000\000", "abcd4\000\000\000",
-        (15), "abcd5\000\000\000", "abcd6\000\000\000", "abcd7\000\000\000",
-        (18), "abcd8\000\000\000", "abcd9\000\000\000", "abcd0\000\000\000",
-        (21), "abcd1\000\000\000", "abcd2\000\000\000", "abcd3\000\000\000",
-        (24), "abcd4\000\000\000", "abcd5\000\000\000", "abcd6\000\000\000"
+        (0): "abcd0\000\000\000", "abcd1\000\000\000", "abcd2\000\000\000",
+        (3): "abcd3\000\000\000", "abcd4\000\000\000", "abcd5\000\000\000",
+        (6): "abcd6\000\000\000", "abcd7\000\000\000", "abcd8\000\000\000",
+        (9): "abcd9\000\000\000", "abcd0\000\000\000", "abcd1\000\000\000",
+        (12): "abcd2\000\000\000", "abcd3\000\000\000", "abcd4\000\000\000",
+        (15): "abcd5\000\000\000", "abcd6\000\000\000", "abcd7\000\000\000",
+        (18): "abcd8\000\000\000", "abcd9\000\000\000", "abcd0\000\000\000",
+        (21): "abcd1\000\000\000", "abcd2\000\000\000", "abcd3\000\000\000",
+        (24): "abcd4\000\000\000", "abcd5\000\000\000", "abcd6\000\000\000"
       }
    }
    DATASET "string4" {
@@ -310,9 +310,9 @@ GROUP "/" {
          }
       DATASPACE  SIMPLE { ( 3 ) / ( 3 ) }
       DATA {
-        (0), "s1234567890123456789                                                                                                                                                    ",
-        (1), "s1234567890123456789                                                                                                                                                    ",
-        (2), "s1234567890123456789                                                                                                                                                    "
+        (0): "s1234567890123456789                                                                                                                                                    ",
+        (1): "s1234567890123456789                                                                                                                                                    ",
+        (2): "s1234567890123456789                                                                                                                                                    "
       }
    }
 }