From 2be9bee9da6a2ce27715e58128569594319abfa2 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sun, 20 Mar 2011 11:19:39 -0700 Subject: [PATCH] Rename procedure.[ch] to dataset.[ch]. These functions deal with datasets, so it is good to name the file after the data structure. --- src/data/automake.mk | 4 ++-- src/data/{procedure.c => dataset.c} | 2 +- src/data/{procedure.h => dataset.h} | 2 +- src/language/command.c | 2 +- src/language/control/do-if.c | 2 +- src/language/control/loop.c | 4 ++-- src/language/control/repeat.c | 5 +++-- src/language/control/temporary.c | 2 +- src/language/data-io/combine-files.c | 2 +- src/language/data-io/data-list.c | 2 +- src/language/data-io/data-parser.c | 2 +- src/language/data-io/data-reader.c | 2 +- src/language/data-io/get-data.c | 2 +- src/language/data-io/get.c | 2 +- src/language/data-io/inpt-pgm.c | 2 +- src/language/data-io/list.q | 4 ++-- src/language/data-io/print-space.c | 2 +- src/language/data-io/print.c | 2 +- src/language/data-io/save-translate.c | 2 +- src/language/data-io/save.c | 2 +- src/language/dictionary/apply-dictionary.c | 2 +- src/language/dictionary/attributes.c | 2 +- src/language/dictionary/delete-variables.c | 4 ++-- src/language/dictionary/formats.c | 2 +- src/language/dictionary/missing-values.c | 2 +- src/language/dictionary/modify-variables.c | 2 +- src/language/dictionary/mrsets.c | 2 +- src/language/dictionary/numeric.c | 2 +- src/language/dictionary/rename-variables.c | 2 +- src/language/dictionary/split-file.c | 2 +- src/language/dictionary/sys-file-info.c | 2 +- src/language/dictionary/value-labels.c | 2 +- src/language/dictionary/variable-display.c | 2 +- src/language/dictionary/variable-label.c | 2 +- src/language/dictionary/vector.c | 2 +- src/language/dictionary/weight.c | 2 +- src/language/expressions/helpers.h | 2 +- src/language/lexer/variable-parser.c | 2 +- src/language/stats/aggregate.c | 2 +- src/language/stats/autorecode.c | 4 ++-- src/language/stats/binomial.c | 2 +- src/language/stats/chisquare.c | 4 ++-- src/language/stats/cochran.c | 2 +- src/language/stats/correlations.c | 2 +- src/language/stats/crosstabs.q | 2 +- src/language/stats/descriptives.c | 2 +- src/language/stats/examine.q | 2 +- src/language/stats/factor.c | 2 +- src/language/stats/flip.c | 2 +- src/language/stats/frequencies.q | 2 +- src/language/stats/friedman.c | 2 +- src/language/stats/glm.c | 2 +- src/language/stats/kruskal-wallis.c | 2 +- src/language/stats/mann-whitney.c | 2 +- src/language/stats/npar.c | 2 +- src/language/stats/oneway.c | 2 +- src/language/stats/rank.q | 2 +- src/language/stats/regression.q | 2 +- src/language/stats/reliability.c | 2 +- src/language/stats/roc.c | 2 +- src/language/stats/runs.c | 10 +++++----- src/language/stats/sign.c | 4 ++-- src/language/stats/sort-cases.c | 2 +- src/language/stats/t-test.q | 2 +- src/language/stats/wilcoxon.c | 2 +- src/language/utilities/include.c | 2 +- src/language/utilities/set.q | 2 +- src/language/utilities/title.c | 2 +- src/language/xforms/compute.c | 2 +- src/language/xforms/count.c | 2 +- src/language/xforms/fail.c | 4 ++-- src/language/xforms/recode.c | 2 +- src/language/xforms/sample.c | 2 +- src/language/xforms/select-if.c | 2 +- src/ui/gui/executor.c | 2 +- src/ui/gui/psppire-data-window.c | 10 +++++----- src/ui/gui/psppire.c | 2 +- src/ui/terminal/main.c | 2 +- 78 files changed, 96 insertions(+), 95 deletions(-) rename src/data/{procedure.c => dataset.c} (99%) rename src/data/{procedure.h => dataset.h} (99%) diff --git a/src/data/automake.mk b/src/data/automake.mk index ae0000d2..f7ee43f6 100644 --- a/src/data/automake.mk +++ b/src/data/automake.mk @@ -48,6 +48,8 @@ src_data_libdata_la_SOURCES = \ src/data/data-in.h \ src/data/data-out.c \ src/data/data-out.h \ + src/data/dataset.c \ + src/data/dataset.h \ src/data/datasheet.c \ src/data/datasheet.h \ src/data/dict-class.c \ @@ -76,8 +78,6 @@ src_data_libdata_la_SOURCES = \ src/data/make-file.h \ src/data/mrset.c \ src/data/mrset.h \ - src/data/procedure.c \ - src/data/procedure.h \ src/data/por-file-reader.c \ src/data/por-file-reader.h \ src/data/por-file-writer.c \ diff --git a/src/data/procedure.c b/src/data/dataset.c similarity index 99% rename from src/data/procedure.c rename to src/data/dataset.c index a45f497a..a94fba2c 100644 --- a/src/data/procedure.c +++ b/src/data/dataset.c @@ -16,7 +16,7 @@ #include -#include "data/procedure.h" +#include "data/dataset.h" #include #include diff --git a/src/data/procedure.h b/src/data/dataset.h similarity index 99% rename from src/data/procedure.h rename to src/data/dataset.h index 0b5ded14..4561f97e 100644 --- a/src/data/procedure.h +++ b/src/data/dataset.h @@ -86,4 +86,4 @@ void dataset_set_callback (struct dataset *ds, void (*cb) (void *), void *); void dataset_set_default_syntax_encoding (struct dataset *, const char *); const char *dataset_get_default_syntax_encoding (const struct dataset *); -#endif /* procedure.h */ +#endif /* dataset.h */ diff --git a/src/language/command.c b/src/language/command.c index 8ba8a08e..703ae3eb 100644 --- a/src/language/command.c +++ b/src/language/command.c @@ -24,8 +24,8 @@ #include #include "data/casereader.h" +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" #include "data/settings.h" #include "data/variable.h" #include "language/lexer/command-name.h" diff --git a/src/language/control/do-if.c b/src/language/control/do-if.c index 612b0856..fe9ca730 100644 --- a/src/language/control/do-if.c +++ b/src/language/control/do-if.c @@ -19,7 +19,7 @@ #include #include "data/case.h" -#include "data/procedure.h" +#include "data/dataset.h" #include "data/transformations.h" #include "data/value.h" #include "language/command.h" diff --git a/src/language/control/loop.c b/src/language/control/loop.c index 8f4ff825..e91d9438 100644 --- a/src/language/control/loop.c +++ b/src/language/control/loop.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2009-2011 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 @@ -19,8 +19,8 @@ #include "language/control/control-stack.h" #include "data/case.h" +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" #include "data/settings.h" #include "data/transformations.h" #include "data/variable.h" diff --git a/src/language/control/repeat.c b/src/language/control/repeat.c index c0fa8fe0..ff1bbc08 100644 --- a/src/language/control/repeat.c +++ b/src/language/control/repeat.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2007, 2009-2011 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 @@ -18,8 +18,9 @@ #include +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" +#include "data/settings.h" #include "language/command.h" #include "language/lexer/lexer.h" #include "language/lexer/segment.h" diff --git a/src/language/control/temporary.c b/src/language/control/temporary.c index b6a5cc98..7ebcc5ad 100644 --- a/src/language/control/temporary.c +++ b/src/language/control/temporary.c @@ -19,8 +19,8 @@ #include #include +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" #include "data/transformations.h" #include "data/value-labels.h" #include "data/variable.h" diff --git a/src/language/data-io/combine-files.c b/src/language/data-io/combine-files.c index 58693c62..a661d7c6 100644 --- a/src/language/data-io/combine-files.c +++ b/src/language/data-io/combine-files.c @@ -23,9 +23,9 @@ #include "data/case.h" #include "data/casereader.h" #include "data/casewriter.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" -#include "data/procedure.h" #include "data/subcase.h" #include "data/variable.h" #include "language/command.h" diff --git a/src/language/data-io/data-list.c b/src/language/data-io/data-list.c index 6d21c843..a171986d 100644 --- a/src/language/data-io/data-list.c +++ b/src/language/data-io/data-list.c @@ -25,9 +25,9 @@ #include "data/case.h" #include "data/casereader.h" #include "data/data-in.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" -#include "data/procedure.h" #include "data/settings.h" #include "data/transformations.h" #include "data/variable.h" diff --git a/src/language/data-io/data-parser.c b/src/language/data-io/data-parser.c index 0c52e07b..24a671ee 100644 --- a/src/language/data-io/data-parser.c +++ b/src/language/data-io/data-parser.c @@ -23,10 +23,10 @@ #include "data/casereader-provider.h" #include "data/data-in.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" #include "data/file-handle-def.h" -#include "data/procedure.h" #include "data/settings.h" #include "language/data-io/data-reader.h" #include "libpspp/message.h" diff --git a/src/language/data-io/data-reader.c b/src/language/data-io/data-reader.c index e701a936..0f96e589 100644 --- a/src/language/data-io/data-reader.c +++ b/src/language/data-io/data-reader.c @@ -26,9 +26,9 @@ #include #include "data/casereader.h" +#include "data/dataset.h" #include "data/file-handle-def.h" #include "data/file-name.h" -#include "data/procedure.h" #include "language/command.h" #include "language/data-io/file-handle.h" #include "language/lexer/lexer.h" diff --git a/src/language/data-io/get-data.c b/src/language/data-io/get-data.c index f65e8ac7..07000eb2 100644 --- a/src/language/data-io/get-data.c +++ b/src/language/data-io/get-data.c @@ -18,10 +18,10 @@ #include +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" #include "data/gnumeric-reader.h" -#include "data/procedure.h" #include "data/psql-reader.h" #include "data/settings.h" #include "language/command.h" diff --git a/src/language/data-io/get.c b/src/language/data-io/get.c index aa2b91fe..1b63e75a 100644 --- a/src/language/data-io/get.c +++ b/src/language/data-io/get.c @@ -22,9 +22,9 @@ #include "data/case-map.h" #include "data/case.h" #include "data/casereader.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/por-file-writer.h" -#include "data/procedure.h" #include "language/command.h" #include "language/data-io/file-handle.h" #include "language/data-io/trim.h" diff --git a/src/language/data-io/inpt-pgm.c b/src/language/data-io/inpt-pgm.c index 72d5a2e7..de8b8100 100644 --- a/src/language/data-io/inpt-pgm.c +++ b/src/language/data-io/inpt-pgm.c @@ -22,8 +22,8 @@ #include "data/case.h" #include "data/caseinit.h" #include "data/casereader-provider.h" +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" #include "data/transformations.h" #include "data/variable.h" #include "language/command.h" diff --git a/src/language/data-io/list.q b/src/language/data-io/list.q index 33b82830..6bb2bed2 100644 --- a/src/language/data-io/list.q +++ b/src/language/data-io/list.q @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2009, 2011 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2009-2011 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 @@ -22,10 +22,10 @@ #include "data/casegrouper.h" #include "data/casereader.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/data-out.h" #include "data/format.h" -#include "data/procedure.h" #include "data/subcase.h" #include "data/variable.h" #include "language/command.h" diff --git a/src/language/data-io/print-space.c b/src/language/data-io/print-space.c index b7683670..fd0d4cf7 100644 --- a/src/language/data-io/print-space.c +++ b/src/language/data-io/print-space.c @@ -19,7 +19,7 @@ #include #include -#include "data/procedure.h" +#include "data/dataset.h" #include "data/value.h" #include "language/command.h" #include "language/data-io/data-writer.h" diff --git a/src/language/data-io/print.c b/src/language/data-io/print.c index c52a59cf..169b6a5d 100644 --- a/src/language/data-io/print.c +++ b/src/language/data-io/print.c @@ -19,9 +19,9 @@ #include #include "data/case.h" +#include "data/dataset.h" #include "data/data-out.h" #include "data/format.h" -#include "data/procedure.h" #include "data/transformations.h" #include "data/variable.h" #include "language/command.h" diff --git a/src/language/data-io/save-translate.c b/src/language/data-io/save-translate.c index d4c67b02..17293cf6 100644 --- a/src/language/data-io/save-translate.c +++ b/src/language/data-io/save-translate.c @@ -22,10 +22,10 @@ #include "data/casereader.h" #include "data/casewriter.h" #include "data/csv-file-writer.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/file-name.h" #include "data/format.h" -#include "data/procedure.h" #include "data/settings.h" #include "language/command.h" #include "language/data-io/file-handle.h" diff --git a/src/language/data-io/save.c b/src/language/data-io/save.c index b06a850a..48645fc2 100644 --- a/src/language/data-io/save.c +++ b/src/language/data-io/save.c @@ -23,9 +23,9 @@ #include "data/case.h" #include "data/casereader.h" #include "data/casewriter.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/por-file-writer.h" -#include "data/procedure.h" #include "data/sys-file-writer.h" #include "data/transformations.h" #include "data/variable.h" diff --git a/src/language/dictionary/apply-dictionary.c b/src/language/dictionary/apply-dictionary.c index 36877302..96b77dc0 100644 --- a/src/language/dictionary/apply-dictionary.c +++ b/src/language/dictionary/apply-dictionary.c @@ -20,10 +20,10 @@ #include "data/any-reader.h" #include "data/casereader.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/file-handle-def.h" #include "data/missing-values.h" -#include "data/procedure.h" #include "data/value-labels.h" #include "data/variable.h" #include "language/command.h" diff --git a/src/language/dictionary/attributes.c b/src/language/dictionary/attributes.c index 13520730..c7598d1c 100644 --- a/src/language/dictionary/attributes.c +++ b/src/language/dictionary/attributes.c @@ -19,8 +19,8 @@ #include #include "data/attributes.h" +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" #include "data/variable.h" #include "language/command.h" #include "language/lexer/lexer.h" diff --git a/src/language/dictionary/delete-variables.c b/src/language/dictionary/delete-variables.c index 526fa1cd..027315b6 100644 --- a/src/language/dictionary/delete-variables.c +++ b/src/language/dictionary/delete-variables.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006, 2007, 2011 Free Software Foundation, Inc. + Copyright (C) 2006, 2007, 2010, 2011 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 @@ -19,8 +19,8 @@ #include #include "data/casereader.h" +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" #include "language/command.h" #include "language/lexer/variable-parser.h" #include "libpspp/message.h" diff --git a/src/language/dictionary/formats.c b/src/language/dictionary/formats.c index b40f202c..9f943be2 100644 --- a/src/language/dictionary/formats.c +++ b/src/language/dictionary/formats.c @@ -20,8 +20,8 @@ #include #include +#include "data/dataset.h" #include "data/format.h" -#include "data/procedure.h" #include "data/variable.h" #include "language/command.h" #include "language/lexer/format-parser.h" diff --git a/src/language/dictionary/missing-values.c b/src/language/dictionary/missing-values.c index 3ff4c426..a906b8a8 100644 --- a/src/language/dictionary/missing-values.c +++ b/src/language/dictionary/missing-values.c @@ -20,9 +20,9 @@ #include "data/data-in.h" #include "data/dictionary.h" +#include "data/dataset.h" #include "data/format.h" #include "data/missing-values.h" -#include "data/procedure.h" #include "data/value.h" #include "data/variable.h" #include "language/command.h" diff --git a/src/language/dictionary/modify-variables.c b/src/language/dictionary/modify-variables.c index f3c31900..d3e663c3 100644 --- a/src/language/dictionary/modify-variables.c +++ b/src/language/dictionary/modify-variables.c @@ -18,8 +18,8 @@ #include +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" #include "data/variable.h" #include "language/command.h" #include "language/lexer/lexer.h" diff --git a/src/language/dictionary/mrsets.c b/src/language/dictionary/mrsets.c index 3af5d033..8497a059 100644 --- a/src/language/dictionary/mrsets.c +++ b/src/language/dictionary/mrsets.c @@ -17,9 +17,9 @@ #include #include "data/data-out.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/mrset.h" -#include "data/procedure.h" #include "data/value-labels.h" #include "data/variable.h" #include "language/command.h" diff --git a/src/language/dictionary/numeric.c b/src/language/dictionary/numeric.c index c88d5143..7b367f9d 100644 --- a/src/language/dictionary/numeric.c +++ b/src/language/dictionary/numeric.c @@ -18,8 +18,8 @@ #include +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" #include "data/variable.h" #include "data/format.h" #include "language/command.h" diff --git a/src/language/dictionary/rename-variables.c b/src/language/dictionary/rename-variables.c index c1d31996..82fc1d96 100644 --- a/src/language/dictionary/rename-variables.c +++ b/src/language/dictionary/rename-variables.c @@ -18,8 +18,8 @@ #include +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" #include "data/variable.h" #include "language/command.h" #include "language/lexer/lexer.h" diff --git a/src/language/dictionary/split-file.c b/src/language/dictionary/split-file.c index 56e3eeef..28e6860e 100644 --- a/src/language/dictionary/split-file.c +++ b/src/language/dictionary/split-file.c @@ -20,9 +20,9 @@ #include "data/case.h" #include "data/data-out.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" -#include "data/procedure.h" #include "data/value-labels.h" #include "data/variable.h" #include "language/command.h" diff --git a/src/language/dictionary/sys-file-info.c b/src/language/dictionary/sys-file-info.c index 51b3cae4..8db1b681 100644 --- a/src/language/dictionary/sys-file-info.c +++ b/src/language/dictionary/sys-file-info.c @@ -21,11 +21,11 @@ #include "data/attributes.h" #include "data/casereader.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/file-handle-def.h" #include "data/format.h" #include "data/missing-values.h" -#include "data/procedure.h" #include "data/sys-file-reader.h" #include "data/value-labels.h" #include "data/variable.h" diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c index 18e890dd..57124ebe 100644 --- a/src/language/dictionary/value-labels.c +++ b/src/language/dictionary/value-labels.c @@ -19,8 +19,8 @@ #include #include +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" #include "data/value-labels.h" #include "data/variable.h" #include "language/command.h" diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c index 4b68f902..1ff5f465 100644 --- a/src/language/dictionary/variable-display.c +++ b/src/language/dictionary/variable-display.c @@ -19,7 +19,7 @@ #include #include -#include "data/procedure.h" +#include "data/dataset.h" #include "data/variable.h" #include "language/command.h" #include "language/lexer/lexer.h" diff --git a/src/language/dictionary/variable-label.c b/src/language/dictionary/variable-label.c index c0f80fbd..41fae5ed 100644 --- a/src/language/dictionary/variable-label.c +++ b/src/language/dictionary/variable-label.c @@ -19,8 +19,8 @@ #include #include +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" #include "data/variable.h" #include "language/command.h" #include "language/lexer/lexer.h" diff --git a/src/language/dictionary/vector.c b/src/language/dictionary/vector.c index a5e66df8..b0d69615 100644 --- a/src/language/dictionary/vector.c +++ b/src/language/dictionary/vector.c @@ -18,8 +18,8 @@ #include +#include "data/dataset.h" #include "data/format.h" -#include "data/procedure.h" #include "data/dictionary.h" #include "data/variable.h" #include "language/command.h" diff --git a/src/language/dictionary/weight.c b/src/language/dictionary/weight.c index ad06ad10..185165dc 100644 --- a/src/language/dictionary/weight.c +++ b/src/language/dictionary/weight.c @@ -18,7 +18,7 @@ #include -#include "data/procedure.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/variable.h" #include "language/command.h" diff --git a/src/language/expressions/helpers.h b/src/language/expressions/helpers.h index 570cf132..ef4fdadd 100644 --- a/src/language/expressions/helpers.h +++ b/src/language/expressions/helpers.h @@ -14,8 +14,8 @@ #include "data/case.h" #include "data/data-in.h" #include "data/data-out.h" +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" #include "data/settings.h" #include "data/value.h" #include "data/variable.h" diff --git a/src/language/lexer/variable-parser.c b/src/language/lexer/variable-parser.c index fbcc170d..49d6a5de 100644 --- a/src/language/lexer/variable-parser.c +++ b/src/language/lexer/variable-parser.c @@ -23,8 +23,8 @@ #include #include +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" #include "data/variable.h" #include "language/lexer/lexer.h" #include "libpspp/assertion.h" diff --git a/src/language/stats/aggregate.c b/src/language/stats/aggregate.c index 2a4eda87..b0df0b8e 100644 --- a/src/language/stats/aggregate.c +++ b/src/language/stats/aggregate.c @@ -25,10 +25,10 @@ #include "data/casegrouper.h" #include "data/casereader.h" #include "data/casewriter.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/file-handle-def.h" #include "data/format.h" -#include "data/procedure.h" #include "data/settings.h" #include "data/subcase.h" #include "data/sys-file-writer.h" diff --git a/src/language/stats/autorecode.c b/src/language/stats/autorecode.c index fdf3dddc..a4d34ccf 100644 --- a/src/language/stats/autorecode.c +++ b/src/language/stats/autorecode.c @@ -20,18 +20,18 @@ #include "data/case.h" #include "data/casereader.h" +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" #include "data/transformations.h" #include "data/variable.h" #include "language/command.h" #include "language/lexer/lexer.h" #include "language/lexer/variable-parser.h" #include "libpspp/array.h" -#include "libpspp/i18n.h" #include "libpspp/compiler.h" #include "libpspp/hash-functions.h" #include "libpspp/hmap.h" +#include "libpspp/i18n.h" #include "libpspp/message.h" #include "libpspp/pool.h" #include "libpspp/str.h" diff --git a/src/language/stats/binomial.c b/src/language/stats/binomial.c index c83e4570..94d0d972 100644 --- a/src/language/stats/binomial.c +++ b/src/language/stats/binomial.c @@ -23,9 +23,9 @@ #include "data/case.h" #include "data/casereader.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" -#include "data/procedure.h" #include "data/value-labels.h" #include "data/value.h" #include "data/variable.h" diff --git a/src/language/stats/chisquare.c b/src/language/stats/chisquare.c index ed91013e..10d81132 100644 --- a/src/language/stats/chisquare.c +++ b/src/language/stats/chisquare.c @@ -22,11 +22,11 @@ #include #include -#include "data/format.h" #include "data/case.h" #include "data/casereader.h" +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" +#include "data/format.h" #include "data/value-labels.h" #include "data/variable.h" #include "language/stats/freq.h" diff --git a/src/language/stats/cochran.c b/src/language/stats/cochran.c index 8576f985..3ea8fd34 100644 --- a/src/language/stats/cochran.c +++ b/src/language/stats/cochran.c @@ -22,9 +22,9 @@ #include #include "data/casereader.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" -#include "data/procedure.h" #include "data/val-type.h" #include "data/variable.h" #include "language/stats/npar.h" diff --git a/src/language/stats/correlations.c b/src/language/stats/correlations.c index aa7841e7..bc6508bd 100644 --- a/src/language/stats/correlations.c +++ b/src/language/stats/correlations.c @@ -22,9 +22,9 @@ #include "data/casegrouper.h" #include "data/casereader.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" -#include "data/procedure.h" #include "data/variable.h" #include "language/command.h" #include "language/dictionary/split-file.h" diff --git a/src/language/stats/crosstabs.q b/src/language/stats/crosstabs.q index b12bf6cf..91015f57 100644 --- a/src/language/stats/crosstabs.q +++ b/src/language/stats/crosstabs.q @@ -37,9 +37,9 @@ #include "data/casegrouper.h" #include "data/casereader.h" #include "data/data-out.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" -#include "data/procedure.h" #include "data/value-labels.h" #include "data/variable.h" #include "language/command.h" diff --git a/src/language/stats/descriptives.c b/src/language/stats/descriptives.c index adedd5e6..935ca9b3 100644 --- a/src/language/stats/descriptives.c +++ b/src/language/stats/descriptives.c @@ -22,8 +22,8 @@ #include "data/casegrouper.h" #include "data/casereader.h" +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" #include "data/transformations.h" #include "data/variable.h" #include "language/command.h" diff --git a/src/language/stats/examine.q b/src/language/stats/examine.q index 50d9525b..e225f334 100644 --- a/src/language/stats/examine.q +++ b/src/language/stats/examine.q @@ -25,8 +25,8 @@ #include "data/casegrouper.h" #include "data/casereader.h" #include "data/casewriter.h" +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" #include "data/subcase.h" #include "data/value-labels.h" #include "data/variable.h" diff --git a/src/language/stats/factor.c b/src/language/stats/factor.c index a19cf69e..1145a48e 100644 --- a/src/language/stats/factor.c +++ b/src/language/stats/factor.c @@ -26,9 +26,9 @@ #include "data/casegrouper.h" #include "data/casereader.h" #include "data/casewriter.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" -#include "data/procedure.h" #include "data/subcase.h" #include "language/command.h" #include "language/lexer/lexer.h" diff --git a/src/language/stats/flip.c b/src/language/stats/flip.c index 23544c8b..e7896452 100644 --- a/src/language/stats/flip.c +++ b/src/language/stats/flip.c @@ -25,8 +25,8 @@ #include "data/case.h" #include "data/casereader.h" #include "data/casereader-provider.h" +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" #include "data/settings.h" #include "data/short-names.h" #include "data/value.h" diff --git a/src/language/stats/frequencies.q b/src/language/stats/frequencies.q index ef4b7f95..c00e645f 100644 --- a/src/language/stats/frequencies.q +++ b/src/language/stats/frequencies.q @@ -23,9 +23,9 @@ #include "data/case.h" #include "data/casegrouper.h" #include "data/casereader.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" -#include "data/procedure.h" #include "data/settings.h" #include "data/value-labels.h" #include "data/variable.h" diff --git a/src/language/stats/friedman.c b/src/language/stats/friedman.c index d853bd39..5ef3083f 100644 --- a/src/language/stats/friedman.c +++ b/src/language/stats/friedman.c @@ -23,9 +23,9 @@ #include #include "data/casereader.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" -#include "data/procedure.h" #include "data/variable.h" #include "libpspp/message.h" #include "libpspp/misc.h" diff --git a/src/language/stats/glm.c b/src/language/stats/glm.c index ba75a8e4..e09382a5 100644 --- a/src/language/stats/glm.c +++ b/src/language/stats/glm.c @@ -23,9 +23,9 @@ #include "data/case.h" #include "data/casegrouper.h" #include "data/casereader.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" -#include "data/procedure.h" #include "data/value.h" #include "language/command.h" #include "language/dictionary/split-file.h" diff --git a/src/language/stats/kruskal-wallis.c b/src/language/stats/kruskal-wallis.c index ae388068..ecab0348 100644 --- a/src/language/stats/kruskal-wallis.c +++ b/src/language/stats/kruskal-wallis.c @@ -24,9 +24,9 @@ #include "data/casereader.h" #include "data/casewriter.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" -#include "data/procedure.h" #include "data/subcase.h" #include "data/variable.h" #include "libpspp/assertion.h" diff --git a/src/language/stats/mann-whitney.c b/src/language/stats/mann-whitney.c index 4db82f8e..60f251ba 100644 --- a/src/language/stats/mann-whitney.c +++ b/src/language/stats/mann-whitney.c @@ -22,9 +22,9 @@ #include "data/case.h" #include "data/casereader.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" -#include "data/procedure.h" #include "data/variable.h" #include "libpspp/cast.h" #include "libpspp/misc.h" diff --git a/src/language/stats/npar.c b/src/language/stats/npar.c index a572e09f..3d977a7d 100644 --- a/src/language/stats/npar.c +++ b/src/language/stats/npar.c @@ -24,8 +24,8 @@ #include "data/case.h" #include "data/casegrouper.h" #include "data/casereader.h" +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" #include "data/settings.h" #include "data/variable.h" #include "language/command.h" diff --git a/src/language/stats/oneway.c b/src/language/stats/oneway.c index e2d39910..a63d1a29 100644 --- a/src/language/stats/oneway.c +++ b/src/language/stats/oneway.c @@ -23,9 +23,9 @@ #include "data/case.h" #include "data/casegrouper.h" #include "data/casereader.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" -#include "data/procedure.h" #include "data/value.h" #include "language/command.h" #include "language/dictionary/split-file.h" diff --git a/src/language/stats/rank.q b/src/language/stats/rank.q index 97c98c32..2a0b5c99 100644 --- a/src/language/stats/rank.q +++ b/src/language/stats/rank.q @@ -24,10 +24,10 @@ #include "data/casegrouper.h" #include "data/casereader.h" #include "data/casewriter.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" #include "data/missing-values.h" -#include "data/procedure.h" #include "data/short-names.h" #include "data/subcase.h" #include "data/variable.h" diff --git a/src/language/stats/regression.q b/src/language/stats/regression.q index 5ca581d8..c41f9e78 100644 --- a/src/language/stats/regression.q +++ b/src/language/stats/regression.q @@ -25,9 +25,9 @@ #include "data/case.h" #include "data/casegrouper.h" #include "data/casereader.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/missing-values.h" -#include "data/procedure.h" #include "data/transformations.h" #include "data/value-labels.h" #include "data/variable.h" diff --git a/src/language/stats/reliability.c b/src/language/stats/reliability.c index 92f4ac1c..1c1212e3 100644 --- a/src/language/stats/reliability.c +++ b/src/language/stats/reliability.c @@ -20,10 +20,10 @@ #include "data/casegrouper.h" #include "data/casereader.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" #include "data/missing-values.h" -#include "data/procedure.h" #include "language/command.h" #include "language/lexer/lexer.h" #include "language/lexer/variable-parser.h" diff --git a/src/language/stats/roc.c b/src/language/stats/roc.c index b07a58d1..b6596ec7 100644 --- a/src/language/stats/roc.c +++ b/src/language/stats/roc.c @@ -23,9 +23,9 @@ #include "data/casegrouper.h" #include "data/casereader.h" #include "data/casewriter.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" -#include "data/procedure.h" #include "data/subcase.h" #include "language/command.h" #include "language/lexer/lexer.h" diff --git a/src/language/stats/runs.c b/src/language/stats/runs.c index 73fbb735..9fc571cf 100644 --- a/src/language/stats/runs.c +++ b/src/language/stats/runs.c @@ -22,16 +22,16 @@ #include #include -#include "data/format.h" -#include "libpspp/misc.h" -#include "libpspp/message.h" -#include "data/procedure.h" +#include "data/casegrouper.h" #include "data/casereader.h" #include "data/casewriter.h" -#include "data/casegrouper.h" +#include "data/dataset.h" #include "data/dictionary.h" +#include "data/format.h" #include "data/subcase.h" #include "data/variable.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" #include "math/percentiles.h" #include "math/sort.h" #include "output/tab.h" diff --git a/src/language/stats/sign.c b/src/language/stats/sign.c index 45973262..0048eb3e 100644 --- a/src/language/stats/sign.c +++ b/src/language/stats/sign.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2011 Free Software Foundation, Inc. + Copyright (C) 2009, 2010, 2011 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 @@ -22,10 +22,10 @@ #include #include "data/casereader.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" #include "data/missing-values.h" -#include "data/procedure.h" #include "data/variable.h" #include "language/stats/npar.h" #include "libpspp/str.h" diff --git a/src/language/stats/sort-cases.c b/src/language/stats/sort-cases.c index ff0f305e..cecdce27 100644 --- a/src/language/stats/sort-cases.c +++ b/src/language/stats/sort-cases.c @@ -21,7 +21,7 @@ #include #include -#include "data/procedure.h" +#include "data/dataset.h" #include "data/settings.h" #include "data/subcase.h" #include "data/variable.h" diff --git a/src/language/stats/t-test.q b/src/language/stats/t-test.q index 3cd921eb..4b082fe7 100644 --- a/src/language/stats/t-test.q +++ b/src/language/stats/t-test.q @@ -25,9 +25,9 @@ #include "data/case.h" #include "data/casegrouper.h" #include "data/casereader.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" -#include "data/procedure.h" #include "data/value-labels.h" #include "data/variable.h" #include "language/command.h" diff --git a/src/language/stats/wilcoxon.c b/src/language/stats/wilcoxon.c index 19c3a403..ed6225df 100644 --- a/src/language/stats/wilcoxon.c +++ b/src/language/stats/wilcoxon.c @@ -25,9 +25,9 @@ #include "data/casereader.h" #include "data/casewriter.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" -#include "data/procedure.h" #include "data/subcase.h" #include "data/variable.h" #include "libpspp/assertion.h" diff --git a/src/language/utilities/include.c b/src/language/utilities/include.c index e802abec..81a064d1 100644 --- a/src/language/utilities/include.c +++ b/src/language/utilities/include.c @@ -22,8 +22,8 @@ #include #include +#include "data/dataset.h" #include "data/file-name.h" -#include "data/procedure.h" #include "language/command.h" #include "language/lexer/include-path.h" #include "language/lexer/lexer.h" diff --git a/src/language/utilities/set.q b/src/language/utilities/set.q index 3da12a61..ce358ae8 100644 --- a/src/language/utilities/set.q +++ b/src/language/utilities/set.q @@ -23,9 +23,9 @@ #include "data/data-in.h" #include "data/data-out.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" -#include "data/procedure.h" #include "data/settings.h" #include "data/value.h" #include "data/variable.h" diff --git a/src/language/utilities/title.c b/src/language/utilities/title.c index 398288b8..cc5314c4 100644 --- a/src/language/utilities/title.c +++ b/src/language/utilities/title.c @@ -19,8 +19,8 @@ #include #include +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" #include "data/variable.h" #include "language/command.h" #include "language/lexer/lexer.h" diff --git a/src/language/xforms/compute.c b/src/language/xforms/compute.c index 82a1121f..0ab4e3a4 100644 --- a/src/language/xforms/compute.c +++ b/src/language/xforms/compute.c @@ -20,8 +20,8 @@ #include #include "data/case.h" +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" #include "data/transformations.h" #include "data/variable.h" #include "data/vector.h" diff --git a/src/language/xforms/count.c b/src/language/xforms/count.c index d0045fee..c42bdc34 100644 --- a/src/language/xforms/count.c +++ b/src/language/xforms/count.c @@ -19,8 +19,8 @@ #include #include "data/case.h" +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" #include "data/transformations.h" #include "data/variable.h" #include "language/command.h" diff --git a/src/language/xforms/fail.c b/src/language/xforms/fail.c index feedb780..f23fcec3 100644 --- a/src/language/xforms/fail.c +++ b/src/language/xforms/fail.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2007, 2009, 2010, 2011 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 @@ -19,7 +19,7 @@ #include #include "data/case.h" -#include "data/procedure.h" +#include "data/dataset.h" #include "data/transformations.h" #include "language/command.h" #include "language/lexer/lexer.h" diff --git a/src/language/xforms/recode.c b/src/language/xforms/recode.c index 77543ca7..44e5b851 100644 --- a/src/language/xforms/recode.c +++ b/src/language/xforms/recode.c @@ -22,9 +22,9 @@ #include "data/case.h" #include "data/data-in.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" -#include "data/procedure.h" #include "data/transformations.h" #include "data/variable.h" #include "language/command.h" diff --git a/src/language/xforms/sample.c b/src/language/xforms/sample.c index f2a30a2a..260841a6 100644 --- a/src/language/xforms/sample.c +++ b/src/language/xforms/sample.c @@ -21,7 +21,7 @@ #include #include -#include "data/procedure.h" +#include "data/dataset.h" #include "data/variable.h" #include "language/command.h" #include "language/lexer/lexer.h" diff --git a/src/language/xforms/select-if.c b/src/language/xforms/select-if.c index 9df4eba5..4110f908 100644 --- a/src/language/xforms/select-if.c +++ b/src/language/xforms/select-if.c @@ -18,8 +18,8 @@ #include +#include "data/dataset.h" #include "data/dictionary.h" -#include "data/procedure.h" #include "data/transformations.h" #include "data/variable.h" #include "language/command.h" diff --git a/src/ui/gui/executor.c b/src/ui/gui/executor.c index 754d09ae..3afa1ecd 100644 --- a/src/ui/gui/executor.c +++ b/src/ui/gui/executor.c @@ -18,8 +18,8 @@ #include "ui/gui/executor.h" +#include "data/dataset.h" #include "data/lazy-casereader.h" -#include "data/procedure.h" #include "language/command.h" #include "language/lexer/lexer.h" #include "libpspp/cast.h" diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index 6dcb8c69..24798cec 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -21,15 +21,15 @@ #include #include "data/any-reader.h" -#include "data/procedure.h" +#include "data/dataset.h" #include "language/lexer/lexer.h" #include "libpspp/message.h" -#include "ui/gui/help-menu.h" +#include "ui/gui/aggregate-dialog.h" #include "ui/gui/binomial-dialog.h" +#include "ui/gui/chi-square-dialog.h" #include "ui/gui/comments-dialog.h" #include "ui/gui/compute-dialog.h" #include "ui/gui/correlation-dialog.h" -#include "ui/gui/chi-square-dialog.h" #include "ui/gui/crosstabs-dialog.h" #include "ui/gui/descriptives-dialog.h" #include "ui/gui/examine-dialog.h" @@ -37,9 +37,10 @@ #include "ui/gui/factor-dialog.h" #include "ui/gui/find-dialog.h" #include "ui/gui/frequencies-dialog.h" -#include "ui/gui/k-related-dialog.h" #include "ui/gui/goto-case-dialog.h" +#include "ui/gui/help-menu.h" #include "ui/gui/helper.h" +#include "ui/gui/k-related-dialog.h" #include "ui/gui/oneway-anova-dialog.h" #include "ui/gui/psppire-data-window.h" #include "ui/gui/psppire-syntax-window.h" @@ -58,7 +59,6 @@ #include "ui/gui/t-test-paired-samples.h" #include "ui/gui/text-data-import-dialog.h" #include "ui/gui/transpose-dialog.h" -#include "ui/gui/aggregate-dialog.h" #include "ui/gui/variable-info-dialog.h" #include "ui/gui/weight-cases-dialog.h" #include "ui/syntax-gen.h" diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index 0d41932a..b294f229 100644 --- a/src/ui/gui/psppire.c +++ b/src/ui/gui/psppire.c @@ -23,11 +23,11 @@ #include #include "data/casereader.h" +#include "data/dataset.h" #include "data/datasheet.h" #include "data/file-handle-def.h" #include "data/file-name.h" #include "data/por-file-reader.h" -#include "data/procedure.h" #include "data/settings.h" #include "data/sys-file-reader.h" diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c index a9db6feb..a709d993 100644 --- a/src/ui/terminal/main.c +++ b/src/ui/terminal/main.c @@ -30,10 +30,10 @@ #endif #include +#include "data/dataset.h" #include "data/dictionary.h" #include "data/file-handle-def.h" #include "data/file-name.h" -#include "data/procedure.h" #include "data/settings.h" #include "data/variable.h" #include "gsl/gsl_errno.h" -- 2.30.2