From 9eb07d79cfaa5a147a708df832c9c9164be4c312 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sun, 27 Nov 2022 10:05:35 -0800 Subject: [PATCH] Move all command implementations into a single 'commands' directory. The original division of commands into subdirectories was fairly arbitrary, and over time it got more confusing, even to me (who made the divisions to begin with). I don't see a problem with having them in a single directory, and it will confuse me less. This commit moves them all into one place. --- doc/files.texi | 8 +- doc/flow-control.texi | 12 +- src/language/automake.mk | 21 +- src/language/{stats => commands}/aggregate.c | 6 +- src/language/{stats => commands}/aggregate.h | 0 .../apply-dictionary.c | 2 +- .../{dictionary => commands}/attributes.c | 0 src/language/commands/automake.mk | 155 +++++++++++++++ src/language/{stats => commands}/autorecode.c | 0 src/language/{stats => commands}/binomial.c | 4 +- src/language/{stats => commands}/binomial.h | 0 src/language/{utilities => commands}/cache.c | 0 src/language/{utilities => commands}/cd.c | 0 .../{stats => commands}/chart-category.h | 0 src/language/{stats => commands}/chisquare.c | 6 +- src/language/{stats => commands}/chisquare.h | 2 +- src/language/{stats => commands}/cochran.c | 4 +- src/language/{stats => commands}/cochran.h | 2 +- .../{data-io => commands}/combine-files.c | 6 +- src/language/{xforms => commands}/compute.c | 0 .../{stats => commands}/correlations.c | 2 +- src/language/{xforms => commands}/count.c | 0 src/language/{stats => commands}/crosstabs.c | 4 +- src/language/{stats => commands}/ctables.c | 2 +- src/language/{stats => commands}/ctables.inc | 0 .../{data-io => commands}/data-list.c | 10 +- .../{data-io => commands}/data-parser.c | 4 +- .../{data-io => commands}/data-parser.h | 2 +- .../{data-io => commands}/data-reader.c | 4 +- .../{data-io => commands}/data-reader.h | 0 .../{data-io => commands}/data-writer.c | 4 +- .../{data-io => commands}/data-writer.h | 0 src/language/{data-io => commands}/dataset.c | 0 src/language/{utilities => commands}/date.c | 0 src/language/{control => commands}/define.c | 0 .../delete-variables.c | 0 .../{stats => commands}/descriptives.c | 2 +- src/language/{control => commands}/do-if.c | 2 +- src/language/{utilities => commands}/echo.c | 0 src/language/{stats => commands}/examine.c | 0 src/language/{stats => commands}/factor.c | 4 +- src/language/{xforms => commands}/fail.c | 0 .../{data-io => commands}/file-handle.c | 2 +- .../{data-io => commands}/file-handle.h | 2 +- src/language/{stats => commands}/flip.c | 0 .../{dictionary => commands}/formats.c | 0 src/language/{stats => commands}/freq.c | 2 +- src/language/{stats => commands}/freq.h | 2 +- .../{stats => commands}/frequencies.c | 4 +- src/language/{stats => commands}/friedman.c | 2 +- src/language/{stats => commands}/friedman.h | 2 +- src/language/{data-io => commands}/get-data.c | 8 +- src/language/{data-io => commands}/get.c | 4 +- src/language/{stats => commands}/glm.c | 2 +- src/language/{stats => commands}/graph.c | 4 +- src/language/{utilities => commands}/host.c | 0 .../{utilities => commands}/include.c | 0 src/language/{data-io => commands}/inpt-pgm.c | 6 +- src/language/{data-io => commands}/inpt-pgm.h | 0 .../{stats => commands}/jonckheere-terpstra.c | 0 .../{stats => commands}/jonckheere-terpstra.h | 2 +- .../{stats => commands}/kruskal-wallis.c | 0 .../{stats => commands}/kruskal-wallis.h | 2 +- .../{stats => commands}/ks-one-sample.c | 6 +- .../{stats => commands}/ks-one-sample.h | 2 +- src/language/{data-io => commands}/list.c | 2 +- src/language/{stats => commands}/logistic.c | 2 +- src/language/{control => commands}/loop.c | 2 +- .../{stats => commands}/mann-whitney.c | 2 +- .../{stats => commands}/mann-whitney.h | 2 +- .../{data-io => commands}/matrix-data.c | 10 +- .../{data-io => commands}/matrix-reader.c | 0 .../{data-io => commands}/matrix-reader.h | 0 src/language/{stats => commands}/matrix.c | 6 +- src/language/{stats => commands}/mcnemar.c | 2 +- src/language/{stats => commands}/mcnemar.h | 0 src/language/{data-io => commands}/mconvert.c | 4 +- src/language/{stats => commands}/means-calc.c | 0 .../{stats => commands}/means-parser.c | 0 src/language/{stats => commands}/means.c | 0 src/language/{stats => commands}/means.h | 0 src/language/{stats => commands}/median.c | 0 src/language/{stats => commands}/median.h | 2 +- .../{dictionary => commands}/missing-values.c | 0 .../{dictionary => commands}/mrsets.c | 0 .../{stats => commands}/npar-summary.c | 2 +- .../{stats => commands}/npar-summary.h | 0 src/language/{stats => commands}/npar.c | 30 +-- src/language/{stats => commands}/npar.h | 0 .../{dictionary => commands}/numeric.c | 0 src/language/{stats => commands}/oneway.c | 2 +- src/language/{utilities => commands}/output.c | 0 .../{utilities => commands}/permissions.c | 0 .../{data-io => commands}/placement-parser.c | 2 +- .../{data-io => commands}/placement-parser.h | 2 +- .../{data-io => commands}/print-space.c | 4 +- src/language/{data-io => commands}/print.c | 6 +- .../{stats => commands}/quick-cluster.c | 0 src/language/{stats => commands}/rank.c | 2 +- src/language/{xforms => commands}/recode.c | 0 src/language/{stats => commands}/regression.c | 0 .../{stats => commands}/reliability.c | 0 .../rename-variables.c | 0 src/language/{control => commands}/repeat.c | 0 src/language/{stats => commands}/roc.c | 2 +- src/language/{stats => commands}/roc.h | 2 +- src/language/{stats => commands}/runs.c | 2 +- src/language/{stats => commands}/runs.h | 2 +- src/language/{xforms => commands}/sample.c | 0 .../{data-io => commands}/save-translate.c | 4 +- src/language/{data-io => commands}/save.c | 4 +- src/language/{xforms => commands}/select-if.c | 0 src/language/{utilities => commands}/set.c | 0 src/language/{stats => commands}/sign.c | 4 +- src/language/{stats => commands}/sign.h | 0 src/language/{stats => commands}/sort-cases.c | 2 +- .../{stats => commands}/sort-criteria.c | 2 +- .../{stats => commands}/sort-criteria.h | 0 .../{dictionary => commands}/sort-variables.c | 0 .../{dictionary => commands}/split-file.c | 2 +- .../{dictionary => commands}/split-file.h | 0 .../{dictionary => commands}/sys-file-info.c | 2 +- .../{stats => commands}/t-test-indep.c | 0 .../{stats => commands}/t-test-one-sample.c | 0 .../{stats => commands}/t-test-paired.c | 0 .../{stats => commands}/t-test-parser.c | 0 src/language/{stats => commands}/t-test.h | 0 .../{control => commands}/temporary.c | 0 src/language/{utilities => commands}/title.c | 0 src/language/{data-io => commands}/trim.c | 2 +- src/language/{data-io => commands}/trim.h | 0 .../{dictionary => commands}/value-labels.c | 0 .../variable-display.c | 0 .../{dictionary => commands}/variable-label.c | 0 .../{dictionary => commands}/vector.c | 0 .../{dictionary => commands}/weight.c | 0 src/language/{stats => commands}/wilcoxon.c | 2 +- src/language/{stats => commands}/wilcoxon.h | 2 +- src/language/control/automake.mk | 25 --- src/language/data-io/automake.mk | 47 ----- src/language/dictionary/automake.mk | 36 ---- src/language/stats/automake.mk | 89 --------- src/language/utilities/automake.mk | 30 --- src/language/xforms/automake.mk | 26 --- src/output/charts/barchart.c | 2 +- src/output/charts/piechart.h | 2 +- src/output/charts/roc-chart-cairo.c | 2 +- src/output/charts/roc-chart.c | 2 +- src/ui/gui/dummy.c | 4 +- src/ui/gui/psppire-delimited-text.c | 2 +- src/ui/gui/psppire-dialog-action-aggregate.c | 2 +- src/ui/gui/psppire-dialog-action-barchart.c | 2 +- tests/automake.mk | 180 +++++++++--------- .../{data-io => commands}/Book1.gnm.unzipped | 0 .../{data-io => commands}/add-files.at | 0 .../language/{stats => commands}/aggregate.at | 0 .../{dictionary => commands}/apply.at | 0 .../{dictionary => commands}/attributes.at | 0 .../{stats => commands}/autorecode.at | 0 .../language/{utilities => commands}/cache.at | 0 tests/language/{utilities => commands}/cd.at | 0 .../language/{xforms => commands}/compute.at | 0 .../{stats => commands}/correlations.at | 0 tests/language/{xforms => commands}/count.at | 0 .../language/{stats => commands}/crosstabs.at | 0 tests/language/{stats => commands}/ctables.at | 76 ++++---- .../{data-io => commands}/data-list.at | 0 .../{data-io => commands}/data-reader.at | 0 .../language/{data-io => commands}/dataset.at | 0 .../language/{utilities => commands}/date.at | 0 .../language/{control => commands}/define.at | 0 .../delete-variables.at | 0 .../{stats => commands}/descriptives.at | 0 tests/language/{control => commands}/do-if.at | 0 .../{control => commands}/do-repeat.at | 0 tests/language/{stats => commands}/examine.at | 0 tests/language/{stats => commands}/factor.at | 2 +- .../{data-io => commands}/file-handle.at | 0 tests/language/{stats => commands}/flip.at | 0 .../{dictionary => commands}/formats.at | 0 .../{stats => commands}/frequencies.at | 0 .../{data-io => commands}/get-data-psql.at | 0 .../get-data-spreadsheet.at | 8 +- .../{data-io => commands}/get-data-txt.at | 0 .../{data-io => commands}/get-data.at | 0 tests/language/{data-io => commands}/get.at | 0 tests/language/{stats => commands}/glm.at | 0 tests/language/{stats => commands}/graph.at | 0 .../language/{utilities => commands}/host.at | 0 .../{data-io => commands}/inpt-pgm.at | 0 .../{utilities => commands}/insert.at | 0 .../{dictionary => commands}/leave.at | 0 tests/language/{data-io => commands}/list.at | 0 tests/language/{stats => commands}/llz.zsav | Bin .../language/{stats => commands}/logistic.at | 0 tests/language/{control => commands}/loop.at | 0 .../{data-io => commands}/match-files.at | 0 .../{data-io => commands}/matrix-data.at | 0 .../{data-io => commands}/matrix-reader.at | 0 tests/language/{stats => commands}/matrix.at | 0 .../{data-io => commands}/mconvert.at | 0 tests/language/{stats => commands}/means.at | 0 .../missing-values.at | 0 .../{dictionary => commands}/mrsets.at | 0 .../language/{data-io => commands}/newone.ods | Bin tests/language/{stats => commands}/nhtsa.sav | Bin tests/language/{stats => commands}/npar.at | 0 .../{dictionary => commands}/numeric.at | 0 tests/language/{stats => commands}/oneway.at | 0 .../{utilities => commands}/output.at | 0 .../{utilities => commands}/permissions.at | 0 .../{data-io => commands}/print-space.at | 0 tests/language/{data-io => commands}/print.at | 0 .../{stats => commands}/quick-cluster.at | 0 tests/language/{stats => commands}/rank.at | 0 .../{data-io => commands}/readnames.ods | Bin tests/language/{xforms => commands}/recode.at | 0 .../{stats => commands}/regression.at | 0 .../{stats => commands}/reliability.at | 0 .../rename-variables.at | 0 tests/language/{stats => commands}/roc.at | 0 tests/language/{xforms => commands}/sample.at | 0 .../{data-io => commands}/save-translate.at | 0 tests/language/{data-io => commands}/save.at | 0 .../{xforms => commands}/select-if.at | 0 tests/language/{utilities => commands}/set.at | 0 .../language/{utilities => commands}/show.at | 0 .../{stats => commands}/sort-cases.at | 0 .../sort-variables.at | 0 .../{dictionary => commands}/split-file.at | 0 .../{dictionary => commands}/string.at | 0 .../{dictionary => commands}/sys-file-info.at | 0 tests/language/{stats => commands}/t-test.at | 0 .../{control => commands}/temporary.at | 0 tests/language/{data-io => commands}/test.ods | Bin .../language/{utilities => commands}/title.at | 0 .../language/{data-io => commands}/update.at | 0 .../{dictionary => commands}/value-labels.at | 0 .../variable-display.at | 0 .../{dictionary => commands}/vector.at | 0 .../{dictionary => commands}/weight.at | 0 241 files changed, 431 insertions(+), 544 deletions(-) rename src/language/{stats => commands}/aggregate.c (99%) rename src/language/{stats => commands}/aggregate.h (100%) rename src/language/{dictionary => commands}/apply-dictionary.c (98%) rename src/language/{dictionary => commands}/attributes.c (100%) create mode 100644 src/language/commands/automake.mk rename src/language/{stats => commands}/autorecode.c (100%) rename src/language/{stats => commands}/binomial.c (98%) rename src/language/{stats => commands}/binomial.h (100%) rename src/language/{utilities => commands}/cache.c (100%) rename src/language/{utilities => commands}/cd.c (100%) rename src/language/{stats => commands}/chart-category.h (100%) rename src/language/{stats => commands}/chisquare.c (99%) rename src/language/{stats => commands}/chisquare.h (97%) rename src/language/{stats => commands}/cochran.c (98%) rename src/language/{stats => commands}/cochran.h (96%) rename src/language/{data-io => commands}/combine-files.c (99%) rename src/language/{xforms => commands}/compute.c (100%) rename src/language/{stats => commands}/correlations.c (99%) rename src/language/{xforms => commands}/count.c (100%) rename src/language/{stats => commands}/crosstabs.c (99%) rename src/language/{stats => commands}/ctables.c (99%) rename src/language/{stats => commands}/ctables.inc (100%) rename src/language/{data-io => commands}/data-list.c (98%) rename src/language/{data-io => commands}/data-parser.c (99%) rename src/language/{data-io => commands}/data-parser.h (98%) rename src/language/{data-io => commands}/data-reader.c (99%) rename src/language/{data-io => commands}/data-reader.h (100%) rename src/language/{data-io => commands}/data-writer.c (98%) rename src/language/{data-io => commands}/data-writer.h (100%) rename src/language/{data-io => commands}/dataset.c (100%) rename src/language/{utilities => commands}/date.c (100%) rename src/language/{control => commands}/define.c (100%) rename src/language/{dictionary => commands}/delete-variables.c (100%) rename src/language/{stats => commands}/descriptives.c (99%) rename src/language/{control => commands}/do-if.c (99%) rename src/language/{utilities => commands}/echo.c (100%) rename src/language/{stats => commands}/examine.c (100%) rename src/language/{stats => commands}/factor.c (99%) rename src/language/{xforms => commands}/fail.c (100%) rename src/language/{data-io => commands}/file-handle.c (99%) rename src/language/{data-io => commands}/file-handle.h (95%) rename src/language/{stats => commands}/flip.c (100%) rename src/language/{dictionary => commands}/formats.c (100%) rename src/language/{stats => commands}/freq.c (98%) rename src/language/{stats => commands}/freq.h (98%) rename src/language/{stats => commands}/frequencies.c (99%) rename src/language/{stats => commands}/friedman.c (99%) rename src/language/{stats => commands}/friedman.h (97%) rename src/language/{data-io => commands}/get-data.c (99%) rename src/language/{data-io => commands}/get.c (98%) rename src/language/{stats => commands}/glm.c (99%) rename src/language/{stats => commands}/graph.c (99%) rename src/language/{utilities => commands}/host.c (100%) rename src/language/{utilities => commands}/include.c (100%) rename src/language/{data-io => commands}/inpt-pgm.c (98%) rename src/language/{data-io => commands}/inpt-pgm.h (100%) rename src/language/{stats => commands}/jonckheere-terpstra.c (100%) rename src/language/{stats => commands}/jonckheere-terpstra.h (97%) rename src/language/{stats => commands}/kruskal-wallis.c (100%) rename src/language/{stats => commands}/kruskal-wallis.h (97%) rename src/language/{stats => commands}/ks-one-sample.c (98%) rename src/language/{stats => commands}/ks-one-sample.h (97%) rename src/language/{data-io => commands}/list.c (99%) rename src/language/{stats => commands}/logistic.c (99%) rename src/language/{control => commands}/loop.c (99%) rename src/language/{stats => commands}/mann-whitney.c (99%) rename src/language/{stats => commands}/mann-whitney.h (96%) rename src/language/{data-io => commands}/matrix-data.c (99%) rename src/language/{data-io => commands}/matrix-reader.c (100%) rename src/language/{data-io => commands}/matrix-reader.h (100%) rename src/language/{stats => commands}/matrix.c (99%) rename src/language/{stats => commands}/mcnemar.c (99%) rename src/language/{stats => commands}/mcnemar.h (100%) rename src/language/{data-io => commands}/mconvert.c (98%) rename src/language/{stats => commands}/means-calc.c (100%) rename src/language/{stats => commands}/means-parser.c (100%) rename src/language/{stats => commands}/means.c (100%) rename src/language/{stats => commands}/means.h (100%) rename src/language/{stats => commands}/median.c (100%) rename src/language/{stats => commands}/median.h (96%) rename src/language/{dictionary => commands}/missing-values.c (100%) rename src/language/{dictionary => commands}/mrsets.c (100%) rename src/language/{stats => commands}/npar-summary.c (98%) rename src/language/{stats => commands}/npar-summary.h (100%) rename src/language/{stats => commands}/npar.c (98%) rename src/language/{stats => commands}/npar.h (100%) rename src/language/{dictionary => commands}/numeric.c (100%) rename src/language/{stats => commands}/oneway.c (99%) rename src/language/{utilities => commands}/output.c (100%) rename src/language/{utilities => commands}/permissions.c (100%) rename src/language/{data-io => commands}/placement-parser.c (99%) rename src/language/{data-io => commands}/placement-parser.h (96%) rename src/language/{data-io => commands}/print-space.c (98%) rename src/language/{data-io => commands}/print.c (99%) rename src/language/{stats => commands}/quick-cluster.c (100%) rename src/language/{stats => commands}/rank.c (99%) rename src/language/{xforms => commands}/recode.c (100%) rename src/language/{stats => commands}/regression.c (100%) rename src/language/{stats => commands}/reliability.c (100%) rename src/language/{dictionary => commands}/rename-variables.c (100%) rename src/language/{control => commands}/repeat.c (100%) rename src/language/{stats => commands}/roc.c (99%) rename src/language/{stats => commands}/roc.h (96%) rename src/language/{stats => commands}/runs.c (99%) rename src/language/{stats => commands}/runs.h (97%) rename src/language/{xforms => commands}/sample.c (100%) rename src/language/{data-io => commands}/save-translate.c (99%) rename src/language/{data-io => commands}/save.c (99%) rename src/language/{xforms => commands}/select-if.c (100%) rename src/language/{utilities => commands}/set.c (100%) rename src/language/{stats => commands}/sign.c (98%) rename src/language/{stats => commands}/sign.h (100%) rename src/language/{stats => commands}/sort-cases.c (98%) rename src/language/{stats => commands}/sort-criteria.c (98%) rename src/language/{stats => commands}/sort-criteria.h (100%) rename src/language/{dictionary => commands}/sort-variables.c (100%) rename src/language/{dictionary => commands}/split-file.c (98%) rename src/language/{dictionary => commands}/split-file.h (100%) rename src/language/{dictionary => commands}/sys-file-info.c (99%) rename src/language/{stats => commands}/t-test-indep.c (100%) rename src/language/{stats => commands}/t-test-one-sample.c (100%) rename src/language/{stats => commands}/t-test-paired.c (100%) rename src/language/{stats => commands}/t-test-parser.c (100%) rename src/language/{stats => commands}/t-test.h (100%) rename src/language/{control => commands}/temporary.c (100%) rename src/language/{utilities => commands}/title.c (100%) rename src/language/{data-io => commands}/trim.c (99%) rename src/language/{data-io => commands}/trim.h (100%) rename src/language/{dictionary => commands}/value-labels.c (100%) rename src/language/{dictionary => commands}/variable-display.c (100%) rename src/language/{dictionary => commands}/variable-label.c (100%) rename src/language/{dictionary => commands}/vector.c (100%) rename src/language/{dictionary => commands}/weight.c (100%) rename src/language/{stats => commands}/wilcoxon.c (99%) rename src/language/{stats => commands}/wilcoxon.h (97%) delete mode 100644 src/language/control/automake.mk delete mode 100644 src/language/data-io/automake.mk delete mode 100644 src/language/dictionary/automake.mk delete mode 100644 src/language/stats/automake.mk delete mode 100644 src/language/utilities/automake.mk delete mode 100644 src/language/xforms/automake.mk rename tests/language/{data-io => commands}/Book1.gnm.unzipped (100%) rename tests/language/{data-io => commands}/add-files.at (100%) rename tests/language/{stats => commands}/aggregate.at (100%) rename tests/language/{dictionary => commands}/apply.at (100%) rename tests/language/{dictionary => commands}/attributes.at (100%) rename tests/language/{stats => commands}/autorecode.at (100%) rename tests/language/{utilities => commands}/cache.at (100%) rename tests/language/{utilities => commands}/cd.at (100%) rename tests/language/{xforms => commands}/compute.at (100%) rename tests/language/{stats => commands}/correlations.at (100%) rename tests/language/{xforms => commands}/count.at (100%) rename tests/language/{stats => commands}/crosstabs.at (100%) rename tests/language/{stats => commands}/ctables.at (99%) rename tests/language/{data-io => commands}/data-list.at (100%) rename tests/language/{data-io => commands}/data-reader.at (100%) rename tests/language/{data-io => commands}/dataset.at (100%) rename tests/language/{utilities => commands}/date.at (100%) rename tests/language/{control => commands}/define.at (100%) rename tests/language/{dictionary => commands}/delete-variables.at (100%) rename tests/language/{stats => commands}/descriptives.at (100%) rename tests/language/{control => commands}/do-if.at (100%) rename tests/language/{control => commands}/do-repeat.at (100%) rename tests/language/{stats => commands}/examine.at (100%) rename tests/language/{stats => commands}/factor.at (99%) rename tests/language/{data-io => commands}/file-handle.at (100%) rename tests/language/{stats => commands}/flip.at (100%) rename tests/language/{dictionary => commands}/formats.at (100%) rename tests/language/{stats => commands}/frequencies.at (100%) rename tests/language/{data-io => commands}/get-data-psql.at (100%) rename tests/language/{data-io => commands}/get-data-spreadsheet.at (97%) rename tests/language/{data-io => commands}/get-data-txt.at (100%) rename tests/language/{data-io => commands}/get-data.at (100%) rename tests/language/{data-io => commands}/get.at (100%) rename tests/language/{stats => commands}/glm.at (100%) rename tests/language/{stats => commands}/graph.at (100%) rename tests/language/{utilities => commands}/host.at (100%) rename tests/language/{data-io => commands}/inpt-pgm.at (100%) rename tests/language/{utilities => commands}/insert.at (100%) rename tests/language/{dictionary => commands}/leave.at (100%) rename tests/language/{data-io => commands}/list.at (100%) rename tests/language/{stats => commands}/llz.zsav (100%) rename tests/language/{stats => commands}/logistic.at (100%) rename tests/language/{control => commands}/loop.at (100%) rename tests/language/{data-io => commands}/match-files.at (100%) rename tests/language/{data-io => commands}/matrix-data.at (100%) rename tests/language/{data-io => commands}/matrix-reader.at (100%) rename tests/language/{stats => commands}/matrix.at (100%) rename tests/language/{data-io => commands}/mconvert.at (100%) rename tests/language/{stats => commands}/means.at (100%) rename tests/language/{dictionary => commands}/missing-values.at (100%) rename tests/language/{dictionary => commands}/mrsets.at (100%) rename tests/language/{data-io => commands}/newone.ods (100%) rename tests/language/{stats => commands}/nhtsa.sav (100%) rename tests/language/{stats => commands}/npar.at (100%) rename tests/language/{dictionary => commands}/numeric.at (100%) rename tests/language/{stats => commands}/oneway.at (100%) rename tests/language/{utilities => commands}/output.at (100%) rename tests/language/{utilities => commands}/permissions.at (100%) rename tests/language/{data-io => commands}/print-space.at (100%) rename tests/language/{data-io => commands}/print.at (100%) rename tests/language/{stats => commands}/quick-cluster.at (100%) rename tests/language/{stats => commands}/rank.at (100%) rename tests/language/{data-io => commands}/readnames.ods (100%) rename tests/language/{xforms => commands}/recode.at (100%) rename tests/language/{stats => commands}/regression.at (100%) rename tests/language/{stats => commands}/reliability.at (100%) rename tests/language/{dictionary => commands}/rename-variables.at (100%) rename tests/language/{stats => commands}/roc.at (100%) rename tests/language/{xforms => commands}/sample.at (100%) rename tests/language/{data-io => commands}/save-translate.at (100%) rename tests/language/{data-io => commands}/save.at (100%) rename tests/language/{xforms => commands}/select-if.at (100%) rename tests/language/{utilities => commands}/set.at (100%) rename tests/language/{utilities => commands}/show.at (100%) rename tests/language/{stats => commands}/sort-cases.at (100%) rename tests/language/{dictionary => commands}/sort-variables.at (100%) rename tests/language/{dictionary => commands}/split-file.at (100%) rename tests/language/{dictionary => commands}/string.at (100%) rename tests/language/{dictionary => commands}/sys-file-info.at (100%) rename tests/language/{stats => commands}/t-test.at (100%) rename tests/language/{control => commands}/temporary.at (100%) rename tests/language/{data-io => commands}/test.ods (100%) rename tests/language/{utilities => commands}/title.at (100%) rename tests/language/{data-io => commands}/update.at (100%) rename tests/language/{dictionary => commands}/value-labels.at (100%) rename tests/language/{dictionary => commands}/variable-display.at (100%) rename tests/language/{dictionary => commands}/vector.at (100%) rename tests/language/{dictionary => commands}/weight.at (100%) diff --git a/doc/files.texi b/doc/files.texi index cc3e6dd199..5b35189e05 100644 --- a/doc/files.texi +++ b/doc/files.texi @@ -507,7 +507,7 @@ The following syntax reads a file in the format used by @samp{/etc/passwd}: @c If you change this example, change the regression test in -@c tests/language/data-io/get-data.at to match. +@c tests/language/commands/get-data.at to match. @example GET DATA /TYPE=TXT /FILE='/etc/passwd' /DELIMITERS=':' /VARIABLES=username A20 @@ -534,7 +534,7 @@ Accord 2002 26613 17900 EX 1 The following syntax can be used to read the used car data: @c If you change this example, change the regression test in -@c tests/language/data-io/get-data.at to match. +@c tests/language/commands/get-data.at to match. @example GET DATA /TYPE=TXT /FILE='cars.data' /DELIMITERS=' ' /FIRSTCASE=2 /VARIABLES=model A8 @@ -561,7 +561,7 @@ Consider the following information on animals in a pet store: The following syntax can be used to read the pet store data: @c If you change this example, change the regression test in -@c tests/language/data-io/get-data.at to match. +@c tests/language/commands/get-data.at to match. @example GET DATA /TYPE=TXT /FILE='pets.data' /DELIMITERS=', ' /QUALIFIER='''"' /ESCAPE /FIRSTCASE=3 @@ -635,7 +635,7 @@ Accord 2002 26613 17900 EX 1 The following syntax can be used to read the used car data: @c If you change this example, change the regression test in -@c tests/language/data-io/get-data.at to match. +@c tests/language/commands/get-data.at to match. @example GET DATA /TYPE=TXT /FILE='cars.data' /ARRANGEMENT=FIXED /FIRSTCASE=2 /VARIABLES=model 0-7 A diff --git a/doc/flow-control.texi b/doc/flow-control.texi index 370eddd27f..7a2c84b417 100644 --- a/doc/flow-control.texi +++ b/doc/flow-control.texi @@ -459,7 +459,7 @@ In the examples below, @samp{_} stands in for a space to make the results visible. @c Keep these examples in sync with the test for !BLANKS in -@c tests/language/control/define.at: +@c tests/language/commands/define.at: @example !BLANKS(0) @expansion{} @r{empty} !BLANKS(1) @expansion{} _ @@ -475,7 +475,7 @@ concatenation, each quoted string argument is unquoted, as if combining two (or more) tokens into a single one: @c Keep these examples in sync with the test for !CONCAT in -@c tests/language/control/define.at: +@c tests/language/commands/define.at: @example !CONCAT(x, y) @expansion{} xy !CONCAT('x', 'y') @expansion{} xy @@ -488,7 +488,7 @@ variable names from a prefix followed by a number and perhaps a suffix. For example: @c Keep these examples in sync with the test for !CONCAT in -@c tests/language/control/define.at: +@c tests/language/commands/define.at: @example !CONCAT(x, 0) @expansion{} x0 !CONCAT(x, 0, y) @expansion{} x0y @@ -500,7 +500,7 @@ part of an identifier will produce a pair of distinct tokens rather than a single one. For example: @c Keep these examples in sync with the test for !CONCAT in -@c tests/language/control/define.at: +@c tests/language/commands/define.at: @example !CONCAT(0, x) @expansion{} 0 x !CONCAT(0, x, y) @expansion{} 0 xy @@ -590,7 +590,7 @@ Expands to a number token representing the number of characters in Expands to an empty character sequence. @c Keep these examples in sync with the test for !NULL in -@c tests/language/control/define.at: +@c tests/language/commands/define.at: @example !NULL @expansion{} @r{empty} !QUOTE(!NULL) @expansion{} '' @@ -610,7 +610,7 @@ quote marks reduced to singletons. If the argument was not a quoted string, @code{!UNQUOTE} expands to the argument unchanged. @c Keep these examples in sync with the test for !QUOTE and !UNQUOTE in -@c tests/language/control/define.at: +@c tests/language/commands/define.at: @example !QUOTE(123.0) @expansion{} '123.0' !QUOTE( 123 ) @expansion{} '123' diff --git a/src/language/automake.mk b/src/language/automake.mk index 0cf8cc0010..4bde0f94f3 100644 --- a/src/language/automake.mk +++ b/src/language/automake.mk @@ -16,15 +16,10 @@ # ## Process this file with automake to produce Makefile.in -*- makefile -*- +include $(top_srcdir)/src/language/commands/automake.mk +include $(top_srcdir)/src/language/expressions/automake.mk include $(top_srcdir)/src/language/lexer/automake.mk -include $(top_srcdir)/src/language/xforms/automake.mk -include $(top_srcdir)/src/language/control/automake.mk -include $(top_srcdir)/src/language/dictionary/automake.mk include $(top_srcdir)/src/language/tests/automake.mk -include $(top_srcdir)/src/language/utilities/automake.mk -include $(top_srcdir)/src/language/stats/automake.mk -include $(top_srcdir)/src/language/data-io/automake.mk -include $(top_srcdir)/src/language/expressions/automake.mk noinst_LTLIBRARIES += src/language/liblanguage.la @@ -34,19 +29,9 @@ src_language_liblanguage_la_SOURCES = \ src/language/command.h \ src/language/command.def \ $(language_lexer_sources) \ - $(language_xforms_sources) \ - $(language_control_sources) \ - $(language_dictionary_sources) \ + $(language_commands_sources) \ $(language_tests_sources) \ - $(language_utilities_sources) \ - $(language_stats_sources) \ - $(language_data_io_sources) \ $(language_expressions_sources) - nodist_src_language_liblanguage_la_SOURCES = \ - $(src_language_data_io_built_sources) \ - $(src_language_utilities_built_sources) \ - $(src_language_stats_built_sources) \ - $(language_tests_built_sources) \ $(expressions_built_sources) diff --git a/src/language/stats/aggregate.c b/src/language/commands/aggregate.c similarity index 99% rename from src/language/stats/aggregate.c rename to src/language/commands/aggregate.c index 4edbe22f77..fac71b139e 100644 --- a/src/language/stats/aggregate.c +++ b/src/language/commands/aggregate.c @@ -16,7 +16,7 @@ #include -#include "language/stats/aggregate.h" +#include "language/commands/aggregate.h" #include @@ -34,10 +34,10 @@ #include "data/sys-file-writer.h" #include "data/variable.h" #include "language/command.h" -#include "language/data-io/file-handle.h" +#include "language/commands/file-handle.h" #include "language/lexer/lexer.h" #include "language/lexer/variable-parser.h" -#include "language/stats/sort-criteria.h" +#include "language/commands/sort-criteria.h" #include "libpspp/assertion.h" #include "libpspp/i18n.h" #include "libpspp/message.h" diff --git a/src/language/stats/aggregate.h b/src/language/commands/aggregate.h similarity index 100% rename from src/language/stats/aggregate.h rename to src/language/commands/aggregate.h diff --git a/src/language/dictionary/apply-dictionary.c b/src/language/commands/apply-dictionary.c similarity index 98% rename from src/language/dictionary/apply-dictionary.c rename to src/language/commands/apply-dictionary.c index 354a517055..fb75b3821f 100644 --- a/src/language/dictionary/apply-dictionary.c +++ b/src/language/commands/apply-dictionary.c @@ -27,7 +27,7 @@ #include "data/value-labels.h" #include "data/variable.h" #include "language/command.h" -#include "language/data-io/file-handle.h" +#include "language/commands/file-handle.h" #include "language/lexer/lexer.h" #include "libpspp/message.h" #include "libpspp/str.h" diff --git a/src/language/dictionary/attributes.c b/src/language/commands/attributes.c similarity index 100% rename from src/language/dictionary/attributes.c rename to src/language/commands/attributes.c diff --git a/src/language/commands/automake.mk b/src/language/commands/automake.mk new file mode 100644 index 0000000000..505104e489 --- /dev/null +++ b/src/language/commands/automake.mk @@ -0,0 +1,155 @@ +## Process this file with automake to produce Makefile.in -*- makefile -*- + +# PSPP - a program for statistical analysis. +# Copyright (C) 2017-2022 Free Software Foundation, Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +AM_CPPFLAGS += -I"$(top_srcdir)/src/language/commands" + +language_commands_sources = \ + src/language/commands/aggregate.c \ + src/language/commands/aggregate.h \ + src/language/commands/apply-dictionary.c \ + src/language/commands/attributes.c \ + src/language/commands/autorecode.c \ + src/language/commands/binomial.c \ + src/language/commands/binomial.h \ + src/language/commands/cache.c \ + src/language/commands/cd.c \ + src/language/commands/chart-category.h \ + src/language/commands/chisquare.c \ + src/language/commands/chisquare.h \ + src/language/commands/cochran.c \ + src/language/commands/cochran.h \ + src/language/commands/combine-files.c \ + src/language/commands/compute.c \ + src/language/commands/correlations.c \ + src/language/commands/count.c \ + src/language/commands/crosstabs.c \ + src/language/commands/ctables.c \ + src/language/commands/ctables.inc \ + src/language/commands/data-list.c \ + src/language/commands/data-parser.c \ + src/language/commands/data-parser.h \ + src/language/commands/data-reader.c \ + src/language/commands/data-reader.h \ + src/language/commands/data-writer.c \ + src/language/commands/data-writer.h \ + src/language/commands/dataset.c \ + src/language/commands/date.c \ + src/language/commands/define.c \ + src/language/commands/delete-variables.c \ + src/language/commands/descriptives.c \ + src/language/commands/do-if.c \ + src/language/commands/echo.c \ + src/language/commands/examine.c \ + src/language/commands/factor.c \ + src/language/commands/fail.c \ + src/language/commands/file-handle.c \ + src/language/commands/file-handle.h \ + src/language/commands/flip.c \ + src/language/commands/formats.c \ + src/language/commands/freq.c \ + src/language/commands/freq.h \ + src/language/commands/frequencies.c \ + src/language/commands/friedman.c \ + src/language/commands/friedman.h \ + src/language/commands/get-data.c \ + src/language/commands/get.c \ + src/language/commands/glm.c \ + src/language/commands/graph.c \ + src/language/commands/host.c \ + src/language/commands/include.c \ + src/language/commands/inpt-pgm.c \ + src/language/commands/inpt-pgm.h \ + src/language/commands/jonckheere-terpstra.c \ + src/language/commands/jonckheere-terpstra.h \ + src/language/commands/kruskal-wallis.c \ + src/language/commands/kruskal-wallis.h \ + src/language/commands/ks-one-sample.c \ + src/language/commands/ks-one-sample.h \ + src/language/commands/list.c \ + src/language/commands/logistic.c \ + src/language/commands/loop.c \ + src/language/commands/mann-whitney.c \ + src/language/commands/mann-whitney.h \ + src/language/commands/matrix-data.c \ + src/language/commands/matrix-reader.c \ + src/language/commands/matrix-reader.h \ + src/language/commands/matrix.c \ + src/language/commands/mcnemar.c \ + src/language/commands/mcnemar.h \ + src/language/commands/mconvert.c \ + src/language/commands/means-calc.c \ + src/language/commands/means-parser.c \ + src/language/commands/means.c \ + src/language/commands/means.h \ + src/language/commands/median.c \ + src/language/commands/median.h \ + src/language/commands/missing-values.c \ + src/language/commands/mrsets.c \ + src/language/commands/npar-summary.c \ + src/language/commands/npar-summary.h \ + src/language/commands/npar.c \ + src/language/commands/npar.h \ + src/language/commands/numeric.c \ + src/language/commands/oneway.c \ + src/language/commands/output.c \ + src/language/commands/permissions.c \ + src/language/commands/placement-parser.c \ + src/language/commands/placement-parser.h \ + src/language/commands/print-space.c \ + src/language/commands/print.c \ + src/language/commands/quick-cluster.c \ + src/language/commands/rank.c \ + src/language/commands/recode.c \ + src/language/commands/regression.c \ + src/language/commands/reliability.c \ + src/language/commands/rename-variables.c \ + src/language/commands/repeat.c \ + src/language/commands/roc.c \ + src/language/commands/roc.h \ + src/language/commands/runs.c \ + src/language/commands/runs.h \ + src/language/commands/sample.c \ + src/language/commands/save-translate.c \ + src/language/commands/save.c \ + src/language/commands/select-if.c \ + src/language/commands/set.c \ + src/language/commands/sign.c \ + src/language/commands/sign.h \ + src/language/commands/sort-cases.c \ + src/language/commands/sort-criteria.c \ + src/language/commands/sort-criteria.h \ + src/language/commands/sort-variables.c \ + src/language/commands/split-file.c \ + src/language/commands/split-file.h \ + src/language/commands/sys-file-info.c \ + src/language/commands/t-test-indep.c \ + src/language/commands/t-test-one-sample.c \ + src/language/commands/t-test-paired.c \ + src/language/commands/t-test-parser.c \ + src/language/commands/t-test.h \ + src/language/commands/temporary.c \ + src/language/commands/title.c \ + src/language/commands/trim.c \ + src/language/commands/trim.h \ + src/language/commands/value-labels.c \ + src/language/commands/variable-display.c \ + src/language/commands/variable-label.c \ + src/language/commands/vector.c \ + src/language/commands/weight.c \ + src/language/commands/wilcoxon.c \ + src/language/commands/wilcoxon.h diff --git a/src/language/stats/autorecode.c b/src/language/commands/autorecode.c similarity index 100% rename from src/language/stats/autorecode.c rename to src/language/commands/autorecode.c diff --git a/src/language/stats/binomial.c b/src/language/commands/binomial.c similarity index 98% rename from src/language/stats/binomial.c rename to src/language/commands/binomial.c index f2ae51513e..df443d8489 100644 --- a/src/language/stats/binomial.c +++ b/src/language/commands/binomial.c @@ -16,7 +16,7 @@ #include -#include "language/stats/binomial.h" +#include "language/commands/binomial.h" #include #include @@ -30,7 +30,7 @@ #include "data/value-labels.h" #include "data/value.h" #include "data/variable.h" -#include "language/stats/freq.h" +#include "language/commands/freq.h" #include "libpspp/assertion.h" #include "libpspp/compiler.h" #include "libpspp/message.h" diff --git a/src/language/stats/binomial.h b/src/language/commands/binomial.h similarity index 100% rename from src/language/stats/binomial.h rename to src/language/commands/binomial.h diff --git a/src/language/utilities/cache.c b/src/language/commands/cache.c similarity index 100% rename from src/language/utilities/cache.c rename to src/language/commands/cache.c diff --git a/src/language/utilities/cd.c b/src/language/commands/cd.c similarity index 100% rename from src/language/utilities/cd.c rename to src/language/commands/cd.c diff --git a/src/language/stats/chart-category.h b/src/language/commands/chart-category.h similarity index 100% rename from src/language/stats/chart-category.h rename to src/language/commands/chart-category.h diff --git a/src/language/stats/chisquare.c b/src/language/commands/chisquare.c similarity index 99% rename from src/language/stats/chisquare.c rename to src/language/commands/chisquare.c index d1d81bab39..0a5e27049f 100644 --- a/src/language/stats/chisquare.c +++ b/src/language/commands/chisquare.c @@ -16,7 +16,7 @@ #include -#include "language/stats/chisquare.h" +#include "language/commands/chisquare.h" #include #include @@ -29,8 +29,8 @@ #include "data/format.h" #include "data/value-labels.h" #include "data/variable.h" -#include "language/stats/freq.h" -#include "language/stats/npar.h" +#include "language/commands/freq.h" +#include "language/commands/npar.h" #include "libpspp/array.h" #include "libpspp/assertion.h" #include "libpspp/cast.h" diff --git a/src/language/stats/chisquare.h b/src/language/commands/chisquare.h similarity index 97% rename from src/language/stats/chisquare.h rename to src/language/commands/chisquare.h index da9329c001..a12a7608a8 100644 --- a/src/language/stats/chisquare.h +++ b/src/language/commands/chisquare.h @@ -19,7 +19,7 @@ #include #include -#include "language/stats/npar.h" +#include "language/commands/npar.h" struct chisquare_test { diff --git a/src/language/stats/cochran.c b/src/language/commands/cochran.c similarity index 98% rename from src/language/stats/cochran.c rename to src/language/commands/cochran.c index 9b03296f19..2993ea30dd 100644 --- a/src/language/stats/cochran.c +++ b/src/language/commands/cochran.c @@ -16,7 +16,7 @@ #include -#include "language/stats/cochran.h" +#include "language/commands/cochran.h" #include #include @@ -28,7 +28,7 @@ #include "data/format.h" #include "data/val-type.h" #include "data/variable.h" -#include "language/stats/npar.h" +#include "language/commands/npar.h" #include "libpspp/cast.h" #include "libpspp/message.h" #include "libpspp/misc.h" diff --git a/src/language/stats/cochran.h b/src/language/commands/cochran.h similarity index 96% rename from src/language/stats/cochran.h rename to src/language/commands/cochran.h index db42cc3c0b..645813c0d8 100644 --- a/src/language/stats/cochran.h +++ b/src/language/commands/cochran.h @@ -19,7 +19,7 @@ #include #include -#include "language/stats/npar.h" +#include "language/commands/npar.h" diff --git a/src/language/data-io/combine-files.c b/src/language/commands/combine-files.c similarity index 99% rename from src/language/data-io/combine-files.c rename to src/language/commands/combine-files.c index 3306ffec68..4c7b4661f0 100644 --- a/src/language/data-io/combine-files.c +++ b/src/language/commands/combine-files.c @@ -29,11 +29,11 @@ #include "data/subcase.h" #include "data/variable.h" #include "language/command.h" -#include "language/data-io/file-handle.h" -#include "language/data-io/trim.h" +#include "language/commands/file-handle.h" +#include "language/commands/trim.h" #include "language/lexer/lexer.h" #include "language/lexer/variable-parser.h" -#include "language/stats/sort-criteria.h" +#include "language/commands/sort-criteria.h" #include "libpspp/assertion.h" #include "libpspp/i18n.h" #include "libpspp/message.h" diff --git a/src/language/xforms/compute.c b/src/language/commands/compute.c similarity index 100% rename from src/language/xforms/compute.c rename to src/language/commands/compute.c diff --git a/src/language/stats/correlations.c b/src/language/commands/correlations.c similarity index 99% rename from src/language/stats/correlations.c rename to src/language/commands/correlations.c index 5d6e458224..e54127e1fe 100644 --- a/src/language/stats/correlations.c +++ b/src/language/commands/correlations.c @@ -27,7 +27,7 @@ #include "data/format.h" #include "data/variable.h" #include "language/command.h" -#include "language/dictionary/split-file.h" +#include "language/commands/split-file.h" #include "language/lexer/lexer.h" #include "language/lexer/variable-parser.h" #include "libpspp/assertion.h" diff --git a/src/language/xforms/count.c b/src/language/commands/count.c similarity index 100% rename from src/language/xforms/count.c rename to src/language/commands/count.c diff --git a/src/language/stats/crosstabs.c b/src/language/commands/crosstabs.c similarity index 99% rename from src/language/stats/crosstabs.c rename to src/language/commands/crosstabs.c index e7ad472caa..0182ec8a9f 100644 --- a/src/language/stats/crosstabs.c +++ b/src/language/commands/crosstabs.c @@ -41,8 +41,8 @@ #include "data/value-labels.h" #include "data/variable.h" #include "language/command.h" -#include "language/stats/freq.h" -#include "language/dictionary/split-file.h" +#include "language/commands/freq.h" +#include "language/commands/split-file.h" #include "language/lexer/lexer.h" #include "language/lexer/variable-parser.h" #include "libpspp/array.h" diff --git a/src/language/stats/ctables.c b/src/language/commands/ctables.c similarity index 99% rename from src/language/stats/ctables.c rename to src/language/commands/ctables.c index deac6e9755..9bb6e1c84f 100644 --- a/src/language/stats/ctables.c +++ b/src/language/commands/ctables.c @@ -30,7 +30,7 @@ #include "data/subcase.h" #include "data/value-labels.h" #include "language/command.h" -#include "language/dictionary/split-file.h" +#include "language/commands/split-file.h" #include "language/lexer/format-parser.h" #include "language/lexer/lexer.h" #include "language/lexer/token.h" diff --git a/src/language/stats/ctables.inc b/src/language/commands/ctables.inc similarity index 100% rename from src/language/stats/ctables.inc rename to src/language/commands/ctables.inc diff --git a/src/language/data-io/data-list.c b/src/language/commands/data-list.c similarity index 98% rename from src/language/data-io/data-list.c rename to src/language/commands/data-list.c index 6d8e388a8e..721ac2be52 100644 --- a/src/language/data-io/data-list.c +++ b/src/language/commands/data-list.c @@ -32,11 +32,11 @@ #include "data/transformations.h" #include "data/variable.h" #include "language/command.h" -#include "language/data-io/data-parser.h" -#include "language/data-io/data-reader.h" -#include "language/data-io/file-handle.h" -#include "language/data-io/inpt-pgm.h" -#include "language/data-io/placement-parser.h" +#include "language/commands/data-parser.h" +#include "language/commands/data-reader.h" +#include "language/commands/file-handle.h" +#include "language/commands/inpt-pgm.h" +#include "language/commands/placement-parser.h" #include "language/lexer/format-parser.h" #include "language/lexer/lexer.h" #include "language/lexer/variable-parser.h" diff --git a/src/language/data-io/data-parser.c b/src/language/commands/data-parser.c similarity index 99% rename from src/language/data-io/data-parser.c rename to src/language/commands/data-parser.c index 0b3e061921..09ea762fb0 100644 --- a/src/language/data-io/data-parser.c +++ b/src/language/commands/data-parser.c @@ -16,7 +16,7 @@ #include -#include "language/data-io/data-parser.h" +#include "language/commands/data-parser.h" #include #include @@ -28,7 +28,7 @@ #include "data/format.h" #include "data/file-handle-def.h" #include "data/settings.h" -#include "language/data-io/data-reader.h" +#include "language/commands/data-reader.h" #include "libpspp/intern.h" #include "libpspp/message.h" #include "libpspp/str.h" diff --git a/src/language/data-io/data-parser.h b/src/language/commands/data-parser.h similarity index 98% rename from src/language/data-io/data-parser.h rename to src/language/commands/data-parser.h index 4ae25b2cea..1ac9cbe610 100644 --- a/src/language/data-io/data-parser.h +++ b/src/language/commands/data-parser.h @@ -91,4 +91,4 @@ void data_parser_make_active_file (struct data_parser *, struct dataset *, void *ud); -#endif /* language/data-io/data-parser.h */ +#endif /* language/commands/data-parser.h */ diff --git a/src/language/data-io/data-reader.c b/src/language/commands/data-reader.c similarity index 99% rename from src/language/data-io/data-reader.c rename to src/language/commands/data-reader.c index 6e8c82bf0b..708687ceb6 100644 --- a/src/language/data-io/data-reader.c +++ b/src/language/commands/data-reader.c @@ -16,7 +16,7 @@ #include -#include "language/data-io/data-reader.h" +#include "language/commands/data-reader.h" #include #include @@ -29,7 +29,7 @@ #include "data/file-handle-def.h" #include "data/file-name.h" #include "language/command.h" -#include "language/data-io/file-handle.h" +#include "language/commands/file-handle.h" #include "language/lexer/lexer.h" #include "libpspp/assertion.h" #include "libpspp/cast.h" diff --git a/src/language/data-io/data-reader.h b/src/language/commands/data-reader.h similarity index 100% rename from src/language/data-io/data-reader.h rename to src/language/commands/data-reader.h diff --git a/src/language/data-io/data-writer.c b/src/language/commands/data-writer.c similarity index 98% rename from src/language/data-io/data-writer.c rename to src/language/commands/data-writer.c index f38bc6896d..4c4a823e23 100644 --- a/src/language/data-io/data-writer.c +++ b/src/language/commands/data-writer.c @@ -16,7 +16,7 @@ #include -#include "language/data-io/data-writer.h" +#include "language/commands/data-writer.h" #include #include @@ -26,7 +26,7 @@ #include "data/file-name.h" #include "data/make-file.h" -#include "language/data-io/file-handle.h" +#include "language/commands/file-handle.h" #include "libpspp/assertion.h" #include "libpspp/encoding-guesser.h" #include "libpspp/integer-format.h" diff --git a/src/language/data-io/data-writer.h b/src/language/commands/data-writer.h similarity index 100% rename from src/language/data-io/data-writer.h rename to src/language/commands/data-writer.h diff --git a/src/language/data-io/dataset.c b/src/language/commands/dataset.c similarity index 100% rename from src/language/data-io/dataset.c rename to src/language/commands/dataset.c diff --git a/src/language/utilities/date.c b/src/language/commands/date.c similarity index 100% rename from src/language/utilities/date.c rename to src/language/commands/date.c diff --git a/src/language/control/define.c b/src/language/commands/define.c similarity index 100% rename from src/language/control/define.c rename to src/language/commands/define.c diff --git a/src/language/dictionary/delete-variables.c b/src/language/commands/delete-variables.c similarity index 100% rename from src/language/dictionary/delete-variables.c rename to src/language/commands/delete-variables.c diff --git a/src/language/stats/descriptives.c b/src/language/commands/descriptives.c similarity index 99% rename from src/language/stats/descriptives.c rename to src/language/commands/descriptives.c index 6f78f28473..10bbbdbbde 100644 --- a/src/language/stats/descriptives.c +++ b/src/language/commands/descriptives.c @@ -30,7 +30,7 @@ #include "data/transformations.h" #include "data/variable.h" #include "language/command.h" -#include "language/dictionary/split-file.h" +#include "language/commands/split-file.h" #include "language/lexer/lexer.h" #include "language/lexer/variable-parser.h" #include "libpspp/array.h" diff --git a/src/language/control/do-if.c b/src/language/commands/do-if.c similarity index 99% rename from src/language/control/do-if.c rename to src/language/commands/do-if.c index 24a1e4f106..0d4dce1e0e 100644 --- a/src/language/control/do-if.c +++ b/src/language/commands/do-if.c @@ -21,7 +21,7 @@ #include "data/dataset.h" #include "data/transformations.h" #include "language/command.h" -#include "language/data-io/inpt-pgm.h" +#include "language/commands/inpt-pgm.h" #include "language/expressions/public.h" #include "language/lexer/lexer.h" #include "libpspp/compiler.h" diff --git a/src/language/utilities/echo.c b/src/language/commands/echo.c similarity index 100% rename from src/language/utilities/echo.c rename to src/language/commands/echo.c diff --git a/src/language/stats/examine.c b/src/language/commands/examine.c similarity index 100% rename from src/language/stats/examine.c rename to src/language/commands/examine.c diff --git a/src/language/stats/factor.c b/src/language/commands/factor.c similarity index 99% rename from src/language/stats/factor.c rename to src/language/commands/factor.c index f4e9a8a7be..3540b6899e 100644 --- a/src/language/stats/factor.c +++ b/src/language/commands/factor.c @@ -37,8 +37,8 @@ #include "language/lexer/lexer.h" #include "language/lexer/value-parser.h" #include "language/lexer/variable-parser.h" -#include "language/data-io/file-handle.h" -#include "language/data-io/matrix-reader.h" +#include "language/commands/file-handle.h" +#include "language/commands/matrix-reader.h" #include "libpspp/cast.h" #include "libpspp/message.h" #include "libpspp/misc.h" diff --git a/src/language/xforms/fail.c b/src/language/commands/fail.c similarity index 100% rename from src/language/xforms/fail.c rename to src/language/commands/fail.c diff --git a/src/language/data-io/file-handle.c b/src/language/commands/file-handle.c similarity index 99% rename from src/language/data-io/file-handle.c rename to src/language/commands/file-handle.c index 66411794fa..de797b3c92 100644 --- a/src/language/data-io/file-handle.c +++ b/src/language/commands/file-handle.c @@ -26,7 +26,7 @@ #include "data/session.h" #include "data/variable.h" #include "language/command.h" -#include "language/data-io/file-handle.h" +#include "language/commands/file-handle.h" #include "language/lexer/lexer.h" #include "libpspp/assertion.h" #include "libpspp/cast.h" diff --git a/src/language/data-io/file-handle.h b/src/language/commands/file-handle.h similarity index 95% rename from src/language/data-io/file-handle.h rename to src/language/commands/file-handle.h index e2a2b56ed3..2342735992 100644 --- a/src/language/data-io/file-handle.h +++ b/src/language/commands/file-handle.h @@ -29,4 +29,4 @@ struct session; struct file_handle *fh_parse (struct lexer *, enum fh_referent, struct session *); -#endif /* language/data-io/file-handle.h */ +#endif /* language/commands/file-handle.h */ diff --git a/src/language/stats/flip.c b/src/language/commands/flip.c similarity index 100% rename from src/language/stats/flip.c rename to src/language/commands/flip.c diff --git a/src/language/dictionary/formats.c b/src/language/commands/formats.c similarity index 100% rename from src/language/dictionary/formats.c rename to src/language/commands/formats.c diff --git a/src/language/stats/freq.c b/src/language/commands/freq.c similarity index 98% rename from src/language/stats/freq.c rename to src/language/commands/freq.c index 535b39c440..fd45e05f52 100644 --- a/src/language/stats/freq.c +++ b/src/language/commands/freq.c @@ -16,7 +16,7 @@ #include -#include "language/stats/freq.h" +#include "language/commands/freq.h" #include diff --git a/src/language/stats/freq.h b/src/language/commands/freq.h similarity index 98% rename from src/language/stats/freq.h rename to src/language/commands/freq.h index 412a46ac9f..fcb0e3f74a 100644 --- a/src/language/stats/freq.h +++ b/src/language/commands/freq.h @@ -58,4 +58,4 @@ struct freq *freq_hmap_extract (struct hmap *); -#endif /* language/stats/freq.h */ +#endif /* language/commands/freq.h */ diff --git a/src/language/stats/frequencies.c b/src/language/commands/frequencies.c similarity index 99% rename from src/language/stats/frequencies.c rename to src/language/commands/frequencies.c index 00f6633cc2..db2d821a19 100644 --- a/src/language/stats/frequencies.c +++ b/src/language/commands/frequencies.c @@ -31,12 +31,12 @@ #include "data/value-labels.h" #include "data/variable.h" -#include "language/dictionary/split-file.h" +#include "language/commands/split-file.h" #include "language/command.h" #include "language/lexer/lexer.h" #include "language/lexer/variable-parser.h" -#include "language/stats/freq.h" +#include "language/commands/freq.h" #include "libpspp/array.h" #include "libpspp/bit-vector.h" diff --git a/src/language/stats/friedman.c b/src/language/commands/friedman.c similarity index 99% rename from src/language/stats/friedman.c rename to src/language/commands/friedman.c index 55e42489f4..774c20b644 100644 --- a/src/language/stats/friedman.c +++ b/src/language/commands/friedman.c @@ -17,7 +17,7 @@ #include -#include "language/stats/friedman.h" +#include "language/commands/friedman.h" #include #include diff --git a/src/language/stats/friedman.h b/src/language/commands/friedman.h similarity index 97% rename from src/language/stats/friedman.h rename to src/language/commands/friedman.h index d6cf0036cf..59dd953ee4 100644 --- a/src/language/stats/friedman.h +++ b/src/language/commands/friedman.h @@ -19,7 +19,7 @@ #include #include -#include "language/stats/npar.h" +#include "language/commands/npar.h" struct friedman_test { diff --git a/src/language/data-io/get-data.c b/src/language/commands/get-data.c similarity index 99% rename from src/language/data-io/get-data.c rename to src/language/commands/get-data.c index f35cb2f2aa..deff70e0cc 100644 --- a/src/language/data-io/get-data.c +++ b/src/language/commands/get-data.c @@ -30,10 +30,10 @@ #include "data/psql-reader.h" #include "data/settings.h" #include "language/command.h" -#include "language/data-io/data-parser.h" -#include "language/data-io/data-reader.h" -#include "language/data-io/file-handle.h" -#include "language/data-io/placement-parser.h" +#include "language/commands/data-parser.h" +#include "language/commands/data-reader.h" +#include "language/commands/file-handle.h" +#include "language/commands/placement-parser.h" #include "language/lexer/format-parser.h" #include "language/lexer/lexer.h" #include "libpspp/cast.h" diff --git a/src/language/data-io/get.c b/src/language/commands/get.c similarity index 98% rename from src/language/data-io/get.c rename to src/language/commands/get.c index 5650b4174c..90ad2e55e6 100644 --- a/src/language/data-io/get.c +++ b/src/language/commands/get.c @@ -26,8 +26,8 @@ #include "data/dictionary.h" #include "data/por-file-writer.h" #include "language/command.h" -#include "language/data-io/file-handle.h" -#include "language/data-io/trim.h" +#include "language/commands/file-handle.h" +#include "language/commands/trim.h" #include "language/lexer/lexer.h" #include "libpspp/compiler.h" #include "libpspp/misc.h" diff --git a/src/language/stats/glm.c b/src/language/commands/glm.c similarity index 99% rename from src/language/stats/glm.c rename to src/language/commands/glm.c index 4e5732f53b..25ccb7f275 100644 --- a/src/language/stats/glm.c +++ b/src/language/commands/glm.c @@ -29,7 +29,7 @@ #include "data/format.h" #include "data/value.h" #include "language/command.h" -#include "language/dictionary/split-file.h" +#include "language/commands/split-file.h" #include "language/lexer/lexer.h" #include "language/lexer/value-parser.h" #include "language/lexer/variable-parser.h" diff --git a/src/language/stats/graph.c b/src/language/commands/graph.c similarity index 99% rename from src/language/stats/graph.c rename to src/language/commands/graph.c index 250928bd51..a035b2582f 100644 --- a/src/language/stats/graph.c +++ b/src/language/commands/graph.c @@ -55,8 +55,8 @@ #include "language/lexer/lexer.h" #include "language/lexer/value-parser.h" #include "language/lexer/variable-parser.h" -#include "language/stats/freq.h" -#include "language/stats/chart-category.h" +#include "language/commands/freq.h" +#include "language/commands/chart-category.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/utilities/host.c b/src/language/commands/host.c similarity index 100% rename from src/language/utilities/host.c rename to src/language/commands/host.c diff --git a/src/language/utilities/include.c b/src/language/commands/include.c similarity index 100% rename from src/language/utilities/include.c rename to src/language/commands/include.c diff --git a/src/language/data-io/inpt-pgm.c b/src/language/commands/inpt-pgm.c similarity index 98% rename from src/language/data-io/inpt-pgm.c rename to src/language/commands/inpt-pgm.c index 8705a187ab..a0e3bab63b 100644 --- a/src/language/data-io/inpt-pgm.c +++ b/src/language/commands/inpt-pgm.c @@ -28,9 +28,9 @@ #include "data/transformations.h" #include "data/variable.h" #include "language/command.h" -#include "language/data-io/data-reader.h" -#include "language/data-io/file-handle.h" -#include "language/data-io/inpt-pgm.h" +#include "language/commands/data-reader.h" +#include "language/commands/file-handle.h" +#include "language/commands/inpt-pgm.h" #include "language/expressions/public.h" #include "language/lexer/lexer.h" #include "libpspp/assertion.h" diff --git a/src/language/data-io/inpt-pgm.h b/src/language/commands/inpt-pgm.h similarity index 100% rename from src/language/data-io/inpt-pgm.h rename to src/language/commands/inpt-pgm.h diff --git a/src/language/stats/jonckheere-terpstra.c b/src/language/commands/jonckheere-terpstra.c similarity index 100% rename from src/language/stats/jonckheere-terpstra.c rename to src/language/commands/jonckheere-terpstra.c diff --git a/src/language/stats/jonckheere-terpstra.h b/src/language/commands/jonckheere-terpstra.h similarity index 97% rename from src/language/stats/jonckheere-terpstra.h rename to src/language/commands/jonckheere-terpstra.h index 82b560a991..6d91de7bda 100644 --- a/src/language/stats/jonckheere-terpstra.h +++ b/src/language/commands/jonckheere-terpstra.h @@ -20,7 +20,7 @@ #include #include #include "data/case.h" -#include "language/stats/npar.h" +#include "language/commands/npar.h" struct jonckheere_terpstra_test { diff --git a/src/language/stats/kruskal-wallis.c b/src/language/commands/kruskal-wallis.c similarity index 100% rename from src/language/stats/kruskal-wallis.c rename to src/language/commands/kruskal-wallis.c diff --git a/src/language/stats/kruskal-wallis.h b/src/language/commands/kruskal-wallis.h similarity index 97% rename from src/language/stats/kruskal-wallis.h rename to src/language/commands/kruskal-wallis.h index 7adc312996..06109c55d7 100644 --- a/src/language/stats/kruskal-wallis.h +++ b/src/language/commands/kruskal-wallis.h @@ -20,7 +20,7 @@ #include #include #include "data/case.h" -#include "language/stats/npar.h" +#include "language/commands/npar.h" struct kruskal_wallis_test { diff --git a/src/language/stats/ks-one-sample.c b/src/language/commands/ks-one-sample.c similarity index 98% rename from src/language/stats/ks-one-sample.c rename to src/language/commands/ks-one-sample.c index d959ad753e..f02b9309c3 100644 --- a/src/language/stats/ks-one-sample.c +++ b/src/language/commands/ks-one-sample.c @@ -16,7 +16,7 @@ #include -#include "language/stats/ks-one-sample.h" +#include "language/commands/ks-one-sample.h" #include #include @@ -31,8 +31,8 @@ #include "data/format.h" #include "data/value-labels.h" #include "data/variable.h" -#include "language/stats/freq.h" -#include "language/stats/npar.h" +#include "language/commands/freq.h" +#include "language/commands/npar.h" #include "libpspp/array.h" #include "libpspp/assertion.h" #include "libpspp/cast.h" diff --git a/src/language/stats/ks-one-sample.h b/src/language/commands/ks-one-sample.h similarity index 97% rename from src/language/stats/ks-one-sample.h rename to src/language/commands/ks-one-sample.h index e1ab07a94e..6bb827b661 100644 --- a/src/language/stats/ks-one-sample.h +++ b/src/language/commands/ks-one-sample.h @@ -19,7 +19,7 @@ #include #include -#include "language/stats/npar.h" +#include "language/commands/npar.h" enum dist { diff --git a/src/language/data-io/list.c b/src/language/commands/list.c similarity index 99% rename from src/language/data-io/list.c rename to src/language/commands/list.c index b09a4dc2f5..604f896e98 100644 --- a/src/language/data-io/list.c +++ b/src/language/commands/list.c @@ -29,7 +29,7 @@ #include "data/subcase.h" #include "data/variable.h" #include "language/command.h" -#include "language/dictionary/split-file.h" +#include "language/commands/split-file.h" #include "language/lexer/lexer.h" #include "language/lexer/variable-parser.h" #include "libpspp/compiler.h" diff --git a/src/language/stats/logistic.c b/src/language/commands/logistic.c similarity index 99% rename from src/language/stats/logistic.c rename to src/language/commands/logistic.c index 659f587ff5..5e591f34c0 100644 --- a/src/language/stats/logistic.c +++ b/src/language/commands/logistic.c @@ -55,7 +55,7 @@ #include "data/format.h" #include "data/value.h" #include "language/command.h" -#include "language/dictionary/split-file.h" +#include "language/commands/split-file.h" #include "language/lexer/lexer.h" #include "language/lexer/value-parser.h" #include "language/lexer/variable-parser.h" diff --git a/src/language/control/loop.c b/src/language/commands/loop.c similarity index 99% rename from src/language/control/loop.c rename to src/language/commands/loop.c index ed6d38dd6e..e82020ceb0 100644 --- a/src/language/control/loop.c +++ b/src/language/commands/loop.c @@ -25,7 +25,7 @@ #include "data/transformations.h" #include "data/variable.h" #include "language/command.h" -#include "language/data-io/inpt-pgm.h" +#include "language/commands/inpt-pgm.h" #include "language/expressions/public.h" #include "language/lexer/lexer.h" #include "libpspp/assertion.h" diff --git a/src/language/stats/mann-whitney.c b/src/language/commands/mann-whitney.c similarity index 99% rename from src/language/stats/mann-whitney.c rename to src/language/commands/mann-whitney.c index 2301cd13c5..954ae0f7b1 100644 --- a/src/language/stats/mann-whitney.c +++ b/src/language/commands/mann-whitney.c @@ -16,7 +16,7 @@ #include -#include "language/stats/mann-whitney.h" +#include "language/commands/mann-whitney.h" #include diff --git a/src/language/stats/mann-whitney.h b/src/language/commands/mann-whitney.h similarity index 96% rename from src/language/stats/mann-whitney.h rename to src/language/commands/mann-whitney.h index e261955889..2cb14a76c6 100644 --- a/src/language/stats/mann-whitney.h +++ b/src/language/commands/mann-whitney.h @@ -19,7 +19,7 @@ #include #include -#include "language/stats/npar.h" +#include "language/commands/npar.h" struct mann_whitney_test diff --git a/src/language/data-io/matrix-data.c b/src/language/commands/matrix-data.c similarity index 99% rename from src/language/data-io/matrix-data.c rename to src/language/commands/matrix-data.c index 920bac9cc7..cc72e7dbda 100644 --- a/src/language/data-io/matrix-data.c +++ b/src/language/commands/matrix-data.c @@ -30,11 +30,11 @@ #include "data/transformations.h" #include "data/variable.h" #include "language/command.h" -#include "language/data-io/data-parser.h" -#include "language/data-io/data-reader.h" -#include "language/data-io/file-handle.h" -#include "language/data-io/inpt-pgm.h" -#include "language/data-io/placement-parser.h" +#include "language/commands/data-parser.h" +#include "language/commands/data-reader.h" +#include "language/commands/file-handle.h" +#include "language/commands/inpt-pgm.h" +#include "language/commands/placement-parser.h" #include "language/lexer/lexer.h" #include "language/lexer/variable-parser.h" #include "libpspp/assertion.h" diff --git a/src/language/data-io/matrix-reader.c b/src/language/commands/matrix-reader.c similarity index 100% rename from src/language/data-io/matrix-reader.c rename to src/language/commands/matrix-reader.c diff --git a/src/language/data-io/matrix-reader.h b/src/language/commands/matrix-reader.h similarity index 100% rename from src/language/data-io/matrix-reader.h rename to src/language/commands/matrix-reader.h diff --git a/src/language/stats/matrix.c b/src/language/commands/matrix.c similarity index 99% rename from src/language/stats/matrix.c rename to src/language/commands/matrix.c index 073f23aacf..7ef6f3883a 100644 --- a/src/language/stats/matrix.c +++ b/src/language/commands/matrix.c @@ -38,9 +38,9 @@ #include "data/dictionary.h" #include "data/file-handle-def.h" #include "language/command.h" -#include "language/data-io/data-reader.h" -#include "language/data-io/data-writer.h" -#include "language/data-io/file-handle.h" +#include "language/commands/data-reader.h" +#include "language/commands/data-writer.h" +#include "language/commands/file-handle.h" #include "language/lexer/format-parser.h" #include "language/lexer/lexer.h" #include "language/lexer/variable-parser.h" diff --git a/src/language/stats/mcnemar.c b/src/language/commands/mcnemar.c similarity index 99% rename from src/language/stats/mcnemar.c rename to src/language/commands/mcnemar.c index a12800726d..bfb8c2939c 100644 --- a/src/language/stats/mcnemar.c +++ b/src/language/commands/mcnemar.c @@ -27,7 +27,7 @@ #include "data/format.h" #include "data/missing-values.h" #include "data/variable.h" -#include "language/stats/npar.h" +#include "language/commands/npar.h" #include "libpspp/str.h" #include "output/pivot-table.h" #include "libpspp/message.h" diff --git a/src/language/stats/mcnemar.h b/src/language/commands/mcnemar.h similarity index 100% rename from src/language/stats/mcnemar.h rename to src/language/commands/mcnemar.h diff --git a/src/language/data-io/mconvert.c b/src/language/commands/mconvert.c similarity index 98% rename from src/language/data-io/mconvert.c rename to src/language/commands/mconvert.c index 7155a3daed..79b1e77138 100644 --- a/src/language/data-io/mconvert.c +++ b/src/language/commands/mconvert.c @@ -24,8 +24,8 @@ #include "data/casewriter.h" #include "data/dataset.h" #include "data/dictionary.h" -#include "language/data-io/file-handle.h" -#include "language/data-io/matrix-reader.h" +#include "language/commands/file-handle.h" +#include "language/commands/matrix-reader.h" #include "language/lexer/lexer.h" #include "language/command.h" diff --git a/src/language/stats/means-calc.c b/src/language/commands/means-calc.c similarity index 100% rename from src/language/stats/means-calc.c rename to src/language/commands/means-calc.c diff --git a/src/language/stats/means-parser.c b/src/language/commands/means-parser.c similarity index 100% rename from src/language/stats/means-parser.c rename to src/language/commands/means-parser.c diff --git a/src/language/stats/means.c b/src/language/commands/means.c similarity index 100% rename from src/language/stats/means.c rename to src/language/commands/means.c diff --git a/src/language/stats/means.h b/src/language/commands/means.h similarity index 100% rename from src/language/stats/means.h rename to src/language/commands/means.h diff --git a/src/language/stats/median.c b/src/language/commands/median.c similarity index 100% rename from src/language/stats/median.c rename to src/language/commands/median.c diff --git a/src/language/stats/median.h b/src/language/commands/median.h similarity index 96% rename from src/language/stats/median.h rename to src/language/commands/median.h index aefa379753..ba2a25a4e3 100644 --- a/src/language/stats/median.h +++ b/src/language/commands/median.h @@ -19,7 +19,7 @@ #include #include -#include "language/stats/npar.h" +#include "language/commands/npar.h" struct median_test { diff --git a/src/language/dictionary/missing-values.c b/src/language/commands/missing-values.c similarity index 100% rename from src/language/dictionary/missing-values.c rename to src/language/commands/missing-values.c diff --git a/src/language/dictionary/mrsets.c b/src/language/commands/mrsets.c similarity index 100% rename from src/language/dictionary/mrsets.c rename to src/language/commands/mrsets.c diff --git a/src/language/stats/npar-summary.c b/src/language/commands/npar-summary.c similarity index 98% rename from src/language/stats/npar-summary.c rename to src/language/commands/npar-summary.c index e45879565b..fddf30639e 100644 --- a/src/language/stats/npar-summary.c +++ b/src/language/commands/npar-summary.c @@ -16,7 +16,7 @@ #include -#include "language/stats/npar-summary.h" +#include "language/commands/npar-summary.h" #include diff --git a/src/language/stats/npar-summary.h b/src/language/commands/npar-summary.h similarity index 100% rename from src/language/stats/npar-summary.h rename to src/language/commands/npar-summary.h diff --git a/src/language/stats/npar.c b/src/language/commands/npar.c similarity index 98% rename from src/language/stats/npar.c rename to src/language/commands/npar.c index 713c543d08..d3b357cd77 100644 --- a/src/language/stats/npar.c +++ b/src/language/commands/npar.c @@ -16,7 +16,7 @@ #include -#include "language/stats/npar.h" +#include "language/commands/npar.h" #include #include @@ -32,20 +32,20 @@ #include "language/lexer/lexer.h" #include "language/lexer/value-parser.h" #include "language/lexer/variable-parser.h" -#include "language/stats/binomial.h" -#include "language/stats/chisquare.h" -#include "language/stats/ks-one-sample.h" -#include "language/stats/cochran.h" -#include "language/stats/friedman.h" -#include "language/stats/jonckheere-terpstra.h" -#include "language/stats/kruskal-wallis.h" -#include "language/stats/mann-whitney.h" -#include "language/stats/mcnemar.h" -#include "language/stats/median.h" -#include "language/stats/npar-summary.h" -#include "language/stats/runs.h" -#include "language/stats/sign.h" -#include "language/stats/wilcoxon.h" +#include "language/commands/binomial.h" +#include "language/commands/chisquare.h" +#include "language/commands/ks-one-sample.h" +#include "language/commands/cochran.h" +#include "language/commands/friedman.h" +#include "language/commands/jonckheere-terpstra.h" +#include "language/commands/kruskal-wallis.h" +#include "language/commands/mann-whitney.h" +#include "language/commands/mcnemar.h" +#include "language/commands/median.h" +#include "language/commands/npar-summary.h" +#include "language/commands/runs.h" +#include "language/commands/sign.h" +#include "language/commands/wilcoxon.h" #include "libpspp/array.h" #include "libpspp/assertion.h" #include "libpspp/cast.h" diff --git a/src/language/stats/npar.h b/src/language/commands/npar.h similarity index 100% rename from src/language/stats/npar.h rename to src/language/commands/npar.h diff --git a/src/language/dictionary/numeric.c b/src/language/commands/numeric.c similarity index 100% rename from src/language/dictionary/numeric.c rename to src/language/commands/numeric.c diff --git a/src/language/stats/oneway.c b/src/language/commands/oneway.c similarity index 99% rename from src/language/stats/oneway.c rename to src/language/commands/oneway.c index 88a3641671..2e27697fe9 100644 --- a/src/language/stats/oneway.c +++ b/src/language/commands/oneway.c @@ -30,7 +30,7 @@ #include "data/format.h" #include "data/value.h" #include "language/command.h" -#include "language/dictionary/split-file.h" +#include "language/commands/split-file.h" #include "language/lexer/lexer.h" #include "language/lexer/value-parser.h" #include "language/lexer/variable-parser.h" diff --git a/src/language/utilities/output.c b/src/language/commands/output.c similarity index 100% rename from src/language/utilities/output.c rename to src/language/commands/output.c diff --git a/src/language/utilities/permissions.c b/src/language/commands/permissions.c similarity index 100% rename from src/language/utilities/permissions.c rename to src/language/commands/permissions.c diff --git a/src/language/data-io/placement-parser.c b/src/language/commands/placement-parser.c similarity index 99% rename from src/language/data-io/placement-parser.c rename to src/language/commands/placement-parser.c index 983bec8492..9fc4d95b58 100644 --- a/src/language/data-io/placement-parser.c +++ b/src/language/commands/placement-parser.c @@ -16,7 +16,7 @@ #include -#include "language/data-io/placement-parser.h" +#include "language/commands/placement-parser.h" #include diff --git a/src/language/data-io/placement-parser.h b/src/language/commands/placement-parser.h similarity index 96% rename from src/language/data-io/placement-parser.h rename to src/language/commands/placement-parser.h index 19711d04be..93daff98f0 100644 --- a/src/language/data-io/placement-parser.h +++ b/src/language/commands/placement-parser.h @@ -35,4 +35,4 @@ bool parse_column_range (struct lexer *, int base, int *first_column, int *last_column, bool *range_specified); -#endif /* language/data-io/placement-parser.h */ +#endif /* language/commands/placement-parser.h */ diff --git a/src/language/data-io/print-space.c b/src/language/commands/print-space.c similarity index 98% rename from src/language/data-io/print-space.c rename to src/language/commands/print-space.c index 7e2f9b58ae..c2cba8c078 100644 --- a/src/language/data-io/print-space.c +++ b/src/language/commands/print-space.c @@ -22,8 +22,8 @@ #include "data/dataset.h" #include "data/value.h" #include "language/command.h" -#include "language/data-io/data-writer.h" -#include "language/data-io/file-handle.h" +#include "language/commands/data-writer.h" +#include "language/commands/file-handle.h" #include "language/expressions/public.h" #include "language/lexer/lexer.h" #include "libpspp/message.h" diff --git a/src/language/data-io/print.c b/src/language/commands/print.c similarity index 99% rename from src/language/data-io/print.c rename to src/language/commands/print.c index 16a70d48e6..76acf143f8 100644 --- a/src/language/data-io/print.c +++ b/src/language/commands/print.c @@ -26,9 +26,9 @@ #include "data/transformations.h" #include "data/variable.h" #include "language/command.h" -#include "language/data-io/data-writer.h" -#include "language/data-io/file-handle.h" -#include "language/data-io/placement-parser.h" +#include "language/commands/data-writer.h" +#include "language/commands/file-handle.h" +#include "language/commands/placement-parser.h" #include "language/lexer/format-parser.h" #include "language/lexer/lexer.h" #include "language/lexer/variable-parser.h" diff --git a/src/language/stats/quick-cluster.c b/src/language/commands/quick-cluster.c similarity index 100% rename from src/language/stats/quick-cluster.c rename to src/language/commands/quick-cluster.c diff --git a/src/language/stats/rank.c b/src/language/commands/rank.c similarity index 99% rename from src/language/stats/rank.c rename to src/language/commands/rank.c index 901c75fa74..622354db2f 100644 --- a/src/language/stats/rank.c +++ b/src/language/commands/rank.c @@ -32,7 +32,7 @@ #include "language/command.h" #include "language/lexer/lexer.h" #include "language/lexer/variable-parser.h" -#include "language/stats/sort-criteria.h" +#include "language/commands/sort-criteria.h" #include "math/sort.h" #include "libpspp/assertion.h" #include "libpspp/i18n.h" diff --git a/src/language/xforms/recode.c b/src/language/commands/recode.c similarity index 100% rename from src/language/xforms/recode.c rename to src/language/commands/recode.c diff --git a/src/language/stats/regression.c b/src/language/commands/regression.c similarity index 100% rename from src/language/stats/regression.c rename to src/language/commands/regression.c diff --git a/src/language/stats/reliability.c b/src/language/commands/reliability.c similarity index 100% rename from src/language/stats/reliability.c rename to src/language/commands/reliability.c diff --git a/src/language/dictionary/rename-variables.c b/src/language/commands/rename-variables.c similarity index 100% rename from src/language/dictionary/rename-variables.c rename to src/language/commands/rename-variables.c diff --git a/src/language/control/repeat.c b/src/language/commands/repeat.c similarity index 100% rename from src/language/control/repeat.c rename to src/language/commands/repeat.c diff --git a/src/language/stats/roc.c b/src/language/commands/roc.c similarity index 99% rename from src/language/stats/roc.c rename to src/language/commands/roc.c index adfc5d0c88..d73f5da9f8 100644 --- a/src/language/stats/roc.c +++ b/src/language/commands/roc.c @@ -16,7 +16,7 @@ #include -#include "language/stats/roc.h" +#include "language/commands/roc.h" #include diff --git a/src/language/stats/roc.h b/src/language/commands/roc.h similarity index 96% rename from src/language/stats/roc.h rename to src/language/commands/roc.h index 5d63c96fb4..32e2c5f8d8 100644 --- a/src/language/stats/roc.h +++ b/src/language/commands/roc.h @@ -25,4 +25,4 @@ #define ROC_TN 3 #define ROC_FP 4 -#endif /* language/stats/roc.h */ +#endif /* language/commands/roc.h */ diff --git a/src/language/stats/runs.c b/src/language/commands/runs.c similarity index 99% rename from src/language/stats/runs.c rename to src/language/commands/runs.c index 8a63b29c96..b2492c16c3 100644 --- a/src/language/stats/runs.c +++ b/src/language/commands/runs.c @@ -17,7 +17,7 @@ #include -#include "language/stats/runs.h" +#include "language/commands/runs.h" #include #include diff --git a/src/language/stats/runs.h b/src/language/commands/runs.h similarity index 97% rename from src/language/stats/runs.h rename to src/language/commands/runs.h index 8dbce96cd5..f05d0f8ea4 100644 --- a/src/language/stats/runs.h +++ b/src/language/commands/runs.h @@ -19,7 +19,7 @@ #include #include -#include "language/stats/npar.h" +#include "language/commands/npar.h" enum cp_mode { diff --git a/src/language/xforms/sample.c b/src/language/commands/sample.c similarity index 100% rename from src/language/xforms/sample.c rename to src/language/commands/sample.c diff --git a/src/language/data-io/save-translate.c b/src/language/commands/save-translate.c similarity index 99% rename from src/language/data-io/save-translate.c rename to src/language/commands/save-translate.c index 29ad78ac21..25e2020c52 100644 --- a/src/language/data-io/save-translate.c +++ b/src/language/commands/save-translate.c @@ -28,8 +28,8 @@ #include "data/format.h" #include "data/settings.h" #include "language/command.h" -#include "language/data-io/file-handle.h" -#include "language/data-io/trim.h" +#include "language/commands/file-handle.h" +#include "language/commands/trim.h" #include "language/lexer/lexer.h" #include "libpspp/message.h" diff --git a/src/language/data-io/save.c b/src/language/commands/save.c similarity index 99% rename from src/language/data-io/save.c rename to src/language/commands/save.c index a445870716..ab63c52547 100644 --- a/src/language/data-io/save.c +++ b/src/language/commands/save.c @@ -31,8 +31,8 @@ #include "data/transformations.h" #include "data/variable.h" #include "language/command.h" -#include "language/data-io/file-handle.h" -#include "language/data-io/trim.h" +#include "language/commands/file-handle.h" +#include "language/commands/trim.h" #include "language/lexer/lexer.h" #include "libpspp/assertion.h" #include "libpspp/compiler.h" diff --git a/src/language/xforms/select-if.c b/src/language/commands/select-if.c similarity index 100% rename from src/language/xforms/select-if.c rename to src/language/commands/select-if.c diff --git a/src/language/utilities/set.c b/src/language/commands/set.c similarity index 100% rename from src/language/utilities/set.c rename to src/language/commands/set.c diff --git a/src/language/stats/sign.c b/src/language/commands/sign.c similarity index 98% rename from src/language/stats/sign.c rename to src/language/commands/sign.c index 32a74b20e0..d4de1a9721 100644 --- a/src/language/stats/sign.c +++ b/src/language/commands/sign.c @@ -16,7 +16,7 @@ #include -#include "language/stats/sign.h" +#include "language/commands/sign.h" #include #include @@ -27,7 +27,7 @@ #include "data/format.h" #include "data/missing-values.h" #include "data/variable.h" -#include "language/stats/npar.h" +#include "language/commands/npar.h" #include "libpspp/str.h" #include "output/pivot-table.h" diff --git a/src/language/stats/sign.h b/src/language/commands/sign.h similarity index 100% rename from src/language/stats/sign.h rename to src/language/commands/sign.h diff --git a/src/language/stats/sort-cases.c b/src/language/commands/sort-cases.c similarity index 98% rename from src/language/stats/sort-cases.c rename to src/language/commands/sort-cases.c index 41c7662413..37a1637128 100644 --- a/src/language/stats/sort-cases.c +++ b/src/language/commands/sort-cases.c @@ -26,7 +26,7 @@ #include "data/variable.h" #include "language/command.h" #include "language/lexer/lexer.h" -#include "language/stats/sort-criteria.h" +#include "language/commands/sort-criteria.h" #include "libpspp/message.h" #include "math/sort.h" diff --git a/src/language/stats/sort-criteria.c b/src/language/commands/sort-criteria.c similarity index 98% rename from src/language/stats/sort-criteria.c rename to src/language/commands/sort-criteria.c index 92c8064046..4f33fb390d 100644 --- a/src/language/stats/sort-criteria.c +++ b/src/language/commands/sort-criteria.c @@ -16,7 +16,7 @@ #include -#include "language/stats/sort-criteria.h" +#include "language/commands/sort-criteria.h" #include diff --git a/src/language/stats/sort-criteria.h b/src/language/commands/sort-criteria.h similarity index 100% rename from src/language/stats/sort-criteria.h rename to src/language/commands/sort-criteria.h diff --git a/src/language/dictionary/sort-variables.c b/src/language/commands/sort-variables.c similarity index 100% rename from src/language/dictionary/sort-variables.c rename to src/language/commands/sort-variables.c diff --git a/src/language/dictionary/split-file.c b/src/language/commands/split-file.c similarity index 98% rename from src/language/dictionary/split-file.c rename to src/language/commands/split-file.c index efb796d7d2..eea3cd510a 100644 --- a/src/language/dictionary/split-file.c +++ b/src/language/commands/split-file.c @@ -27,7 +27,7 @@ #include "data/value-labels.h" #include "data/variable.h" #include "language/command.h" -#include "language/dictionary/split-file.h" +#include "language/commands/split-file.h" #include "language/lexer/lexer.h" #include "language/lexer/variable-parser.h" #include "libpspp/message.h" diff --git a/src/language/dictionary/split-file.h b/src/language/commands/split-file.h similarity index 100% rename from src/language/dictionary/split-file.h rename to src/language/commands/split-file.h diff --git a/src/language/dictionary/sys-file-info.c b/src/language/commands/sys-file-info.c similarity index 99% rename from src/language/dictionary/sys-file-info.c rename to src/language/commands/sys-file-info.c index 3dc3752137..c3ceefb699 100644 --- a/src/language/dictionary/sys-file-info.c +++ b/src/language/commands/sys-file-info.c @@ -32,7 +32,7 @@ #include "data/variable.h" #include "data/vector.h" #include "language/command.h" -#include "language/data-io/file-handle.h" +#include "language/commands/file-handle.h" #include "language/lexer/lexer.h" #include "language/lexer/variable-parser.h" #include "libpspp/array.h" diff --git a/src/language/stats/t-test-indep.c b/src/language/commands/t-test-indep.c similarity index 100% rename from src/language/stats/t-test-indep.c rename to src/language/commands/t-test-indep.c diff --git a/src/language/stats/t-test-one-sample.c b/src/language/commands/t-test-one-sample.c similarity index 100% rename from src/language/stats/t-test-one-sample.c rename to src/language/commands/t-test-one-sample.c diff --git a/src/language/stats/t-test-paired.c b/src/language/commands/t-test-paired.c similarity index 100% rename from src/language/stats/t-test-paired.c rename to src/language/commands/t-test-paired.c diff --git a/src/language/stats/t-test-parser.c b/src/language/commands/t-test-parser.c similarity index 100% rename from src/language/stats/t-test-parser.c rename to src/language/commands/t-test-parser.c diff --git a/src/language/stats/t-test.h b/src/language/commands/t-test.h similarity index 100% rename from src/language/stats/t-test.h rename to src/language/commands/t-test.h diff --git a/src/language/control/temporary.c b/src/language/commands/temporary.c similarity index 100% rename from src/language/control/temporary.c rename to src/language/commands/temporary.c diff --git a/src/language/utilities/title.c b/src/language/commands/title.c similarity index 100% rename from src/language/utilities/title.c rename to src/language/commands/title.c diff --git a/src/language/data-io/trim.c b/src/language/commands/trim.c similarity index 99% rename from src/language/data-io/trim.c rename to src/language/commands/trim.c index fab97d5c9a..5828321f8c 100644 --- a/src/language/data-io/trim.c +++ b/src/language/commands/trim.c @@ -17,7 +17,7 @@ #include -#include "language/data-io/trim.h" +#include "language/commands/trim.h" #include diff --git a/src/language/data-io/trim.h b/src/language/commands/trim.h similarity index 100% rename from src/language/data-io/trim.h rename to src/language/commands/trim.h diff --git a/src/language/dictionary/value-labels.c b/src/language/commands/value-labels.c similarity index 100% rename from src/language/dictionary/value-labels.c rename to src/language/commands/value-labels.c diff --git a/src/language/dictionary/variable-display.c b/src/language/commands/variable-display.c similarity index 100% rename from src/language/dictionary/variable-display.c rename to src/language/commands/variable-display.c diff --git a/src/language/dictionary/variable-label.c b/src/language/commands/variable-label.c similarity index 100% rename from src/language/dictionary/variable-label.c rename to src/language/commands/variable-label.c diff --git a/src/language/dictionary/vector.c b/src/language/commands/vector.c similarity index 100% rename from src/language/dictionary/vector.c rename to src/language/commands/vector.c diff --git a/src/language/dictionary/weight.c b/src/language/commands/weight.c similarity index 100% rename from src/language/dictionary/weight.c rename to src/language/commands/weight.c diff --git a/src/language/stats/wilcoxon.c b/src/language/commands/wilcoxon.c similarity index 99% rename from src/language/stats/wilcoxon.c rename to src/language/commands/wilcoxon.c index e1fb14f015..8e3fd8193f 100644 --- a/src/language/stats/wilcoxon.c +++ b/src/language/commands/wilcoxon.c @@ -18,7 +18,7 @@ #include -#include "language/stats/wilcoxon.h" +#include "language/commands/wilcoxon.h" #include #include diff --git a/src/language/stats/wilcoxon.h b/src/language/commands/wilcoxon.h similarity index 97% rename from src/language/stats/wilcoxon.h rename to src/language/commands/wilcoxon.h index d90dc0906c..529cf56562 100644 --- a/src/language/stats/wilcoxon.h +++ b/src/language/commands/wilcoxon.h @@ -21,7 +21,7 @@ #include #include "data/case.h" -#include "language/stats/npar.h" +#include "language/commands/npar.h" struct rank_sum { diff --git a/src/language/control/automake.mk b/src/language/control/automake.mk deleted file mode 100644 index 38ecf68364..0000000000 --- a/src/language/control/automake.mk +++ /dev/null @@ -1,25 +0,0 @@ -# PSPP - a program for statistical analysis. -# Copyright (C) 2017 Free Software Foundation, Inc. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -## Process this file with automake to produce Makefile.in -*- makefile -*- - - -language_control_sources = \ - src/language/control/define.c \ - src/language/control/do-if.c \ - src/language/control/loop.c \ - src/language/control/repeat.c \ - src/language/control/temporary.c diff --git a/src/language/data-io/automake.mk b/src/language/data-io/automake.mk deleted file mode 100644 index 4116d798f3..0000000000 --- a/src/language/data-io/automake.mk +++ /dev/null @@ -1,47 +0,0 @@ -# PSPP - a program for statistical analysis. -# Copyright (C) 2017 Free Software Foundation, Inc. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -## Process this file with automake to produce Makefile.in -*- makefile -*- - -language_data_io_sources = \ - src/language/data-io/combine-files.c \ - src/language/data-io/data-list.c \ - src/language/data-io/data-parser.c \ - src/language/data-io/data-parser.h \ - src/language/data-io/data-reader.c \ - src/language/data-io/data-reader.h \ - src/language/data-io/data-writer.c \ - src/language/data-io/data-writer.h \ - src/language/data-io/dataset.c \ - src/language/data-io/file-handle.c \ - src/language/data-io/file-handle.h \ - src/language/data-io/get-data.c \ - src/language/data-io/get.c \ - src/language/data-io/inpt-pgm.c \ - src/language/data-io/inpt-pgm.h \ - src/language/data-io/list.c \ - src/language/data-io/placement-parser.c \ - src/language/data-io/placement-parser.h \ - src/language/data-io/print-space.c \ - src/language/data-io/print.c \ - src/language/data-io/matrix-data.c \ - src/language/data-io/matrix-reader.c \ - src/language/data-io/matrix-reader.h \ - src/language/data-io/mconvert.c \ - src/language/data-io/save-translate.c \ - src/language/data-io/save.c \ - src/language/data-io/trim.c \ - src/language/data-io/trim.h diff --git a/src/language/dictionary/automake.mk b/src/language/dictionary/automake.mk deleted file mode 100644 index 87553045b3..0000000000 --- a/src/language/dictionary/automake.mk +++ /dev/null @@ -1,36 +0,0 @@ -# PSPP - a program for statistical analysis. -# Copyright (C) 2017 Free Software Foundation, Inc. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -## Process this file with automake to produce Makefile.in -*- makefile -*- - -language_dictionary_sources = \ - src/language/dictionary/attributes.c \ - src/language/dictionary/apply-dictionary.c \ - src/language/dictionary/delete-variables.c \ - src/language/dictionary/formats.c \ - src/language/dictionary/missing-values.c \ - src/language/dictionary/mrsets.c \ - src/language/dictionary/numeric.c \ - src/language/dictionary/rename-variables.c \ - src/language/dictionary/sort-variables.c \ - src/language/dictionary/split-file.c \ - src/language/dictionary/split-file.h \ - src/language/dictionary/sys-file-info.c \ - src/language/dictionary/value-labels.c \ - src/language/dictionary/variable-label.c \ - src/language/dictionary/vector.c \ - src/language/dictionary/variable-display.c \ - src/language/dictionary/weight.c diff --git a/src/language/stats/automake.mk b/src/language/stats/automake.mk deleted file mode 100644 index 26284d9f5c..0000000000 --- a/src/language/stats/automake.mk +++ /dev/null @@ -1,89 +0,0 @@ -# PSPP - a program for statistical analysis. -# Copyright (C) 2017 Free Software Foundation, Inc. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -## Process this file with automake to produce Makefile.in -*- makefile -*- - -AM_CPPFLAGS += -I"$(top_srcdir)/src/language/stats" - -language_stats_sources = \ - src/language/stats/aggregate.c \ - src/language/stats/aggregate.h \ - src/language/stats/autorecode.c \ - src/language/stats/binomial.c \ - src/language/stats/binomial.h \ - src/language/stats/chart-category.h \ - src/language/stats/chisquare.c \ - src/language/stats/chisquare.h \ - src/language/stats/cochran.c \ - src/language/stats/cochran.h \ - src/language/stats/correlations.c \ - src/language/stats/crosstabs.c \ - src/language/stats/ctables.c \ - src/language/stats/ctables.inc \ - src/language/stats/descriptives.c \ - src/language/stats/examine.c \ - src/language/stats/factor.c \ - src/language/stats/flip.c \ - src/language/stats/freq.c \ - src/language/stats/freq.h \ - src/language/stats/frequencies.c \ - src/language/stats/friedman.c \ - src/language/stats/friedman.h \ - src/language/stats/glm.c \ - src/language/stats/graph.c \ - src/language/stats/kruskal-wallis.c \ - src/language/stats/kruskal-wallis.h \ - src/language/stats/ks-one-sample.c \ - src/language/stats/ks-one-sample.h \ - src/language/stats/logistic.c \ - src/language/stats/jonckheere-terpstra.c \ - src/language/stats/jonckheere-terpstra.h \ - src/language/stats/mann-whitney.c \ - src/language/stats/mann-whitney.h \ - src/language/stats/matrix.c \ - src/language/stats/means.c \ - src/language/stats/means.h \ - src/language/stats/means-calc.c \ - src/language/stats/means-parser.c \ - src/language/stats/mcnemar.c \ - src/language/stats/mcnemar.h \ - src/language/stats/median.c \ - src/language/stats/median.h \ - src/language/stats/npar.c \ - src/language/stats/npar.h \ - src/language/stats/npar-summary.c \ - src/language/stats/npar-summary.h \ - src/language/stats/oneway.c \ - src/language/stats/quick-cluster.c \ - src/language/stats/rank.c \ - src/language/stats/reliability.c \ - src/language/stats/roc.c \ - src/language/stats/roc.h \ - src/language/stats/regression.c \ - src/language/stats/runs.h \ - src/language/stats/runs.c \ - src/language/stats/sign.c \ - src/language/stats/sign.h \ - src/language/stats/sort-cases.c \ - src/language/stats/sort-criteria.c \ - src/language/stats/sort-criteria.h \ - src/language/stats/t-test.h \ - src/language/stats/t-test-indep.c \ - src/language/stats/t-test-one-sample.c \ - src/language/stats/t-test-paired.c \ - src/language/stats/t-test-parser.c \ - src/language/stats/wilcoxon.c \ - src/language/stats/wilcoxon.h diff --git a/src/language/utilities/automake.mk b/src/language/utilities/automake.mk deleted file mode 100644 index 7752792377..0000000000 --- a/src/language/utilities/automake.mk +++ /dev/null @@ -1,30 +0,0 @@ -# PSPP - a program for statistical analysis. -# Copyright (C) 2017 Free Software Foundation, Inc. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -## Process this file with automake to produce Makefile.in -*- makefile -*- - - -language_utilities_sources = \ - src/language/utilities/cache.c \ - src/language/utilities/cd.c \ - src/language/utilities/date.c \ - src/language/utilities/echo.c \ - src/language/utilities/host.c \ - src/language/utilities/set.c \ - src/language/utilities/title.c \ - src/language/utilities/include.c \ - src/language/utilities/output.c \ - src/language/utilities/permissions.c diff --git a/src/language/xforms/automake.mk b/src/language/xforms/automake.mk deleted file mode 100644 index c71489d5c0..0000000000 --- a/src/language/xforms/automake.mk +++ /dev/null @@ -1,26 +0,0 @@ -# PSPP - a program for statistical analysis. -# Copyright (C) 2017 Free Software Foundation, Inc. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -## Process this file with automake to produce Makefile.in -*- makefile -*- - - -language_xforms_sources = \ - src/language/xforms/compute.c \ - src/language/xforms/count.c \ - src/language/xforms/fail.c \ - src/language/xforms/sample.c \ - src/language/xforms/recode.c \ - src/language/xforms/select-if.c diff --git a/src/output/charts/barchart.c b/src/output/charts/barchart.c index 1b946fddff..6a8d091840 100644 --- a/src/output/charts/barchart.c +++ b/src/output/charts/barchart.c @@ -29,7 +29,7 @@ #include "gl/xalloc.h" #include "data/variable.h" #include "data/settings.h" -#include "language/stats/freq.h" +#include "language/commands/freq.h" static int diff --git a/src/output/charts/piechart.h b/src/output/charts/piechart.h index 2602c71c32..8ab2de2838 100644 --- a/src/output/charts/piechart.h +++ b/src/output/charts/piechart.h @@ -19,7 +19,7 @@ #include "libpspp/str.h" #include "output/chart.h" -#include "language/stats/freq.h" +#include "language/commands/freq.h" struct piechart { diff --git a/src/output/charts/roc-chart-cairo.c b/src/output/charts/roc-chart-cairo.c index 04e37405f1..bf6398460d 100644 --- a/src/output/charts/roc-chart-cairo.c +++ b/src/output/charts/roc-chart-cairo.c @@ -20,7 +20,7 @@ #include "data/case.h" #include "data/casereader.h" -#include "language/stats/roc.h" +#include "language/commands/roc.h" #include "output/cairo-chart.h" #include "gettext.h" diff --git a/src/output/charts/roc-chart.c b/src/output/charts/roc-chart.c index 24fb5cde44..f36389ac2a 100644 --- a/src/output/charts/roc-chart.c +++ b/src/output/charts/roc-chart.c @@ -19,7 +19,7 @@ #include "output/charts/roc-chart.h" #include "data/casereader.h" -#include "language/stats/roc.h" +#include "language/commands/roc.h" #include "output/chart-provider.h" #include "gl/xalloc.h" diff --git a/src/ui/gui/dummy.c b/src/ui/gui/dummy.c index 96586d6b02..50e0d6529a 100644 --- a/src/ui/gui/dummy.c +++ b/src/ui/gui/dummy.c @@ -33,8 +33,8 @@ #include "psppire-data-store.h" #include "t-test-options.h" -#include "src/language/stats/chart-category.h" -#include "src/language/stats/aggregate.h" +#include "src/language/commands/chart-category.h" +#include "src/language/commands/aggregate.h" const GEnumValue align[1]; const GEnumValue measure[1]; diff --git a/src/ui/gui/psppire-delimited-text.c b/src/ui/gui/psppire-delimited-text.c index 674bd86eac..a3b110494a 100644 --- a/src/ui/gui/psppire-delimited-text.c +++ b/src/ui/gui/psppire-delimited-text.c @@ -21,7 +21,7 @@ #include "psppire-delimited-text.h" #include "psppire-text-file.h" -#include "language/data-io/data-parser.h" +#include "language/commands/data-parser.h" #include "libpspp/str.h" #include "libpspp/string-array.h" #include "libpspp/i18n.h" diff --git a/src/ui/gui/psppire-dialog-action-aggregate.c b/src/ui/gui/psppire-dialog-action-aggregate.c index 33f6d78f53..a95c8c6516 100644 --- a/src/ui/gui/psppire-dialog-action-aggregate.c +++ b/src/ui/gui/psppire-dialog-action-aggregate.c @@ -21,7 +21,7 @@ #include "dialog-common.h" -#include +#include #include "psppire-var-view.h" #include "psppire-selector.h" diff --git a/src/ui/gui/psppire-dialog-action-barchart.c b/src/ui/gui/psppire-dialog-action-barchart.c index 8858e8b436..b46ba1b7dd 100644 --- a/src/ui/gui/psppire-dialog-action-barchart.c +++ b/src/ui/gui/psppire-dialog-action-barchart.c @@ -30,7 +30,7 @@ #include "psppire-dict.h" #include "libpspp/str.h" -#include "language/stats/chart-category.h" +#include "language/commands/chart-category.h" static void psppire_dialog_action_barchart_class_init (PsppireDialogActionBarchartClass *class); diff --git a/tests/automake.mk b/tests/automake.mk index d9616c9c6a..32e083e752 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -312,12 +312,12 @@ EXTRA_DIST += \ tests/data/test-decrypted.spv \ tests/data/test-encrypted.spv \ tests/language/mann-whitney.txt \ - tests/language/data-io/Book1.gnm.unzipped \ - tests/language/data-io/test.ods \ - tests/language/data-io/newone.ods \ - tests/language/data-io/readnames.ods \ - tests/language/stats/nhtsa.sav \ - tests/language/stats/llz.zsav \ + tests/language/commands/Book1.gnm.unzipped \ + tests/language/commands/test.ods \ + tests/language/commands/newone.ods \ + tests/language/commands/readnames.ods \ + tests/language/commands/nhtsa.sav \ + tests/language/commands/llz.zsav \ tests/utilities/regress.spv CLEANFILES += *.save pspp.* foo* @@ -348,95 +348,95 @@ TESTSUITE_AT = \ tests/data/sys-file.at \ tests/data/encrypted-file.at \ tests/language/command.at \ - tests/language/control/define.at \ - tests/language/control/do-if.at \ - tests/language/control/do-repeat.at \ - tests/language/control/loop.at \ - tests/language/control/temporary.at \ - tests/language/data-io/add-files.at \ - tests/language/data-io/data-list.at \ - tests/language/data-io/data-reader.at \ - tests/language/data-io/dataset.at \ - tests/language/data-io/file-handle.at \ - tests/language/data-io/get-data.at \ - tests/language/data-io/get-data-spreadsheet.at \ - tests/language/data-io/get-data-psql.at \ - tests/language/data-io/get-data-txt.at \ - tests/language/data-io/get.at \ - tests/language/data-io/inpt-pgm.at \ - tests/language/data-io/list.at \ - tests/language/data-io/match-files.at \ - tests/language/data-io/matrix-data.at \ - tests/language/data-io/matrix-reader.at \ - tests/language/data-io/mconvert.at \ - tests/language/data-io/print-space.at \ - tests/language/data-io/print.at \ - tests/language/data-io/save.at \ - tests/language/data-io/save-translate.at \ - tests/language/data-io/update.at \ - tests/language/dictionary/attributes.at \ - tests/language/dictionary/apply.at \ - tests/language/dictionary/delete-variables.at \ - tests/language/dictionary/formats.at \ - tests/language/dictionary/leave.at \ - tests/language/dictionary/missing-values.at \ - tests/language/dictionary/mrsets.at \ - tests/language/dictionary/numeric.at \ - tests/language/dictionary/rename-variables.at \ - tests/language/dictionary/sort-variables.at \ - tests/language/dictionary/split-file.at \ - tests/language/dictionary/string.at \ - tests/language/dictionary/sys-file-info.at \ - tests/language/dictionary/value-labels.at \ - tests/language/dictionary/variable-display.at \ - tests/language/dictionary/vector.at \ - tests/language/dictionary/weight.at \ - tests/language/expressions/evaluate.at \ - tests/language/expressions/parse.at \ tests/language/lexer/command-name.at \ tests/language/lexer/lexer.at \ tests/language/lexer/scan.at \ tests/language/lexer/segment.at \ tests/language/lexer/variable-parser.at \ - tests/language/stats/aggregate.at \ - tests/language/stats/autorecode.at \ - tests/language/stats/correlations.at \ - tests/language/stats/crosstabs.at \ - tests/language/stats/ctables.at \ - tests/language/stats/descriptives.at \ - tests/language/stats/examine.at \ - tests/language/stats/graph.at \ - tests/language/stats/factor.at \ - tests/language/stats/flip.at \ - tests/language/stats/frequencies.at \ - tests/language/stats/glm.at \ - tests/language/stats/logistic.at \ - tests/language/stats/matrix.at \ - tests/language/stats/means.at \ - tests/language/stats/npar.at \ - tests/language/stats/oneway.at \ - tests/language/stats/quick-cluster.at \ - tests/language/stats/rank.at \ - tests/language/stats/regression.at \ - tests/language/stats/reliability.at \ - tests/language/stats/roc.at \ - tests/language/stats/sort-cases.at \ - tests/language/stats/t-test.at \ - tests/language/utilities/cache.at \ - tests/language/utilities/cd.at \ - tests/language/utilities/date.at \ - tests/language/utilities/host.at \ - tests/language/utilities/insert.at \ - tests/language/utilities/output.at \ - tests/language/utilities/permissions.at \ - tests/language/utilities/set.at \ - tests/language/utilities/show.at \ - tests/language/utilities/title.at \ - tests/language/xforms/compute.at \ - tests/language/xforms/count.at \ - tests/language/xforms/recode.at \ - tests/language/xforms/sample.at \ - tests/language/xforms/select-if.at \ + tests/language/expressions/evaluate.at \ + tests/language/expressions/parse.at \ + tests/language/commands/add-files.at \ + tests/language/commands/aggregate.at \ + tests/language/commands/apply.at \ + tests/language/commands/attributes.at \ + tests/language/commands/autorecode.at \ + tests/language/commands/cache.at \ + tests/language/commands/cd.at \ + tests/language/commands/compute.at \ + tests/language/commands/correlations.at \ + tests/language/commands/count.at \ + tests/language/commands/crosstabs.at \ + tests/language/commands/ctables.at \ + tests/language/commands/data-list.at \ + tests/language/commands/data-reader.at \ + tests/language/commands/dataset.at \ + tests/language/commands/date.at \ + tests/language/commands/define.at \ + tests/language/commands/delete-variables.at \ + tests/language/commands/descriptives.at \ + tests/language/commands/do-if.at \ + tests/language/commands/do-repeat.at \ + tests/language/commands/examine.at \ + tests/language/commands/factor.at \ + tests/language/commands/file-handle.at \ + tests/language/commands/flip.at \ + tests/language/commands/formats.at \ + tests/language/commands/frequencies.at \ + tests/language/commands/get-data-psql.at \ + tests/language/commands/get-data-spreadsheet.at \ + tests/language/commands/get-data-txt.at \ + tests/language/commands/get-data.at \ + tests/language/commands/get.at \ + tests/language/commands/glm.at \ + tests/language/commands/graph.at \ + tests/language/commands/host.at \ + tests/language/commands/inpt-pgm.at \ + tests/language/commands/insert.at \ + tests/language/commands/leave.at \ + tests/language/commands/list.at \ + tests/language/commands/logistic.at \ + tests/language/commands/loop.at \ + tests/language/commands/match-files.at \ + tests/language/commands/matrix-data.at \ + tests/language/commands/matrix-reader.at \ + tests/language/commands/matrix.at \ + tests/language/commands/mconvert.at \ + tests/language/commands/means.at \ + tests/language/commands/missing-values.at \ + tests/language/commands/mrsets.at \ + tests/language/commands/npar.at \ + tests/language/commands/numeric.at \ + tests/language/commands/oneway.at \ + tests/language/commands/output.at \ + tests/language/commands/permissions.at \ + tests/language/commands/print-space.at \ + tests/language/commands/print.at \ + tests/language/commands/quick-cluster.at \ + tests/language/commands/rank.at \ + tests/language/commands/recode.at \ + tests/language/commands/regression.at \ + tests/language/commands/reliability.at \ + tests/language/commands/rename-variables.at \ + tests/language/commands/roc.at \ + tests/language/commands/sample.at \ + tests/language/commands/save-translate.at \ + tests/language/commands/save.at \ + tests/language/commands/select-if.at \ + tests/language/commands/set.at \ + tests/language/commands/show.at \ + tests/language/commands/sort-cases.at \ + tests/language/commands/sort-variables.at \ + tests/language/commands/split-file.at \ + tests/language/commands/string.at \ + tests/language/commands/sys-file-info.at \ + tests/language/commands/t-test.at \ + tests/language/commands/temporary.at \ + tests/language/commands/title.at \ + tests/language/commands/update.at \ + tests/language/commands/value-labels.at \ + tests/language/commands/variable-display.at \ + tests/language/commands/vector.at \ + tests/language/commands/weight.at \ tests/libpspp/abt.at \ tests/libpspp/bt.at \ tests/libpspp/encoding-guesser.at \ diff --git a/tests/language/data-io/Book1.gnm.unzipped b/tests/language/commands/Book1.gnm.unzipped similarity index 100% rename from tests/language/data-io/Book1.gnm.unzipped rename to tests/language/commands/Book1.gnm.unzipped diff --git a/tests/language/data-io/add-files.at b/tests/language/commands/add-files.at similarity index 100% rename from tests/language/data-io/add-files.at rename to tests/language/commands/add-files.at diff --git a/tests/language/stats/aggregate.at b/tests/language/commands/aggregate.at similarity index 100% rename from tests/language/stats/aggregate.at rename to tests/language/commands/aggregate.at diff --git a/tests/language/dictionary/apply.at b/tests/language/commands/apply.at similarity index 100% rename from tests/language/dictionary/apply.at rename to tests/language/commands/apply.at diff --git a/tests/language/dictionary/attributes.at b/tests/language/commands/attributes.at similarity index 100% rename from tests/language/dictionary/attributes.at rename to tests/language/commands/attributes.at diff --git a/tests/language/stats/autorecode.at b/tests/language/commands/autorecode.at similarity index 100% rename from tests/language/stats/autorecode.at rename to tests/language/commands/autorecode.at diff --git a/tests/language/utilities/cache.at b/tests/language/commands/cache.at similarity index 100% rename from tests/language/utilities/cache.at rename to tests/language/commands/cache.at diff --git a/tests/language/utilities/cd.at b/tests/language/commands/cd.at similarity index 100% rename from tests/language/utilities/cd.at rename to tests/language/commands/cd.at diff --git a/tests/language/xforms/compute.at b/tests/language/commands/compute.at similarity index 100% rename from tests/language/xforms/compute.at rename to tests/language/commands/compute.at diff --git a/tests/language/stats/correlations.at b/tests/language/commands/correlations.at similarity index 100% rename from tests/language/stats/correlations.at rename to tests/language/commands/correlations.at diff --git a/tests/language/xforms/count.at b/tests/language/commands/count.at similarity index 100% rename from tests/language/xforms/count.at rename to tests/language/commands/count.at diff --git a/tests/language/stats/crosstabs.at b/tests/language/commands/crosstabs.at similarity index 100% rename from tests/language/stats/crosstabs.at rename to tests/language/commands/crosstabs.at diff --git a/tests/language/stats/ctables.at b/tests/language/commands/ctables.at similarity index 99% rename from tests/language/stats/ctables.at rename to tests/language/commands/ctables.at index ddccbfe3a2..9337cacf6f 100644 --- a/tests/language/stats/ctables.at +++ b/tests/language/commands/ctables.at @@ -49,7 +49,7 @@ dnl - CATEGORIES: dnl * Data-dependent sorting. AT_SETUP([CTABLES parsing]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES @@ -118,7 +118,7 @@ RDD AT_CLEANUP AT_SETUP([CTABLES parsing - negative]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES. @@ -711,7 +711,7 @@ specification as format DATETIME: Day (123) must be between 1 and 31.. AT_CLEANUP AT_SETUP([CTABLES parsing - more negative]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES /PCOMPUTE &pc=EXPR(SUBTOTAL) /TABLE qn1 /CATEGORIES VARIABLES=qn1 [&pc]. @@ -900,7 +900,7 @@ ctables.sps:36.10-36.15: note: CTABLES: TABLE must appear before this subcommand AT_CLEANUP AT_SETUP([CTABLES one categorical variable]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES /TABLE qn1. @@ -943,7 +943,7 @@ Every day AT_CLEANUP AT_SETUP([CTABLES one string variable]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. STRING licensed(A8). @@ -1033,7 +1033,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode -O width=80], [0], [dnl AT_CLEANUP AT_SETUP([CTABLES one scale variable]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. DESCRIPTIVES qnd1. @@ -1081,7 +1081,7 @@ AT_CLEANUP AT_SETUP([CTABLES simple stacking]) AT_KEYWORDS([stack stacked]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES /TABLE qn105ba + qn105bb + qn105bc + qn105bd BY qns3a [COLPCT PCT8.0]. @@ -1140,7 +1140,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode -O width=80], [0], [dnl AT_CLEANUP AT_SETUP([CTABLES show or hide empty categories]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. IF (qn105ba = 2) qn105ba = 1. @@ -1235,7 +1235,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode -O width=80], [0], [dnl AT_CLEANUP AT_SETUP([CTABLES categories and EMPTY]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], DATA LIST LIST NOTABLE /class datum size. BEGIN DATA @@ -1296,7 +1296,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode -O width=80], [0], [dnl AT_CLEANUP AT_SETUP([CTABLES sorting categories]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. IF (QND5A=6) QND5A=-1. @@ -1379,7 +1379,7 @@ AT_CLEANUP AT_SETUP([CTABLES simple nesting]) AT_KEYWORDS([nest nested]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES /TABLE (qn105ba + qn105bb + qn105bc + qn105bd) > qns3a [COUNT, TABLEPCT PCT8.0] @@ -1584,7 +1584,7 @@ AT_CLEANUP AT_SETUP([CTABLES nesting and scale variables]) AT_KEYWORDS([nest nested]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES /TABLE=qnd1 > qn1 BY qns3a. @@ -1703,7 +1703,7 @@ AT_CLEANUP AT_SETUP([CTABLES SLABELS]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES /TABLE qn1 [COUNT COLPCT]. @@ -1766,7 +1766,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode -O width=80], [0], [dnl AT_CLEANUP AT_SETUP([CTABLES SLABELS with stacking different summaries]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES @@ -1839,7 +1839,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode -O width=80], [0], [dnl AT_CLEANUP AT_SETUP([CTABLES simple totals]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES /TABLE=qn17 @@ -1904,7 +1904,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode -O width=80], [0], [dnl AT_CLEANUP AT_SETUP([CTABLES subtotals]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES /TABLE=qn105ba BY qns1 @@ -1986,7 +1986,7 @@ AT_CLEANUP AT_SETUP([CTABLES PCOMPUTE]) AT_KEYWORDS([postcompute]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES @@ -2058,7 +2058,7 @@ AT_CLEANUP AT_SETUP([CTABLES PCOMPUTE - OTHERNM and MISSING]) AT_KEYWORDS([postcompute]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES @@ -2095,7 +2095,7 @@ AT_CLEANUP AT_SETUP([CTABLES PCOMPUTE - THRU]) AT_KEYWORDS([postcompute]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES @@ -2250,7 +2250,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode -O width=120], [0], [dnl AT_CLEANUP AT_SETUP([CTABLES CLABELS]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES /TABLE AgeGroup BY qns3a. @@ -2755,7 +2755,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode -O width=120], [0], [dnl AT_CLEANUP AT_SETUP([CTABLES VLABELS - variables on different axes]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES /VLABELS VARIABLES=qns3a qnd5a DISPLAY=DEFAULT /TABLE qnd5a BY qns3a. @@ -2861,7 +2861,7 @@ AT_CLEANUP AT_SETUP([CTABLES VLABELS - stacked variables]) AT_KEYWORDS([stack stacking]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES /VLABELS VARIABLES=qns3a DISPLAY=NAME /TABLE qnd5a + qns3a. @@ -2969,7 +2969,7 @@ AT_CLEANUP AT_SETUP([CTABLES VLABELS - nested variables]) AT_KEYWORDS([nest nesting]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES /VLABELS VARIABLES=qns3a DISPLAY=NAME /TABLE qnd5a > qns3a. @@ -3127,7 +3127,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode], [0], [dnl AT_CLEANUP AT_SETUP([CTABLES FORMAT EMPTY]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES /FORMAT EMPTY=ZERO /TABLE qnd5a BY qnd5. @@ -3204,7 +3204,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode], [0], [dnl AT_CLEANUP AT_SETUP([CTABLES FORMAT MISSING]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES /FORMAT MISSING='(no data)' /TABLE qnd5a[COLPCT] BY qnd5. @@ -3235,7 +3235,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode], [0], [dnl AT_CLEANUP AT_SETUP([CTABLES HIDESMALLCOUNTS]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES /TABLE qn38[c][COUNT, COLPCT]. @@ -3327,7 +3327,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode], [0], [dnl AT_CLEANUP AT_SETUP([CTABLES FORMAT MINCOLWIDTH MAXCOLWIDTH]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES /FORMAT MINCOLWIDTH=1 MAXCOLWIDTH=2 UNITS=INCHES /TABLE BY qns3a. @@ -3353,7 +3353,7 @@ AT_CLEANUP AT_SETUP([CTABLES special formats]) AT_KEYWORDS([NEGPAREN NEQUAL PAREN PCTPAREN]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. COMPUTE x = qnd3 - 4. @@ -3370,7 +3370,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode], [0], [dnl AT_CLEANUP AT_SETUP([CTABLES TITLES]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES @@ -3409,7 +3409,7 @@ Generated HH:MM:SS on MM/DD/YY AT_CLEANUP AT_SETUP([CTABLES area definitions]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES @@ -3578,7 +3578,7 @@ AT_CLEANUP AT_SETUP([CTABLES area definitions with CLABELS ROWLABELS=OPPOSITE]) AT_KEYWORDS([ROWLABELS OPPOSITE]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES @@ -3786,7 +3786,7 @@ AT_CLEANUP AT_SETUP([CTABLES area definitions with CLABELS COLLABELS=OPPOSITE]) AT_KEYWORDS([COLLABELS OPPOSITE]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES @@ -4210,7 +4210,7 @@ AT_CLEANUP AT_SETUP([CTABLES area definitions with CLABELS ROWLABELS=LAYER]) AT_KEYWORDS([ROWLABELS LAYER]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES @@ -4594,7 +4594,7 @@ AT_CLEANUP AT_SETUP([CTABLES area definitions with CLABELS COLLABELS=LAYER]) AT_KEYWORDS([COLLABELS LAYER]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES @@ -5113,7 +5113,7 @@ No AT_CLEANUP AT_SETUP([CTABLES categorical summary functions]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES @@ -5178,7 +5178,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode -O width=120], [0], [dnl AT_CLEANUP AT_SETUP([CTABLES scale summary functions]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. SET TVAR=NAME. @@ -5460,7 +5460,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode -O width=120], [0], [dnl AT_CLEANUP AT_SETUP([CTABLES hidden scale VLABELS]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. CTABLES @@ -5548,7 +5548,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode], [0], [dnl AT_CLEANUP AT_SETUP([CTABLES with SPLIT FILE]) -AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .]) +AT_CHECK([ln $top_srcdir/tests/language/commands/nhtsa.sav . || cp $top_srcdir/tests/language/commands/nhtsa.sav .]) AT_DATA([ctables.sps], [[GET 'nhtsa.sav'. diff --git a/tests/language/data-io/data-list.at b/tests/language/commands/data-list.at similarity index 100% rename from tests/language/data-io/data-list.at rename to tests/language/commands/data-list.at diff --git a/tests/language/data-io/data-reader.at b/tests/language/commands/data-reader.at similarity index 100% rename from tests/language/data-io/data-reader.at rename to tests/language/commands/data-reader.at diff --git a/tests/language/data-io/dataset.at b/tests/language/commands/dataset.at similarity index 100% rename from tests/language/data-io/dataset.at rename to tests/language/commands/dataset.at diff --git a/tests/language/utilities/date.at b/tests/language/commands/date.at similarity index 100% rename from tests/language/utilities/date.at rename to tests/language/commands/date.at diff --git a/tests/language/control/define.at b/tests/language/commands/define.at similarity index 100% rename from tests/language/control/define.at rename to tests/language/commands/define.at diff --git a/tests/language/dictionary/delete-variables.at b/tests/language/commands/delete-variables.at similarity index 100% rename from tests/language/dictionary/delete-variables.at rename to tests/language/commands/delete-variables.at diff --git a/tests/language/stats/descriptives.at b/tests/language/commands/descriptives.at similarity index 100% rename from tests/language/stats/descriptives.at rename to tests/language/commands/descriptives.at diff --git a/tests/language/control/do-if.at b/tests/language/commands/do-if.at similarity index 100% rename from tests/language/control/do-if.at rename to tests/language/commands/do-if.at diff --git a/tests/language/control/do-repeat.at b/tests/language/commands/do-repeat.at similarity index 100% rename from tests/language/control/do-repeat.at rename to tests/language/commands/do-repeat.at diff --git a/tests/language/stats/examine.at b/tests/language/commands/examine.at similarity index 100% rename from tests/language/stats/examine.at rename to tests/language/commands/examine.at diff --git a/tests/language/stats/factor.at b/tests/language/commands/factor.at similarity index 99% rename from tests/language/stats/factor.at rename to tests/language/commands/factor.at index 972bf633eb..c7d581ebee 100644 --- a/tests/language/stats/factor.at +++ b/tests/language/commands/factor.at @@ -1960,7 +1960,7 @@ factor /rotation promax (5). ]) -AT_CHECK([ln -s $top_srcdir/tests/language/stats/llz.zsav .], [0], [ignore]) +AT_CHECK([ln -s $top_srcdir/tests/language/commands/llz.zsav .], [0], [ignore]) AT_CHECK([pspp -O format=csv factor-promax.sps], [0], [dnl Table: Communalities diff --git a/tests/language/data-io/file-handle.at b/tests/language/commands/file-handle.at similarity index 100% rename from tests/language/data-io/file-handle.at rename to tests/language/commands/file-handle.at diff --git a/tests/language/stats/flip.at b/tests/language/commands/flip.at similarity index 100% rename from tests/language/stats/flip.at rename to tests/language/commands/flip.at diff --git a/tests/language/dictionary/formats.at b/tests/language/commands/formats.at similarity index 100% rename from tests/language/dictionary/formats.at rename to tests/language/commands/formats.at diff --git a/tests/language/stats/frequencies.at b/tests/language/commands/frequencies.at similarity index 100% rename from tests/language/stats/frequencies.at rename to tests/language/commands/frequencies.at diff --git a/tests/language/data-io/get-data-psql.at b/tests/language/commands/get-data-psql.at similarity index 100% rename from tests/language/data-io/get-data-psql.at rename to tests/language/commands/get-data-psql.at diff --git a/tests/language/data-io/get-data-spreadsheet.at b/tests/language/commands/get-data-spreadsheet.at similarity index 97% rename from tests/language/data-io/get-data-spreadsheet.at rename to tests/language/commands/get-data-spreadsheet.at index cf380da1f3..2fbb11ef0f 100644 --- a/tests/language/data-io/get-data-spreadsheet.at +++ b/tests/language/commands/get-data-spreadsheet.at @@ -17,11 +17,11 @@ dnl m4_define([SPREADSHEET_TEST_PREP],[dnl AT_KEYWORDS([spreadsheet]) m4_if($1,[GNM],[dnl - AT_CHECK([gzip -c $top_srcdir/tests/language/data-io/Book1.gnm.unzipped > Book1.gnumeric])dnl + AT_CHECK([gzip -c $top_srcdir/tests/language/commands/Book1.gnm.unzipped > Book1.gnumeric])dnl m4_define([testsheet],[Book1.gnumeric])dnl ]) dnl m4_if($1,[ODS],[dnl - AT_CHECK([cp $top_srcdir/tests/language/data-io/test.ods test.ods])dnl + AT_CHECK([cp $top_srcdir/tests/language/commands/test.ods test.ods])dnl m4_define([testsheet],[test.ods])dnl ])dnl ]) @@ -382,7 +382,7 @@ AT_SETUP([GET DATA /TYPE=ODS crash]) AT_KEYWORDS([spreadsheet]) -AT_CHECK([cp $top_srcdir/tests/language/data-io/newone.ods this.ods])dnl +AT_CHECK([cp $top_srcdir/tests/language/commands/newone.ods this.ods])dnl AT_DATA([crash.sps],[dnl GET DATA /TYPE=ODS /FILE='this.ods' /CELLRANGE=RANGE 'A1:C8' /READNAMES=ON @@ -399,7 +399,7 @@ AT_KEYWORDS([spreadsheet]) dnl Check for a bug where in the ODS reader /READNAMES incorrectly dnl dealt with repeated names. -AT_CHECK([cp $top_srcdir/tests/language/data-io/readnames.ods this.ods])dnl +AT_CHECK([cp $top_srcdir/tests/language/commands/readnames.ods this.ods])dnl AT_DATA([readnames.sps],[dnl GET DATA /TYPE=ODS /FILE='this.ods' /CELLRANGE=RANGE 'A1:H8' /READNAMES=ON diff --git a/tests/language/data-io/get-data-txt.at b/tests/language/commands/get-data-txt.at similarity index 100% rename from tests/language/data-io/get-data-txt.at rename to tests/language/commands/get-data-txt.at diff --git a/tests/language/data-io/get-data.at b/tests/language/commands/get-data.at similarity index 100% rename from tests/language/data-io/get-data.at rename to tests/language/commands/get-data.at diff --git a/tests/language/data-io/get.at b/tests/language/commands/get.at similarity index 100% rename from tests/language/data-io/get.at rename to tests/language/commands/get.at diff --git a/tests/language/stats/glm.at b/tests/language/commands/glm.at similarity index 100% rename from tests/language/stats/glm.at rename to tests/language/commands/glm.at diff --git a/tests/language/stats/graph.at b/tests/language/commands/graph.at similarity index 100% rename from tests/language/stats/graph.at rename to tests/language/commands/graph.at diff --git a/tests/language/utilities/host.at b/tests/language/commands/host.at similarity index 100% rename from tests/language/utilities/host.at rename to tests/language/commands/host.at diff --git a/tests/language/data-io/inpt-pgm.at b/tests/language/commands/inpt-pgm.at similarity index 100% rename from tests/language/data-io/inpt-pgm.at rename to tests/language/commands/inpt-pgm.at diff --git a/tests/language/utilities/insert.at b/tests/language/commands/insert.at similarity index 100% rename from tests/language/utilities/insert.at rename to tests/language/commands/insert.at diff --git a/tests/language/dictionary/leave.at b/tests/language/commands/leave.at similarity index 100% rename from tests/language/dictionary/leave.at rename to tests/language/commands/leave.at diff --git a/tests/language/data-io/list.at b/tests/language/commands/list.at similarity index 100% rename from tests/language/data-io/list.at rename to tests/language/commands/list.at diff --git a/tests/language/stats/llz.zsav b/tests/language/commands/llz.zsav similarity index 100% rename from tests/language/stats/llz.zsav rename to tests/language/commands/llz.zsav diff --git a/tests/language/stats/logistic.at b/tests/language/commands/logistic.at similarity index 100% rename from tests/language/stats/logistic.at rename to tests/language/commands/logistic.at diff --git a/tests/language/control/loop.at b/tests/language/commands/loop.at similarity index 100% rename from tests/language/control/loop.at rename to tests/language/commands/loop.at diff --git a/tests/language/data-io/match-files.at b/tests/language/commands/match-files.at similarity index 100% rename from tests/language/data-io/match-files.at rename to tests/language/commands/match-files.at diff --git a/tests/language/data-io/matrix-data.at b/tests/language/commands/matrix-data.at similarity index 100% rename from tests/language/data-io/matrix-data.at rename to tests/language/commands/matrix-data.at diff --git a/tests/language/data-io/matrix-reader.at b/tests/language/commands/matrix-reader.at similarity index 100% rename from tests/language/data-io/matrix-reader.at rename to tests/language/commands/matrix-reader.at diff --git a/tests/language/stats/matrix.at b/tests/language/commands/matrix.at similarity index 100% rename from tests/language/stats/matrix.at rename to tests/language/commands/matrix.at diff --git a/tests/language/data-io/mconvert.at b/tests/language/commands/mconvert.at similarity index 100% rename from tests/language/data-io/mconvert.at rename to tests/language/commands/mconvert.at diff --git a/tests/language/stats/means.at b/tests/language/commands/means.at similarity index 100% rename from tests/language/stats/means.at rename to tests/language/commands/means.at diff --git a/tests/language/dictionary/missing-values.at b/tests/language/commands/missing-values.at similarity index 100% rename from tests/language/dictionary/missing-values.at rename to tests/language/commands/missing-values.at diff --git a/tests/language/dictionary/mrsets.at b/tests/language/commands/mrsets.at similarity index 100% rename from tests/language/dictionary/mrsets.at rename to tests/language/commands/mrsets.at diff --git a/tests/language/data-io/newone.ods b/tests/language/commands/newone.ods similarity index 100% rename from tests/language/data-io/newone.ods rename to tests/language/commands/newone.ods diff --git a/tests/language/stats/nhtsa.sav b/tests/language/commands/nhtsa.sav similarity index 100% rename from tests/language/stats/nhtsa.sav rename to tests/language/commands/nhtsa.sav diff --git a/tests/language/stats/npar.at b/tests/language/commands/npar.at similarity index 100% rename from tests/language/stats/npar.at rename to tests/language/commands/npar.at diff --git a/tests/language/dictionary/numeric.at b/tests/language/commands/numeric.at similarity index 100% rename from tests/language/dictionary/numeric.at rename to tests/language/commands/numeric.at diff --git a/tests/language/stats/oneway.at b/tests/language/commands/oneway.at similarity index 100% rename from tests/language/stats/oneway.at rename to tests/language/commands/oneway.at diff --git a/tests/language/utilities/output.at b/tests/language/commands/output.at similarity index 100% rename from tests/language/utilities/output.at rename to tests/language/commands/output.at diff --git a/tests/language/utilities/permissions.at b/tests/language/commands/permissions.at similarity index 100% rename from tests/language/utilities/permissions.at rename to tests/language/commands/permissions.at diff --git a/tests/language/data-io/print-space.at b/tests/language/commands/print-space.at similarity index 100% rename from tests/language/data-io/print-space.at rename to tests/language/commands/print-space.at diff --git a/tests/language/data-io/print.at b/tests/language/commands/print.at similarity index 100% rename from tests/language/data-io/print.at rename to tests/language/commands/print.at diff --git a/tests/language/stats/quick-cluster.at b/tests/language/commands/quick-cluster.at similarity index 100% rename from tests/language/stats/quick-cluster.at rename to tests/language/commands/quick-cluster.at diff --git a/tests/language/stats/rank.at b/tests/language/commands/rank.at similarity index 100% rename from tests/language/stats/rank.at rename to tests/language/commands/rank.at diff --git a/tests/language/data-io/readnames.ods b/tests/language/commands/readnames.ods similarity index 100% rename from tests/language/data-io/readnames.ods rename to tests/language/commands/readnames.ods diff --git a/tests/language/xforms/recode.at b/tests/language/commands/recode.at similarity index 100% rename from tests/language/xforms/recode.at rename to tests/language/commands/recode.at diff --git a/tests/language/stats/regression.at b/tests/language/commands/regression.at similarity index 100% rename from tests/language/stats/regression.at rename to tests/language/commands/regression.at diff --git a/tests/language/stats/reliability.at b/tests/language/commands/reliability.at similarity index 100% rename from tests/language/stats/reliability.at rename to tests/language/commands/reliability.at diff --git a/tests/language/dictionary/rename-variables.at b/tests/language/commands/rename-variables.at similarity index 100% rename from tests/language/dictionary/rename-variables.at rename to tests/language/commands/rename-variables.at diff --git a/tests/language/stats/roc.at b/tests/language/commands/roc.at similarity index 100% rename from tests/language/stats/roc.at rename to tests/language/commands/roc.at diff --git a/tests/language/xforms/sample.at b/tests/language/commands/sample.at similarity index 100% rename from tests/language/xforms/sample.at rename to tests/language/commands/sample.at diff --git a/tests/language/data-io/save-translate.at b/tests/language/commands/save-translate.at similarity index 100% rename from tests/language/data-io/save-translate.at rename to tests/language/commands/save-translate.at diff --git a/tests/language/data-io/save.at b/tests/language/commands/save.at similarity index 100% rename from tests/language/data-io/save.at rename to tests/language/commands/save.at diff --git a/tests/language/xforms/select-if.at b/tests/language/commands/select-if.at similarity index 100% rename from tests/language/xforms/select-if.at rename to tests/language/commands/select-if.at diff --git a/tests/language/utilities/set.at b/tests/language/commands/set.at similarity index 100% rename from tests/language/utilities/set.at rename to tests/language/commands/set.at diff --git a/tests/language/utilities/show.at b/tests/language/commands/show.at similarity index 100% rename from tests/language/utilities/show.at rename to tests/language/commands/show.at diff --git a/tests/language/stats/sort-cases.at b/tests/language/commands/sort-cases.at similarity index 100% rename from tests/language/stats/sort-cases.at rename to tests/language/commands/sort-cases.at diff --git a/tests/language/dictionary/sort-variables.at b/tests/language/commands/sort-variables.at similarity index 100% rename from tests/language/dictionary/sort-variables.at rename to tests/language/commands/sort-variables.at diff --git a/tests/language/dictionary/split-file.at b/tests/language/commands/split-file.at similarity index 100% rename from tests/language/dictionary/split-file.at rename to tests/language/commands/split-file.at diff --git a/tests/language/dictionary/string.at b/tests/language/commands/string.at similarity index 100% rename from tests/language/dictionary/string.at rename to tests/language/commands/string.at diff --git a/tests/language/dictionary/sys-file-info.at b/tests/language/commands/sys-file-info.at similarity index 100% rename from tests/language/dictionary/sys-file-info.at rename to tests/language/commands/sys-file-info.at diff --git a/tests/language/stats/t-test.at b/tests/language/commands/t-test.at similarity index 100% rename from tests/language/stats/t-test.at rename to tests/language/commands/t-test.at diff --git a/tests/language/control/temporary.at b/tests/language/commands/temporary.at similarity index 100% rename from tests/language/control/temporary.at rename to tests/language/commands/temporary.at diff --git a/tests/language/data-io/test.ods b/tests/language/commands/test.ods similarity index 100% rename from tests/language/data-io/test.ods rename to tests/language/commands/test.ods diff --git a/tests/language/utilities/title.at b/tests/language/commands/title.at similarity index 100% rename from tests/language/utilities/title.at rename to tests/language/commands/title.at diff --git a/tests/language/data-io/update.at b/tests/language/commands/update.at similarity index 100% rename from tests/language/data-io/update.at rename to tests/language/commands/update.at diff --git a/tests/language/dictionary/value-labels.at b/tests/language/commands/value-labels.at similarity index 100% rename from tests/language/dictionary/value-labels.at rename to tests/language/commands/value-labels.at diff --git a/tests/language/dictionary/variable-display.at b/tests/language/commands/variable-display.at similarity index 100% rename from tests/language/dictionary/variable-display.at rename to tests/language/commands/variable-display.at diff --git a/tests/language/dictionary/vector.at b/tests/language/commands/vector.at similarity index 100% rename from tests/language/dictionary/vector.at rename to tests/language/commands/vector.at diff --git a/tests/language/dictionary/weight.at b/tests/language/commands/weight.at similarity index 100% rename from tests/language/dictionary/weight.at rename to tests/language/commands/weight.at -- 2.30.2