another attempt at reducing ncdump dependencies

This commit is contained in:
Ed Hartnett 2017-11-11 16:45:03 -07:00
parent a9dde277d7
commit f709a7b107
3 changed files with 1842 additions and 1336 deletions

View File

@ -15,14 +15,14 @@ TESTS_ENVIRONMENT=CC=${CC}
# This is the program we're building, and it's sources.
bin_PROGRAMS = ncdump
ncdump_SOURCES = ncdump.c vardata.c dumplib.c indent.c nctime0.c \
ncdump.h vardata.h dumplib.h indent.h isnan.h nctime0.h cdl.h \
utils.h utils.c nciter.h nciter.c nccomps.h
ncdump_SOURCES = ncdump.c vardata.c dumplib.c indent.c nctime0.c \
ncdump.h vardata.h dumplib.h indent.h isnan.h nctime0.h cdl.h utils.h \
utils.c nciter.h nciter.c nccomps.h
# Another utility program that copies any netCDF file using only the
# netCDF API
bin_PROGRAMS += nccopy
nccopy_SOURCES = nccopy.c nciter.c nciter.h chunkspec.h chunkspec.c \
nccopy_SOURCES = nccopy.c nciter.c nciter.h chunkspec.h chunkspec.c \
utils.h utils.c dimmap.h dimmap.c
if USE_NETCDF4
@ -33,27 +33,26 @@ endif
# Conditionally build the ocprint program, but do not install
if ENABLE_DAP
bin_PROGRAMS += ocprint
ocprint_SOURCES=ocprint.c
ocprint_SOURCES = ocprint.c
endif
# This is the man page.
man_MANS = ncdump.1 nccopy.1
if BUILD_TESTSETS
#if !BUILD_DLL
# These tests are run for both netCDF-4 and non-netCDF-4 builds.
check_PROGRAMS = rewrite-scalar ctest ctest64 ncdump tst_utf8 bom tst_dimsizes nctrunc
check_PROGRAMS = rewrite-scalar ref_ctest ref_ctest64 ncdump tst_utf8 \
bom tst_dimsizes nctrunc
TESTS = tst_inttags.sh run_tests.sh tst_64bit.sh ctest ctest64 tst_output.sh \
tst_lengths.sh tst_calendars.sh tst_utf8 run_utf8_tests.sh \
tst_nccopy3.sh tst_nccopy3_subset.sh tst_charfill.sh tst_iter.sh tst_formatx3.sh tst_bom.sh \
TESTS = tst_ctest.sh tst_inttags.sh run_tests.sh tst_64bit.sh \
ref_ctest64 tst_output.sh tst_lengths.sh tst_calendars.sh tst_utf8 \
run_utf8_tests.sh tst_nccopy3.sh tst_nccopy3_subset.sh \
tst_charfill.sh tst_iter.sh tst_formatx3.sh tst_bom.sh \
tst_dimsizes.sh run_ncgen_tests.sh
if USE_NETCDF4
check_PROGRAMS += tst_fileinfo
TESTS += tst_fileinfo.sh
TESTS += tst_hdf5_offset.sh
TESTS += run_ncgen_nc4_tests.sh
TESTS += tst_fileinfo.sh tst_hdf5_offset.sh run_ncgen_nc4_tests.sh
endif
if LARGE_FILE_TESTS
@ -73,14 +72,14 @@ endif
if USE_NETCDF4
# NetCDF-4 has some extra tests.
check_PROGRAMS += tst_create_files tst_h_rdc0 tst_group_data \
tst_enum_data tst_opaque_data tst_string_data tst_vlen_data tst_comp \
tst_comp2 tst_nans tst_special_atts tst_unicode tst_fillbug tst_compress \
tst_chunking tst_h_scalar tst_bug324
check_PROGRAMS += tst_create_files tst_h_rdc0 tst_group_data \
tst_enum_data tst_opaque_data tst_string_data tst_vlen_data tst_comp \
tst_comp2 tst_nans tst_special_atts tst_unicode tst_fillbug \
tst_compress tst_chunking tst_h_scalar tst_bug324
TESTS += tst_create_files tst_group_data tst_enum_data tst_opaque_data \
tst_string_data tst_vlen_data tst_comp tst_comp2 tst_nans \
tst_special_atts tst_netcdf4.sh tst_h_rdc0 tst_unicode tst_fillbug \
TESTS += tst_create_files tst_group_data tst_enum_data tst_opaque_data \
tst_string_data tst_vlen_data tst_comp tst_comp2 tst_nans \
tst_special_atts tst_netcdf4.sh tst_h_rdc0 tst_unicode tst_fillbug \
tst_fillbug.sh tst_netcdf4_4.sh tst_compress tst_nccopy4.sh \
tst_grp_spec.sh tst_mud.sh tst_h_scalar tst_h_scalar.sh tst_formatx4.sh \
tst_bug324 run_utf8_nc4_tests.sh
@ -92,93 +91,73 @@ endif # EXTRA_TESTS
tst_h_rdc0_CPPFLAGS = -I${top_srcdir}/nc_test ${AM_CPPFLAGS}
endif #!USE_NETCDF4
#endif #!BUILD_DLL
# Can't run ncgen to generate ctest.c and ctest64.c on cross-compiles.
BUILT_SOURCES = ctest.c ctest64.c
if EXTRA_TESTS
ctest.c:
$(top_builddir)/ncgen/ncgen -lc -o ctest0.nc $(top_srcdir)/ncgen/c0.cdl > $(top_builddir)/ncdump/ctest.c
ctest64.c:
$(top_builddir)/ncgen/ncgen -k2 -lc -o ctest0_64.nc $(top_srcdir)/ncgen/c0.cdl > $(srcdir)/ctest64.c
else
ctest.c:
cp $(top_srcdir)/ncdump/ref_ctest.c $(top_builddir)/ncdump/ctest.c
ctest64.c:
cp $(top_srcdir)/ncdump/ref_ctest64.c $(top_builddir)/ncdump/ctest64.c
endif
#if !BUILD_DLL
TESTS += tst_ncgen4_classic.sh
if USE_NETCDF4
eif USE_NETCDF4
TESTS += tst_ncgen4.sh
endif
#endif
endif BUILD_TESTSETS
CLEANFILES = test0.nc test1_ncdump.cdl test1_ncdump.nc test2_ncdump.cdl \
test1.cdl test0_ncdump.nc ctest1.cdl \
test1_cdf5.nc test1_cdf5.cdl test0_cdf5.nc test2_cdf5.nc test2_cdf5.cdl \
test0_offset.nc test1_offset.nc test1_offset.cdl test2_offset.nc test2_offset.cdl \
ctest0.nc ctest0_64.nc c1.cdl c1_4.cdl ctest1_64.cdl c0.nc c0_4.nc small.nc \
small2.nc c0tmp.nc c1.ncml utf8.cdl utf8_64.cdl utf8.nc utf8_64.nc \
tmp.cdl tst_vlen_data.nc tst_utf8.nc tst_special_atts.nc \
tst_unicode.nc tst_solar_2.nc tst_string_data.nc tst_calendars.nc \
tst_nans.nc tst_opaque_data.nc tst_solar_cmp.nc tst_enum_data.nc \
tst_solar_1.nc tst_mslp_64.nc tst_mslp.nc tst_bug321.nc tst_comp2.nc tst_ncml.nc \
tst_fillbug.nc tst_group_data.nc tst_small.nc tst_comp.nc \
tst_unicode.cdl tst_group_data.cdl tst_compounds2.cdl tst_comp.cdl \
tst_enum_data.cdl tst_small.cdl tst_times.cdl tst_solar_2.cdl \
tst_string_data.cdl tst_fillbug.cdl tst_opaque_data.cdl \
tst_compounds4.cdl tst_utf8.cdl tst_compounds3.cdl \
tst_special_atts.cdl tst_nans.cdl tst_format_att_64.cdl \
tst_vlen_data.cdl tst_solar_1.cdl tst_format_att.cdl tst_inflated.nc \
tmp_subset.cdl tst_inflated4.nc tst_deflated.nc tst_chunking.nc tmp*.nc \
tst_charfill.nc tmp_tst_charfill.cdl \
iter.* \
tst_nc_test_netcdf4_4_0.cdl tst_mud4.nc tst_mud4.cdl tst_mud4-bc.cdl \
tst_ncf213.cdl tst_ncf213.nc tst_h_scalar.cdl tst_h_scalar.nc \
tst_mud4_chars.cdl tst_mud4_chars.nc \
CLEANFILES = test0.nc test1_ncdump.cdl test1_ncdump.nc \
test2_ncdump.cdl test1.cdl test0_ncdump.nc ctest1.cdl test1_cdf5.nc \
test1_cdf5.cdl test0_cdf5.nc test2_cdf5.nc test2_cdf5.cdl \
test0_offset.nc test1_offset.nc test1_offset.cdl test2_offset.nc \
test2_offset.cdl ctest0.nc ctest0_64.nc c1.cdl c1_4.cdl ctest1_64.cdl \
c0.nc c0_4.nc small.nc small2.nc c0tmp.nc c1.ncml utf8.cdl \
utf8_64.cdl utf8.nc utf8_64.nc tmp.cdl tst_vlen_data.nc tst_utf8.nc \
tst_special_atts.nc tst_unicode.nc tst_solar_2.nc tst_string_data.nc \
tst_calendars.nc tst_nans.nc tst_opaque_data.nc tst_solar_cmp.nc \
tst_enum_data.nc tst_solar_1.nc tst_mslp_64.nc tst_mslp.nc \
tst_bug321.nc tst_comp2.nc tst_ncml.nc tst_fillbug.nc \
tst_group_data.nc tst_small.nc tst_comp.nc tst_unicode.cdl \
tst_group_data.cdl tst_compounds2.cdl tst_comp.cdl tst_enum_data.cdl \
tst_small.cdl tst_times.cdl tst_solar_2.cdl tst_string_data.cdl \
tst_fillbug.cdl tst_opaque_data.cdl tst_compounds4.cdl tst_utf8.cdl \
tst_compounds3.cdl tst_special_atts.cdl tst_nans.cdl \
tst_format_att_64.cdl tst_vlen_data.cdl tst_solar_1.cdl \
tst_format_att.cdl tst_inflated.nc tmp_subset.cdl tst_inflated4.nc \
tst_deflated.nc tst_chunking.nc tmp*.nc tst_charfill.nc \
tmp_tst_charfill.cdl iter.* tst_nc_test_netcdf4_4_0.cdl tst_mud4.nc \
tst_mud4.cdl tst_mud4-bc.cdl tst_ncf213.cdl tst_ncf213.nc \
tst_h_scalar.cdl tst_h_scalar.nc tst_mud4_chars.cdl tst_mud4_chars.nc \
inttags.nc inttags4.nc tst_inttags.cdl tst_inttags4.cdl \
tst_dimsize_classic.nc tst_dimsize_64offset.nc tst_dimsize_64data.nc \
nc4_fileinfo.nc hdf5_fileinfo.hdf \
ref_hdf5_compat1.nc ref_hdf5_compat2.nc ref_hdf5_compat3.nc \
ref_tst_compounds.nc ref_tst_dims.nc ref_tst_interops4.nc \
ref_tst_xplatform2_1.nc ref_tst_xplatform2_2.nc nccopy3_subset_out.nc
nc4_fileinfo.nc hdf5_fileinfo.hdf ref_hdf5_compat1.nc \
ref_hdf5_compat2.nc ref_hdf5_compat3.nc ref_tst_compounds.nc \
ref_tst_dims.nc ref_tst_interops4.nc ref_tst_xplatform2_1.nc \
ref_tst_xplatform2_2.nc nccopy3_subset_out.nc
# These files all have to be included with the distribution.
EXTRA_DIST = run_tests.sh tst_64bit.sh tst_output.sh test0.cdl \
ref_ctest1_nc4.cdl ref_ctest1_nc4c.cdl ref_tst_solar_1.cdl \
ref_tst_solar_2.cdl tst_netcdf4.sh tst_netcdf4_4.sh ref_tst_small.cdl \
tst_lengths.sh tst_ncml.cdl ref1.ncml ref_tst_group_data.cdl \
ref_tst_enum_data.cdl ref_tst_opaque_data.cdl ref_tst_string_data.cdl \
ref_tst_vlen_data.cdl ref_tst_comp.cdl ref_tst_unicode.cdl \
ref_tst_nans.cdl small.cdl small2.cdl $(man_MANS) run_utf8_tests.sh \
ref_tst_utf8.cdl ref_tst_fillbug.cdl tst_fillbug.sh tst_calendars.cdl \
tst_calendars.sh ref_times.cdl ref_tst_special_atts.cdl \
ref_tst_noncoord.cdl ref_tst_compounds2.nc ref_tst_compounds2.cdl \
ref_tst_compounds3.nc ref_tst_compounds3.cdl ref_tst_compounds4.nc \
ref_tst_compounds4.cdl ref_tst_group_data_v23.cdl tst_mslp.cdl tst_bug321.cdl \
ref_tst_format_att.cdl ref_tst_format_att_64.cdl tst_nccopy3.sh \
tst_nccopy4.sh ref_nc_test_netcdf4_4_0.nc run_back_comp_tests.sh \
ref_nc_test_netcdf4.cdl ref_tst_special_atts3.cdl tst_brecs.cdl \
ref_tst_grp_spec0.cdl ref_tst_grp_spec.cdl tst_grp_spec.sh \
ref_tst_charfill.cdl tst_charfill.cdl tst_charfill.sh \
tst_iter.sh tst_mud.sh ref_tst_mud4.cdl ref_tst_mud4-bc.cdl \
ref_tst_mud4_chars.cdl \
EXTRA_DIST = run_tests.sh tst_64bit.sh tst_output.sh test0.cdl \
ref_ctest1_nc4.cdl ref_ctest1_nc4c.cdl ref_tst_solar_1.cdl \
ref_tst_solar_2.cdl tst_netcdf4.sh tst_netcdf4_4.sh ref_tst_small.cdl \
tst_lengths.sh tst_ncml.cdl ref1.ncml ref_tst_group_data.cdl \
ref_tst_enum_data.cdl ref_tst_opaque_data.cdl ref_tst_string_data.cdl \
ref_tst_vlen_data.cdl ref_tst_comp.cdl ref_tst_unicode.cdl \
ref_tst_nans.cdl small.cdl small2.cdl $(man_MANS) run_utf8_tests.sh \
ref_tst_utf8.cdl ref_tst_fillbug.cdl tst_fillbug.sh tst_calendars.cdl \
tst_calendars.sh ref_times.cdl ref_tst_special_atts.cdl \
ref_tst_noncoord.cdl ref_tst_compounds2.nc ref_tst_compounds2.cdl \
ref_tst_compounds3.nc ref_tst_compounds3.cdl ref_tst_compounds4.nc \
ref_tst_compounds4.cdl ref_tst_group_data_v23.cdl tst_mslp.cdl \
tst_bug321.cdl ref_tst_format_att.cdl ref_tst_format_att_64.cdl \
tst_nccopy3.sh tst_nccopy4.sh ref_nc_test_netcdf4_4_0.nc \
run_back_comp_tests.sh ref_nc_test_netcdf4.cdl \
ref_tst_special_atts3.cdl tst_brecs.cdl ref_tst_grp_spec0.cdl \
ref_tst_grp_spec.cdl tst_grp_spec.sh ref_tst_charfill.cdl \
tst_charfill.cdl tst_charfill.sh tst_iter.sh tst_mud.sh \
ref_tst_mud4.cdl ref_tst_mud4-bc.cdl ref_tst_mud4_chars.cdl \
inttags.cdl inttags4.cdl ref_inttags.cdl ref_inttags4.cdl \
ref_tst_ncf213.cdl tst_h_scalar.sh \
run_utf8_nc4_tests.sh \
tst_formatx3.sh tst_formatx4.sh ref_tst_utf8_4.cdl \
tst_inttags.sh tst_inttags4.sh \
CMakeLists.txt XGetopt.c tst_bom.sh tst_inmemory_nc3.sh \
tst_dimsizes.sh tst_inmemory_nc4.sh tst_fileinfo.sh run_ncgen_tests.sh \
test_360_day_1900.nc test_365_day_1900.nc test_366_day_1900.nc \
ref_test_360_day_1900.cdl ref_test_365_day_1900.cdl ref_test_366_day_1900.cdl \
tst_hdf5_offset.sh run_ncgen_nc4_tests.sh tst_nccopy3_subset.sh ref_nccopy3_subset.nc test_corrupt_magic.nc
ref_tst_ncf213.cdl tst_h_scalar.sh run_utf8_nc4_tests.sh \
tst_formatx3.sh tst_formatx4.sh ref_tst_utf8_4.cdl tst_inttags.sh \
tst_inttags4.sh CMakeLists.txt XGetopt.c tst_bom.sh \
tst_inmemory_nc3.sh tst_dimsizes.sh tst_inmemory_nc4.sh \
tst_fileinfo.sh run_ncgen_tests.sh test_360_day_1900.nc \
test_365_day_1900.nc test_366_day_1900.nc ref_test_360_day_1900.cdl \
ref_test_365_day_1900.cdl ref_test_366_day_1900.cdl \
tst_hdf5_offset.sh run_ncgen_nc4_tests.sh tst_nccopy3_subset.sh \
ref_nccopy3_subset.nc test_corrupt_magic.nc c0.cdl
# The L512.bin file is file containing exactly 512 bytes each of value 0.
# It is used for creating hdf5 files with varying offsets for testing.
@ -186,16 +165,16 @@ EXTRA_DIST += L512.bin
# CDL files and Expected results
SUBDIRS=cdl expected
EXTRA_DIST += tst_ncgen_shared.sh tst_ncgen4.sh tst_ncgen4_classic.sh \
tst_ncgen4_diff.sh tst_ncgen4_cycle.sh ref_ctest.c ref_ctest64.c
EXTRA_DIST += tst_ncgen_shared.sh tst_ncgen4.sh tst_ncgen4_classic.sh \
tst_ncgen4_diff.sh tst_ncgen4_cycle.sh
CLEANFILES += results/*.nc results/*.dmp results/*.dmp2 tmp*.cdl \
c5.nc compound_datasize_test.nc compound_datasize_test2.nc \
ncf199.nc ref_camrun.c tst_c0.cdl tst_c0_4.cdl tst_c0_4c.cdl \
tst_c0_64.cdl tst_compound_datasize_test.cdl \
tst_compound_datasize_test2.cdl tst_gattenum.nc \
tst_ncf199.cdl tst_tst_gattenum.cdl tst_tst_usuffix.cdl \
tst_usuffix.nc tst_bug324.nc nccopy3_subset_out.nc
CLEANFILES += results/*.nc results/*.dmp results/*.dmp2 tmp*.cdl \
c5.nc compound_datasize_test.nc compound_datasize_test2.nc ncf199.nc \
ref_camrun.c tst_c0.cdl tst_c0_4.cdl tst_c0_4c.cdl tst_c0_64.cdl \
tst_compound_datasize_test.cdl tst_compound_datasize_test2.cdl \
tst_gattenum.nc tst_ncf199.cdl tst_tst_gattenum.cdl \
tst_tst_usuffix.cdl tst_usuffix.nc tst_bug324.nc \
nccopy3_subset_out.nc
DISTCLEANFILES = results

388
ncdump/c0.cdl Normal file
View File

@ -0,0 +1,388 @@
netcdf c0 {
dimensions:
Dr = UNLIMITED ; // (2 currently)
D1 = 1 ;
D2 = 2 ;
D3 = 3 ;
dim-name-dashes = 4 ;
dim.name.dots = 5 ;
dim+name+plusses = 6 ;
dim@name@ats = 7;
variables:
char c ;
c:att-name-dashes = 4 ;
c:att.name.dots = 5 ;
c:att+name+plusses = 6 ;
c:att@name@ats = 7 ;
byte b ;
b:c = "" ;
short s ;
s:b = 0b, 127b, -128b, -1b ;
s:s = -32768s, 0s, 32767s ;
int i ;
i:i = -2147483647, 0, 2147483647 ;
i:f = -1.e+36f, 0.f, 1.e+36f ;
i:d = -1.e+308, 0., 1.e+308 ;
float f ;
f:c = "x" ;
double d ;
d:c = "abcd\tZ$&" ;
char cr(Dr) ;
byte br(Dr) ;
short sr(Dr) ;
int ir(Dr) ;
float fr(Dr) ;
double dr(Dr) ;
char c1(D1) ;
byte b1(D1) ;
short s1(D1) ;
int i1(D1) ;
float f1(D1) ;
double d1(D1) ;
char c2(D2) ;
byte b2(D2) ;
short s2(D2) ;
int i2(D2) ;
float f2(D2) ;
double d2(D2) ;
char c3(D3) ;
byte b3(D3) ;
short s3(D3) ;
int i3(D3) ;
float f3(D3) ;
double d3(D3) ;
char cr1(Dr, D1) ;
byte br2(Dr, D2) ;
short sr3(Dr, D3) ;
float f11(D1, D1) ;
double d12(D1, D2) ;
char c13(D1, D3) ;
short s21(D2, D1) ;
int i22(D2, D2) ;
float f23(D2, D3) ;
char c31(D3, D1) ;
byte b32(D3, D2) ;
short s33(D3, D3) ;
short sr11(Dr, D1, D1) ;
int ir12(Dr, D1, D2) ;
float fr13(Dr, D1, D3) ;
char cr21(Dr, D2, D1) ;
byte br22(Dr, D2, D2) ;
short sr23(Dr, D2, D3) ;
float fr31(Dr, D3, D1) ;
double dr32(Dr, D3, D2) ;
char cr33(Dr, D3, D3) ;
char c111(D1, D1, D1) ;
byte b112(D1, D1, D2) ;
short s113(D1, D1, D3) ;
float f121(D1, D2, D1) ;
double d122(D1, D2, D2) ;
char c123(D1, D2, D3) ;
short s131(D1, D3, D1) ;
int i132(D1, D3, D2) ;
float f133(D1, D3, D3) ;
float f211(D2, D1, D1) ;
double d212(D2, D1, D2) ;
char c213(D2, D1, D3) ;
short s221(D2, D2, D1) ;
int i222(D2, D2, D2) ;
float f223(D2, D2, D3) ;
char c231(D2, D3, D1) ;
byte b232(D2, D3, D2) ;
short s233(D2, D3, D3) ;
short s311(D3, D1, D1) ;
int i312(D3, D1, D2) ;
float f313(D3, D1, D3) ;
double var-name-dashes ;
double var.name.dots ;
double var+name+plusses ;
double var@name@ats ;
// global attributes:
:Gc = "" ;
:Gb = -128b, 127b ;
:Gs = -32768s, 0s, 32767s ;
:Gi = -2147483647, 0, 2147483647 ;
:Gf = -1.e+36f, 0.f, 1.e+36f ;
:Gd = -1.e+308, 0., 1.e+308 ;
:Gatt-name-dashes = -1 ;
:Gatt.name.dots = -2 ;
:Gatt+name+plusses = -3 ;
:Gatt@name@ats = -4 ;
data:
c = "2" ;
b = -2 ;
s = -5 ;
i = -20 ;
f = -9 ;
d = -10 ;
cr = "ab" ;
br = -128, 127 ;
sr = -32768, 32767 ;
ir = -2147483646, 2147483647 ;
fr = -1e+36, 1e+36 ;
dr = -1e+308, 1e+308 ;
c1 = "" ;
b1 = -128 ;
s1 = -32768 ;
i1 = -2147483646 ;
f1 = -1e+36 ;
d1 = -1e+308 ;
c2 = "ab" ;
b2 = -128, 127 ;
s2 = -32768, 32767 ;
i2 = -2147483646, 2147483647 ;
f2 = -1e+36, 1e+36 ;
d2 = -1e+308, 1e+308 ;
c3 = "\001\177." ;
b3 = -128, 127, -1 ;
s3 = -32768, 0, 32767 ;
i3 = -2147483646, 0, 2147483647 ;
f3 = -1e+36, 0, 1e+36 ;
d3 = -1e+308, 0, 1e+308 ;
cr1 =
"x",
"y" ;
br2 =
-24, -26,
-20, -22 ;
sr3 =
-375, -380, -385,
-350, -355, -360 ;
f11 =
-2187 ;
d12 =
-3000, -3010 ;
c13 =
"\tb\177" ;
s21 =
-375,
-350 ;
i22 =
-24000, -24020,
-23600, -23620 ;
f23 =
-2187, -2196, -2205,
-2106, -2115, -2124 ;
c31 =
"+",
"-",
" " ;
b32 =
-24, -26,
-20, -22,
-16, -18 ;
s33 =
-375, -380, -385,
-350, -355, -360,
-325, -330, -335 ;
sr11 =
2500,
2375 ;
ir12 =
640000, 639980,
632000, 631980 ;
fr13 =
26244, 26235, 26226,
25515, 25506, 25497 ;
cr21 =
"@",
"D",
"H",
"L" ;
br22 =
64, 62,
68, 66,
56, 54,
60, 58 ;
sr23 =
2500, 2495, 2490,
2525, 2520, 2515,
2375, 2370, 2365,
2400, 2395, 2390 ;
fr31 =
26244,
26325,
26406,
25515,
25596,
25677 ;
dr32 =
40000, 39990,
40100, 40090,
40200, 40190,
39000, 38990,
39100, 39090,
39200, 39190 ;
cr33 =
"1",
"two",
"3",
"4",
"5",
"six" ;
c111 =
"@" ;
b112 =
64, 62 ;
s113 =
2500, 2495, 2490 ;
f121 =
26244,
26325 ;
d122 =
40000, 39990,
40100, 40090 ;
c123 =
"one",
"2" ;
s131 =
2500,
2525,
2550 ;
i132 =
640000, 639980,
640400, 640380,
640800, 640780 ;
f133 =
26244, 26235, 26226,
26325, 26316, 26307,
26406, 26397, 26388 ;
f211 =
26244,
25515 ;
d212 =
40000, 39990,
39000, 38990 ;
c213 =
"",
"" ;
s221 =
2500,
2525,
2375,
2400 ;
i222 =
640000, 639980,
640400, 640380,
632000, 631980,
632400, 632380 ;
f223 =
26244, 26235, 26226,
26325, 26316, 26307,
25515, 25506, 25497,
25596, 25587, 25578 ;
c231 =
"@",
"D",
"H",
"H",
"L",
"P" ;
b232 =
64, 62,
68, 66,
72, 70,
56, 54,
60, 58,
64, 62 ;
s233 =
2500, 2495, 2490,
2525, 2520, 2515,
2550, 2545, 2540,
2375, 2370, 2365,
2400, 2395, 2390,
2425, 2420, 2415 ;
s311 =
2500,
2375,
2250 ;
i312 =
640000, 639980,
632000, 631980,
624000, 623980 ;
f313 =
26244, 26235, 26226,
25515, 25506, 25497,
24786, 24777, 24768 ;
var-name-dashes = -1 ;
var.name.dots = -2 ;
var+name+plusses = _ ;
var@name@ats = _;
}

File diff suppressed because it is too large Load Diff