[svn-r1508] Updated DDL files for new dumper output.

3 files changed, 81 insertions, 81 deletions

diff --git a/tools/testfiles/tcomp-1.ddl b/tools/testfiles/tcomp-1.ddl
index 28fdfd1..6920f29 100644
--- a/tools/testfiles/tcomp-1.ddl
+++ b/tools/testfiles/tcomp-1.ddl
@@ -259,7 +259,7 @@ GROUP "/" {
    GROUP "group2" {
       DATASET "dset5" {
          DATATYPE {
-            "#5992:0"
+            "/#5992:0"
          }
          DATASPACE { SIMPLE ( 5 ) / ( 5 ) }
          DATA {
diff --git a/tools/testfiles/tcomp-3.ddl b/tools/testfiles/tcomp-3.ddl
index ae5e338..2303e2e 100644
--- a/tools/testfiles/tcomp-3.ddl
+++ b/tools/testfiles/tcomp-3.ddl
@@ -9,7 +9,7 @@ DATATYPE "/#5992:0" {
 GROUP "/group2" {
    DATASET "dset5" {
       DATATYPE {
-         "#5992:0"
+         "/#5992:0"
       }
       DATASPACE { SIMPLE ( 5 ) / ( 5 ) }
       DATA {
diff --git a/tools/testfiles/tstr-1.ddl b/tools/testfiles/tstr-1.ddl
index 53fe0fa..a7bd399 100644
--- a/tools/testfiles/tstr-1.ddl
+++ b/tools/testfiles/tstr-1.ddl
@@ -5,16 +5,25 @@ HDF5 "tstr.h5" {
 GROUP "/" {
    DATASET "comp1" {
       DATATYPE {
-         H5T_STD_I32BE "int_array"[8][10];
          { STRSIZE 32;
            STRPAD H5T_STR_SPACEPAD;
            CSET H5T_CSET_ASCII;
            CTYPE H5T_C_S1;
          } "string"[3][4];
+         H5T_STD_I32BE "int_array"[8][10];
       }
       DATASPACE { SIMPLE ( 3, 6 ) / ( 3, 6 ) }
       DATA {
          {
+            [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
+              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
+              "78abcdefgh12345678",
+              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
+              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
+              "78abcdefgh12345678",
+              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
+              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
+              "78abcdefgh12345678" ],
             [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81,
               1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
               4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
@@ -22,7 +31,9 @@ GROUP "/" {
               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 ],
+              49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ]
+         },
+         {
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
               "78abcdefgh12345678",
@@ -31,9 +42,7 @@ GROUP "/" {
               "78abcdefgh12345678",
               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
-         },
-         {
+              "78abcdefgh12345678" ],
             [ 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,
@@ -41,7 +50,9 @@ GROUP "/" {
               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 ],
+              64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ]
+         },
+         {
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
               "78abcdefgh12345678",
@@ -50,9 +61,7 @@ GROUP "/" {
               "78abcdefgh12345678",
               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
-         },
-         {
+              "78abcdefgh12345678" ],
             [ 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,
@@ -60,7 +69,9 @@ GROUP "/" {
               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 ],
+              81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ]
+         },
+         {
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
               "78abcdefgh12345678",
@@ -69,9 +80,7 @@ GROUP "/" {
               "78abcdefgh12345678",
               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
-         },
-         {
+              "78abcdefgh12345678" ],
             [ 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,
@@ -79,7 +88,9 @@ GROUP "/" {
               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 ],
+              100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ]
+         },
+         {
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
               "78abcdefgh12345678",
@@ -88,9 +99,7 @@ GROUP "/" {
               "78abcdefgh12345678",
               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
-         },
-         {
+              "78abcdefgh12345678" ],
             [ 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,
@@ -98,7 +107,9 @@ GROUP "/" {
               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 ],
+              121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ]
+         },
+         {
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
               "78abcdefgh12345678",
@@ -107,9 +118,7 @@ GROUP "/" {
               "78abcdefgh12345678",
               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
-         },
-         {
+              "78abcdefgh12345678" ],
             [ 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,
@@ -117,7 +126,9 @@ GROUP "/" {
               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 ],
+              144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ]
+         },
+         {
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
               "78abcdefgh12345678",
@@ -126,9 +137,7 @@ GROUP "/" {
               "78abcdefgh12345678",
               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
-         },
-         {
+              "78abcdefgh12345678" ],
             [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81,
               1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
               4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
@@ -136,7 +145,9 @@ GROUP "/" {
               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 ],
+              49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ]
+         },
+         {
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
               "78abcdefgh12345678",
@@ -145,9 +156,7 @@ GROUP "/" {
               "78abcdefgh12345678",
               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
-         },
-         {
+              "78abcdefgh12345678" ],
             [ 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,
@@ -155,7 +164,9 @@ GROUP "/" {
               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 ],
+              64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ]
+         },
+         {
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
               "78abcdefgh12345678",
@@ -164,9 +175,7 @@ GROUP "/" {
               "78abcdefgh12345678",
               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
-         },
-         {
+              "78abcdefgh12345678" ],
             [ 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,
@@ -174,7 +183,9 @@ GROUP "/" {
               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 ],
+              81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ]
+         },
+         {
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
               "78abcdefgh12345678",
@@ -183,9 +194,7 @@ GROUP "/" {
               "78abcdefgh12345678",
               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
-         },
-         {
+              "78abcdefgh12345678" ],
             [ 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,
@@ -193,7 +202,9 @@ GROUP "/" {
               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 ],
+              100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ]
+         },
+         {
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
               "78abcdefgh12345678",
@@ -202,9 +213,7 @@ GROUP "/" {
               "78abcdefgh12345678",
               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
-         },
-         {
+              "78abcdefgh12345678" ],
             [ 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,
@@ -212,7 +221,9 @@ GROUP "/" {
               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 ],
+              121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ]
+         },
+         {
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
               "78abcdefgh12345678",
@@ -221,9 +232,7 @@ GROUP "/" {
               "78abcdefgh12345678",
               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
-         },
-         {
+              "78abcdefgh12345678" ],
             [ 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,
@@ -231,7 +240,9 @@ GROUP "/" {
               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 ],
+              144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ]
+         },
+         {
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
               "78abcdefgh12345678",
@@ -240,9 +251,7 @@ GROUP "/" {
               "78abcdefgh12345678",
               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
-         },
-         {
+              "78abcdefgh12345678" ],
             [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81,
               1, 4, 9, 16, 25, 36, 49, 64, 81, 100,
               4, 9, 16, 25, 36, 49, 64, 81, 100, 121,
@@ -250,7 +259,9 @@ GROUP "/" {
               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 ],
+              49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ]
+         },
+         {
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
               "78abcdefgh12345678",
@@ -259,9 +270,7 @@ GROUP "/" {
               "78abcdefgh12345678",
               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
-         },
-         {
+              "78abcdefgh12345678" ],
             [ 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,
@@ -269,7 +278,9 @@ GROUP "/" {
               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 ],
+              64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ]
+         },
+         {
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
               "78abcdefgh12345678",
@@ -278,9 +289,7 @@ GROUP "/" {
               "78abcdefgh12345678",
               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
-         },
-         {
+              "78abcdefgh12345678" ],
             [ 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,
@@ -288,7 +297,9 @@ GROUP "/" {
               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 ],
+              81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ]
+         },
+         {
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
               "78abcdefgh12345678",
@@ -297,9 +308,7 @@ GROUP "/" {
               "78abcdefgh12345678",
               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
-         },
-         {
+              "78abcdefgh12345678" ],
             [ 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,
@@ -307,7 +316,9 @@ GROUP "/" {
               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 ],
+              100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ]
+         },
+         {
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
               "78abcdefgh12345678",
@@ -316,9 +327,7 @@ GROUP "/" {
               "78abcdefgh12345678",
               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
-         },
-         {
+              "78abcdefgh12345678" ],
             [ 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,
@@ -326,7 +335,9 @@ GROUP "/" {
               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 ],
+              121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ]
+         },
+         {
             [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
               "78abcdefgh12345678",
@@ -335,9 +346,7 @@ GROUP "/" {
               "78abcdefgh12345678",
               "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
               "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
-         },
-         {
+              "78abcdefgh12345678" ],
             [ 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,
@@ -345,16 +354,7 @@ GROUP "/" {
               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", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678",
-              "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" //
-              "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" //
-              "78abcdefgh12345678" ]
+              144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ]
          }
       }
    }