From 03d34c41a18a8eb775b1da62d8ceba1f4b4b683b Mon Sep 17 00:00:00 2001 From: Patrick Lu Date: Thu, 9 Mar 2000 12:56:30 -0500 Subject: [PATCH] [svn-r2012] updated the ddls to support the changes that were made to the begin_obj and end_obj macros in the dumper. this was basically adding a space after most of the '}'. there are some places that don't have the space because those '}' were not printed by the end_obj macro --- tools/testfiles/tall-1.ddl | 80 ++++++++++++++++++------------------ tools/testfiles/tall-2.ddl | 34 +++++++-------- tools/testfiles/tall-3.ddl | 12 +++--- tools/testfiles/tattr-1.ddl | 44 ++++++++++---------- tools/testfiles/tattr-2.ddl | 26 ++++++------ tools/testfiles/tattr-3.ddl | 10 ++--- tools/testfiles/tcomp-1.ddl | 56 ++++++++++++------------- tools/testfiles/tcomp-2.ddl | 8 ++-- tools/testfiles/tcomp-3.ddl | 14 +++---- tools/testfiles/tdatareg.ddl | 20 ++++----- tools/testfiles/tdset-1.ddl | 20 ++++----- tools/testfiles/tdset-2.ddl | 16 ++++---- tools/testfiles/tgroup-1.ddl | 30 +++++++------- tools/testfiles/tgroup-2.ddl | 42 +++++++++---------- tools/testfiles/thlink-1.ddl | 22 +++++----- tools/testfiles/thlink-2.ddl | 14 +++---- tools/testfiles/thlink-3.ddl | 14 +++---- tools/testfiles/thlink-4.ddl | 16 ++++---- tools/testfiles/thlink-5.ddl | 16 ++++---- tools/testfiles/tloop-1.ddl | 12 +++--- tools/testfiles/tslink-1.ddl | 8 ++-- tools/testfiles/tslink-2.ddl | 4 +- tools/testfiles/tstr-1.ddl | 44 ++++++++++---------- 23 files changed, 281 insertions(+), 281 deletions(-) diff --git a/tools/testfiles/tall-1.ddl b/tools/testfiles/tall-1.ddl index 26df59ff00..5d1ea0be62 100644 --- a/tools/testfiles/tall-1.ddl +++ b/tools/testfiles/tall-1.ddl @@ -4,25 +4,25 @@ Expected output for 'h5dump tall.h5' HDF5 "tall.h5" { GROUP "/" { ATTRIBUTE "attr1" { - DATATYPE { H5T_STD_I8BE } - DATASPACE { SIMPLE ( 10 ) / ( 10 ) } + DATATYPE { H5T_STD_I8BE } + DATASPACE { SIMPLE ( 10 ) / ( 10 ) } DATA { 97, 98, 99, 100, 101, 102, 103, 104, 105, 0 - } - } + } + } ATTRIBUTE "attr2" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 2, 2 ) / ( 2, 2 ) } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 2, 2 ) / ( 2, 2 ) } DATA { 0, 1, 2, 3 - } - } + } + } GROUP "g1" { GROUP "g1.1" { DATASET "dset1.1.1" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 10, 10 ) / ( 10, 10 ) } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 10, 10 ) / ( 10, 10 ) } DATA { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, @@ -34,58 +34,58 @@ GROUP "/" { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 - } + } ATTRIBUTE "attr1" { - DATATYPE { H5T_STD_I8BE } - DATASPACE { SIMPLE ( 27 ) / ( 27 ) } + DATATYPE { H5T_STD_I8BE } + DATASPACE { SIMPLE ( 27 ) / ( 27 ) } DATA { 49, 115, 116, 32, 97, 116, 116, 114, 105, 98, 117, 116, 101, 32, 111, 102, 32, 100, 115, 101, 116, 49, 46, 49, 46, 49, 0 - } - } + } + } ATTRIBUTE "attr2" { - DATATYPE { H5T_STD_I8BE } - DATASPACE { SIMPLE ( 27 ) / ( 27 ) } + DATATYPE { H5T_STD_I8BE } + DATASPACE { SIMPLE ( 27 ) / ( 27 ) } DATA { 50, 110, 100, 32, 97, 116, 116, 114, 105, 98, 117, 116, 101, 32, 111, 102, 32, 100, 115, 101, 116, 49, 46, 49, 46, 49, 0 - } - } - } + } + } + } DATASET "dset1.1.2" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 20 ) / ( 20 ) } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 20 ) / ( 20 ) } DATA { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 - } - } - } + } + } + } GROUP "g1.2" { GROUP "g1.2.1" { SOFTLINK "slink" { LINKTARGET "somevalue" - } - } - } - } + } + } + } + } GROUP "g2" { DATASET "dset2.1" { - DATATYPE { H5T_IEEE_F32BE } - DATASPACE { SIMPLE ( 10 ) / ( 10 ) } + DATATYPE { H5T_IEEE_F32BE } + DATASPACE { SIMPLE ( 10 ) / ( 10 ) } DATA { 1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9 - } - } + } + } DATASET "dset2.2" { - DATATYPE { H5T_IEEE_F32BE } - DATASPACE { SIMPLE ( 3, 5 ) / ( 3, 5 ) } + DATATYPE { H5T_IEEE_F32BE } + DATASPACE { SIMPLE ( 3, 5 ) / ( 3, 5 ) } DATA { 0, 0, 0, 0, 0, 0.1, 0.1, 0.1, 0.1, 0.1, 0.2, 0.2, 0.2, 0.2, 0.2 - } - } - } -} -} + } + } + } +} +} diff --git a/tools/testfiles/tall-2.ddl b/tools/testfiles/tall-2.ddl index 80796aa93b..ff5a7f336b 100644 --- a/tools/testfiles/tall-2.ddl +++ b/tools/testfiles/tall-2.ddl @@ -4,24 +4,24 @@ Expected output for 'h5dump -header -g /g1/g1.1 -a attr2 tall.h5' HDF5 "tall.h5" { GROUP "/g1/g1.1" { DATASET "dset1.1.1" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 10, 10 ) / ( 10, 10 ) } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 10, 10 ) / ( 10, 10 ) } ATTRIBUTE "attr1" { - DATATYPE { H5T_STD_I8BE } - DATASPACE { SIMPLE ( 27 ) / ( 27 ) } - } + DATATYPE { H5T_STD_I8BE } + DATASPACE { SIMPLE ( 27 ) / ( 27 ) } + } ATTRIBUTE "attr2" { - DATATYPE { H5T_STD_I8BE } - DATASPACE { SIMPLE ( 27 ) / ( 27 ) } - } - } + DATATYPE { H5T_STD_I8BE } + DATASPACE { SIMPLE ( 27 ) / ( 27 ) } + } + } DATASET "dset1.1.2" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 20 ) / ( 20 ) } - } -} + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 20 ) / ( 20 ) } + } +} ATTRIBUTE "attr2" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 2, 2 ) / ( 2, 2 ) } -} -} + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 2, 2 ) / ( 2, 2 ) } +} +} diff --git a/tools/testfiles/tall-3.ddl b/tools/testfiles/tall-3.ddl index 8fffb5c4ff..389ad0ac94 100644 --- a/tools/testfiles/tall-3.ddl +++ b/tools/testfiles/tall-3.ddl @@ -3,13 +3,13 @@ Expected output for 'h5dump -d /g2/dset2.1 -l /g1/g1.2/g1.2.1/slink tall.h5' ############################# HDF5 "tall.h5" { DATASET "/g2/dset2.1" { - DATATYPE { H5T_IEEE_F32BE } - DATASPACE { SIMPLE ( 10 ) / ( 10 ) } + DATATYPE { H5T_IEEE_F32BE } + DATASPACE { SIMPLE ( 10 ) / ( 10 ) } DATA { 1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9 - } -} + } +} SOFTLINK "/g1/g1.2/g1.2.1/slink" { LINKTARGET "somevalue" -} -} +} +} diff --git a/tools/testfiles/tattr-1.ddl b/tools/testfiles/tattr-1.ddl index 0c3af32c5e..c00f149a29 100644 --- a/tools/testfiles/tattr-1.ddl +++ b/tools/testfiles/tattr-1.ddl @@ -4,34 +4,34 @@ Expected output for 'h5dump tattr.h5' HDF5 "tattr.h5" { GROUP "/" { ATTRIBUTE "attr1" { - DATATYPE { H5T_STD_I8BE } - DATASPACE { SIMPLE ( 24 ) / ( 24 ) } + DATATYPE { H5T_STD_I8BE } + DATASPACE { SIMPLE ( 24 ) / ( 24 ) } DATA { 97, 116, 116, 114, 105, 98, 117, 116, 101, 32, 111, 102, 32, 114, 111, 111, 116, 32, 103, 114, 111, 117, 112, 0 - } - } + } + } ATTRIBUTE "attr2" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 10 ) / ( 10 ) } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 10 ) / ( 10 ) } DATA { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 - } - } + } + } ATTRIBUTE "attr3" { - DATATYPE { H5T_IEEE_F64BE } - DATASPACE { SIMPLE ( 10 ) / ( 10 ) } + DATATYPE { H5T_IEEE_F64BE } + DATASPACE { SIMPLE ( 10 ) / ( 10 ) } DATA { 0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9 - } - } + } + } ATTRIBUTE "attr4" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SCALAR } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SCALAR } DATA { 100 - } - } + } + } ATTRIBUTE "attr5" { DATATYPE { { STRSIZE 17; @@ -39,11 +39,11 @@ GROUP "/" { CSET H5T_CSET_ASCII; CTYPE H5T_C_S1; } - } - DATASPACE { SCALAR } + } + DATASPACE { SCALAR } DATA { "string attribute" - } - } -} -} + } + } +} +} diff --git a/tools/testfiles/tattr-2.ddl b/tools/testfiles/tattr-2.ddl index f97b3c606d..01d46dc2a0 100644 --- a/tools/testfiles/tattr-2.ddl +++ b/tools/testfiles/tattr-2.ddl @@ -3,20 +3,20 @@ Expected output for 'h5dump -a attr1 attr4 attr5 tattr.h5' ############################# HDF5 "tattr.h5" { ATTRIBUTE "attr1" { - DATATYPE { H5T_STD_I8BE } - DATASPACE { SIMPLE ( 24 ) / ( 24 ) } + DATATYPE { H5T_STD_I8BE } + DATASPACE { SIMPLE ( 24 ) / ( 24 ) } DATA { 97, 116, 116, 114, 105, 98, 117, 116, 101, 32, 111, 102, 32, 114, 111, 111, 116, 32, 103, 114, 111, 117, 112, 0 - } -} + } +} ATTRIBUTE "attr4" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SCALAR } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SCALAR } DATA { 100 - } -} + } +} ATTRIBUTE "attr5" { DATATYPE { { STRSIZE 17; @@ -24,10 +24,10 @@ ATTRIBUTE "attr5" { CSET H5T_CSET_ASCII; CTYPE H5T_C_S1; } - } - DATASPACE { SCALAR } + } + DATASPACE { SCALAR } DATA { "string attribute" - } -} -} + } +} +} diff --git a/tools/testfiles/tattr-3.ddl b/tools/testfiles/tattr-3.ddl index b0c600faa5..a97629afb9 100644 --- a/tools/testfiles/tattr-3.ddl +++ b/tools/testfiles/tattr-3.ddl @@ -3,10 +3,10 @@ Expected output for 'h5dump -header -a attr2 attr tattr.h5' ############################# HDF5 "tattr.h5" { ATTRIBUTE "attr2" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 10 ) / ( 10 ) } -} + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 10 ) / ( 10 ) } +} ATTRIBUTE "attr" { h5dump error: unable to open attribute. -} -} +} +} diff --git a/tools/testfiles/tcomp-1.ddl b/tools/testfiles/tcomp-1.ddl index 529dd5f8bd..13dd33e585 100644 --- a/tools/testfiles/tcomp-1.ddl +++ b/tools/testfiles/tcomp-1.ddl @@ -6,14 +6,14 @@ GROUP "/" { DATATYPE "#5992:0" { H5T_STD_I32BE "int"; H5T_IEEE_F32BE "float"; - } + } DATASET "dset1" { DATATYPE { H5T_STD_I32BE "a_name"; H5T_IEEE_F32BE "b_name"; H5T_IEEE_F64BE "c_name"; - } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + } + DATASPACE { SIMPLE ( 5 ) / ( 5 ) } DATA { { 0, @@ -40,14 +40,14 @@ GROUP "/" { 16, 0.2 } - } - } + } + } GROUP "group1" { DATASET "dset2" { DATATYPE { "/type1" - } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + } + DATASPACE { SIMPLE ( 5 ) / ( 5 ) } DATA { { 0, @@ -69,13 +69,13 @@ GROUP "/" { 4, 4.4 } - } - } + } + } DATASET "dset3" { DATATYPE { "/type2" - } - DATASPACE { SIMPLE ( 3, 6 ) / ( 3, 6 ) } + } + DATASPACE { SIMPLE ( 3, 6 ) / ( 3, 6 ) } DATA { { [ 0, 1, 2, 3 ], @@ -221,13 +221,13 @@ GROUP "/" { 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ] } - } - } + } + } DATASET "dset4" { DATATYPE { "/group1/type3" - } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + } + DATASPACE { SIMPLE ( 5 ) / ( 5 ) } DATA { { 0, @@ -249,19 +249,19 @@ GROUP "/" { 4, 4 } - } - } + } + } DATATYPE "type3" { H5T_STD_I32BE "int"; H5T_IEEE_F32BE "float"; - } - } + } + } GROUP "group2" { DATASET "dset5" { DATATYPE { "/#5992:0" - } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + } + DATASPACE { SIMPLE ( 5 ) / ( 5 ) } DATA { { 0, @@ -283,16 +283,16 @@ GROUP "/" { 4, 0.4 } - } - } - } + } + } + } DATATYPE "type1" { H5T_STD_I32BE "int_name"; H5T_IEEE_F32BE "float_name"; - } + } DATATYPE "type2" { H5T_STD_I32BE "int_array"[4]; H5T_IEEE_F32BE "float_array"[5][6]; - } -} -} + } +} +} diff --git a/tools/testfiles/tcomp-2.ddl b/tools/testfiles/tcomp-2.ddl index dd39a65640..2e94bdbd93 100644 --- a/tools/testfiles/tcomp-2.ddl +++ b/tools/testfiles/tcomp-2.ddl @@ -5,13 +5,13 @@ HDF5 "tcompound.h5" { DATATYPE "/type1" { H5T_STD_I32BE "int_name"; H5T_IEEE_F32BE "float_name"; -} +} DATATYPE "/type2" { H5T_STD_I32BE "int_array"[4]; H5T_IEEE_F32BE "float_array"[5][6]; -} +} DATATYPE "/group1/type3" { H5T_STD_I32BE "int"; H5T_IEEE_F32BE "float"; -} -} +} +} diff --git a/tools/testfiles/tcomp-3.ddl b/tools/testfiles/tcomp-3.ddl index 9708adf234..c8e553a948 100644 --- a/tools/testfiles/tcomp-3.ddl +++ b/tools/testfiles/tcomp-3.ddl @@ -5,13 +5,13 @@ HDF5 "tcompound.h5" { DATATYPE "/#5992:0" { H5T_STD_I32BE "int"; H5T_IEEE_F32BE "float"; -} +} GROUP "/group2" { DATASET "dset5" { DATATYPE { "/#5992:0" - } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + } + DATASPACE { SIMPLE ( 5 ) / ( 5 ) } DATA { { 0, @@ -33,7 +33,7 @@ GROUP "/group2" { 4, 0.4 } - } - } -} -} + } + } +} +} diff --git a/tools/testfiles/tdatareg.ddl b/tools/testfiles/tdatareg.ddl index 0facf42be9..625b089576 100644 --- a/tools/testfiles/tdatareg.ddl +++ b/tools/testfiles/tdatareg.ddl @@ -4,16 +4,16 @@ Expected output for 'h5dump tdatareg.h5' HDF5 "tdatareg.h5" { GROUP "/" { DATASET "Dataset1" { - DATATYPE { H5T_REFERENCE } - DATASPACE { SIMPLE ( 4 ) / ( 4 ) } + DATATYPE { H5T_REFERENCE } + DATASPACE { SIMPLE ( 4 ) / ( 4 ) } DATA { DATASET 0:744 {(2,2)-(7,7)}, DATASET 0:744 {(6,9), (2,2), (8,4), (1,6), (2,8), (3,2), (0,4), (9,0), (7,1), (3,3)}, NULL, NULL - } - } + } + } DATASET "Dataset2" { - DATATYPE { H5T_STD_U8LE } - DATASPACE { SIMPLE ( 10, 10 ) / ( 10, 10 ) } + DATATYPE { H5T_STD_U8LE } + DATASPACE { SIMPLE ( 10, 10 ) / ( 10, 10 ) } DATA { 0, 3, 6, 9, 12, 15, 18, 21, 24, 27, 30, 33, 36, 39, 42, 45, 48, 51, 54, 57, @@ -25,7 +25,7 @@ GROUP "/" { 210, 213, 216, 219, 222, 225, 228, 231, 234, 237, 240, 243, 246, 249, 252, 255, 2, 5, 8, 11, 14, 17, 20, 23, 26, 29, 32, 35, 38, 41 - } - } -} -} + } + } +} +} diff --git a/tools/testfiles/tdset-1.ddl b/tools/testfiles/tdset-1.ddl index fe49466d3a..77a4e3db9a 100644 --- a/tools/testfiles/tdset-1.ddl +++ b/tools/testfiles/tdset-1.ddl @@ -4,8 +4,8 @@ Expected output for 'h5dump tdset.h5' HDF5 "tdset.h5" { GROUP "/" { DATASET "dset1" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 10, 20 ) / ( 10, 20 ) } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 10, 20 ) / ( 10, 20 ) } DATA { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, @@ -24,11 +24,11 @@ GROUP "/" { 26, 27, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28 - } - } + } + } DATASET "dset2" { - DATATYPE { H5T_IEEE_F64BE } - DATASPACE { SIMPLE ( 30, 20 ) / ( 30, 20 ) } + DATATYPE { H5T_IEEE_F64BE } + DATASPACE { SIMPLE ( 30, 20 ) / ( 30, 20 ) } DATA { 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, @@ -120,7 +120,7 @@ GROUP "/" { 29, 29.0001, 29.0002, 29.0003, 29.0004, 29.0005, 29.0006, 29.0007, 29.0008, 29.0009, 29.001, 29.0011, 29.0012, 29.0013, 29.0014, 29.0015, 29.0016, 29.0017, 29.0018, 29.0019 - } - } -} -} + } + } +} +} diff --git a/tools/testfiles/tdset-2.ddl b/tools/testfiles/tdset-2.ddl index a857c9dfd7..6ce9aa862b 100644 --- a/tools/testfiles/tdset-2.ddl +++ b/tools/testfiles/tdset-2.ddl @@ -3,14 +3,14 @@ Expected output for 'h5dump -header -d dset1 /dset2 dset3 tdset.h5' ############################# HDF5 "tdset.h5" { DATASET "dset1" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 10, 20 ) / ( 10, 20 ) } -} + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 10, 20 ) / ( 10, 20 ) } +} DATASET "/dset2" { - DATATYPE { H5T_IEEE_F64BE } - DATASPACE { SIMPLE ( 30, 20 ) / ( 30, 20 ) } -} + DATATYPE { H5T_IEEE_F64BE } + DATASPACE { SIMPLE ( 30, 20 ) / ( 30, 20 ) } +} DATASET "dset3" { h5dump error: unable to open dset3 -} -} +} +} diff --git a/tools/testfiles/tgroup-1.ddl b/tools/testfiles/tgroup-1.ddl index d5f5eb4fb9..4697f5e977 100644 --- a/tools/testfiles/tgroup-1.ddl +++ b/tools/testfiles/tgroup-1.ddl @@ -5,29 +5,29 @@ HDF5 "tgroup.h5" { GROUP "/" { GROUP "g1" { GROUP "g1.1" { - } + } GROUP "g1.2" { - } - } + } + } GROUP "g2" { GROUP "g2.1" { GROUP "g2.1.1" { - } + } GROUP "g2.1.2" { - } + } GROUP "g2.1.3" { - } - } - } + } + } + } GROUP "g3" { GROUP "g3.1" { - } + } GROUP "g3.2" { - } + } GROUP "g3.3" { - } + } GROUP "g3.4" { - } - } -} -} + } + } +} +} diff --git a/tools/testfiles/tgroup-2.ddl b/tools/testfiles/tgroup-2.ddl index 86a33f1807..777a5d7992 100644 --- a/tools/testfiles/tgroup-2.ddl +++ b/tools/testfiles/tgroup-2.ddl @@ -5,42 +5,42 @@ HDF5 "tgroup.h5" { GROUP "/g2" { GROUP "g2.1" { GROUP "g2.1.1" { - } + } GROUP "g2.1.2" { - } + } GROUP "g2.1.3" { - } - } -} + } + } +} GROUP "/" { GROUP "g1" { GROUP "g1.1" { - } + } GROUP "g1.2" { - } - } + } + } GROUP "g2" { GROUP "g2.1" { GROUP "g2.1.1" { - } + } GROUP "g2.1.2" { - } + } GROUP "g2.1.3" { - } - } - } + } + } + } GROUP "g3" { GROUP "g3.1" { - } + } GROUP "g3.2" { - } + } GROUP "g3.3" { - } + } GROUP "g3.4" { - } - } -} + } + } +} GROUP "/y" { h5dump error: unable to open /y -} -} +} +} diff --git a/tools/testfiles/thlink-1.ddl b/tools/testfiles/thlink-1.ddl index c2ab3581fc..14b81e2067 100644 --- a/tools/testfiles/thlink-1.ddl +++ b/tools/testfiles/thlink-1.ddl @@ -4,24 +4,24 @@ Expected output for 'h5dump thlink.h5' HDF5 "thlink.h5" { GROUP "/" { DATASET "dset1" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 5 ) / ( 5 ) } DATA { 0, 1, 2, 3, 4 - } - } + } + } GROUP "g1" { DATASET "dset2" { HARDLINK "/dset1" - } + } GROUP "g1.1" { DATASET "dset3" { HARDLINK "/dset1" - } - } - } + } + } + } GROUP "g2" { HARDLINK "/g1/g1.1" - } -} -} + } +} +} diff --git a/tools/testfiles/thlink-2.ddl b/tools/testfiles/thlink-2.ddl index c6ecfc52ba..300ed54a59 100644 --- a/tools/testfiles/thlink-2.ddl +++ b/tools/testfiles/thlink-2.ddl @@ -3,16 +3,16 @@ Expected output for 'h5dump -d /g1/dset2 /dset1 /g1/g1.1/dset3 thlink.h5' ############################# HDF5 "thlink.h5" { DATASET "/g1/dset2" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 5 ) / ( 5 ) } DATA { 0, 1, 2, 3, 4 - } -} + } +} DATASET "/dset1" { HARDLINK "/g1/dset2" -} +} DATASET "/g1/g1.1/dset3" { HARDLINK "/g1/dset2" -} -} +} +} diff --git a/tools/testfiles/thlink-3.ddl b/tools/testfiles/thlink-3.ddl index a5d27d8c9d..8ea0057533 100644 --- a/tools/testfiles/thlink-3.ddl +++ b/tools/testfiles/thlink-3.ddl @@ -3,16 +3,16 @@ Expected output for 'h5dump -d /g1/g1.1/dset3 /g1/dset2 /dset1 thlink.h5' ############################# HDF5 "thlink.h5" { DATASET "/g1/g1.1/dset3" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 5 ) / ( 5 ) } DATA { 0, 1, 2, 3, 4 - } -} + } +} DATASET "/g1/dset2" { HARDLINK "/g1/g1.1/dset3" -} +} DATASET "/dset1" { HARDLINK "/g1/g1.1/dset3" -} -} +} +} diff --git a/tools/testfiles/thlink-4.ddl b/tools/testfiles/thlink-4.ddl index 1a883d087d..54c73bcb34 100644 --- a/tools/testfiles/thlink-4.ddl +++ b/tools/testfiles/thlink-4.ddl @@ -4,16 +4,16 @@ Expected output for 'h5dump -g /g1 thlink.h5' HDF5 "thlink.h5" { GROUP "/g1" { DATASET "dset2" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 5 ) / ( 5 ) } DATA { 0, 1, 2, 3, 4 - } - } + } + } GROUP "g1.1" { DATASET "dset3" { HARDLINK "/g1/dset2" - } - } -} -} + } + } +} +} diff --git a/tools/testfiles/thlink-5.ddl b/tools/testfiles/thlink-5.ddl index 65223ed7db..d49bcec463 100644 --- a/tools/testfiles/thlink-5.ddl +++ b/tools/testfiles/thlink-5.ddl @@ -3,18 +3,18 @@ Expected output for 'h5dump -d /dset1 -g /g2 -d /g1/dset2 thlink.h5' ############################# HDF5 "thlink.h5" { DATASET "/dset1" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 5 ) / ( 5 ) } DATA { 0, 1, 2, 3, 4 - } -} + } +} GROUP "/g2" { DATASET "dset3" { HARDLINK "/dset1" - } -} + } +} DATASET "/g1/dset2" { HARDLINK "/dset1" -} -} +} +} diff --git a/tools/testfiles/tloop-1.ddl b/tools/testfiles/tloop-1.ddl index 8313887352..d4e272e828 100644 --- a/tools/testfiles/tloop-1.ddl +++ b/tools/testfiles/tloop-1.ddl @@ -7,11 +7,11 @@ GROUP "/" { GROUP "g1.1" { GROUP "g2.1" { HARDLINK "/g1" - } - } - } + } + } + } GROUP "g2" { HARDLINK "/g1/g1.1" - } -} -} + } +} +} diff --git a/tools/testfiles/tslink-1.ddl b/tools/testfiles/tslink-1.ddl index e0f24e0ff3..b8d42b03f3 100644 --- a/tools/testfiles/tslink-1.ddl +++ b/tools/testfiles/tslink-1.ddl @@ -5,9 +5,9 @@ HDF5 "tslink.h5" { GROUP "/" { SOFTLINK "slink1" { LINKTARGET "somevalue" - } + } SOFTLINK "slink2" { LINKTARGET "linkvalue" - } -} -} + } +} +} diff --git a/tools/testfiles/tslink-2.ddl b/tools/testfiles/tslink-2.ddl index 0672707714..7a989ea6f8 100644 --- a/tools/testfiles/tslink-2.ddl +++ b/tools/testfiles/tslink-2.ddl @@ -4,5 +4,5 @@ Expected output for 'h5dump -l slink2 tslink.h5' HDF5 "tslink.h5" { SOFTLINK "slink2" { LINKTARGET "linkvalue" -} -} +} +} diff --git a/tools/testfiles/tstr-1.ddl b/tools/testfiles/tstr-1.ddl index 7f811ccd29..d5b174b313 100644 --- a/tools/testfiles/tstr-1.ddl +++ b/tools/testfiles/tstr-1.ddl @@ -11,8 +11,8 @@ GROUP "/" { CSET H5T_CSET_ASCII; CTYPE H5T_C_S1; } "string"[3][4]; - } - DATASPACE { SIMPLE ( 3, 6 ) / ( 3, 6 ) } + } + DATASPACE { SIMPLE ( 3, 6 ) / ( 3, 6 ) } DATA { { [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81, @@ -248,8 +248,8 @@ GROUP "/" { "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ] } - } - } + } + } DATASET "string1" { DATATYPE { { STRSIZE 5; @@ -257,14 +257,14 @@ GROUP "/" { CSET H5T_CSET_ASCII; CTYPE H5T_C_S1; } - } - DATASPACE { SIMPLE ( 3, 4 ) / ( 3, 4 ) } + } + DATASPACE { SIMPLE ( 3, 4 ) / ( 3, 4 ) } DATA { "s1", "s2", "s3", "s4", "s5", "s6", "s7", "s8", "s9", "s0", "s1", "s2" - } - } + } + } DATASET "string2" { DATATYPE { { STRSIZE 11; @@ -272,16 +272,16 @@ GROUP "/" { CSET H5T_CSET_ASCII; CTYPE H5T_C_S1; } - } - DATASPACE { SIMPLE ( 20 ) / ( 20 ) } + } + 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 ", "ab cd ef9 ", "ab cd ef0 ", "ab cd ef1 ", "ab cd ef2 ", "ab cd ef3 ", "ab cd ef4 ", "ab cd ef5 ", "ab cd ef6 ", "ab cd ef7 ", "ab cd ef8 ", "ab cd ef9 ", "ab cd ef0 " - } - } + } + } DATASET "string3" { DATATYPE { { STRSIZE 8; @@ -289,8 +289,8 @@ GROUP "/" { CSET H5T_CSET_ASCII; CTYPE H5T_C_S1; } - } - DATASPACE { SIMPLE ( 27 ) / ( 27 ) } + } + 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", @@ -301,8 +301,8 @@ GROUP "/" { "abcd8\000\000\000", "abcd9\000\000\000", "abcd0\000\000\000", "abcd1\000\000\000", "abcd2\000\000\000", "abcd3\000\000\000", "abcd4\000\000\000", "abcd5\000\000\000", "abcd6\000\000\000" - } - } + } + } DATASET "string4" { DATATYPE { { STRSIZE 168; @@ -310,13 +310,13 @@ GROUP "/" { CSET H5T_CSET_ASCII; CTYPE H5T_C_S1; } - } - DATASPACE { SIMPLE ( 3 ) / ( 3 ) } + } + DATASPACE { SIMPLE ( 3 ) / ( 3 ) } DATA { "s1234567890123456789 ", "s1234567890123456789 ", "s1234567890123456789 " - } - } -} -} + } + } +} +}