From: Ben Pfaff Date: Sat, 19 Mar 2011 20:48:24 +0000 (-0700) Subject: Update all #include directives to the currently preferred style. X-Git-Tag: v0.7.7~35 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81579d9e9f994fb2908f50af41c3eb033d216e58;p=pspp-builds.git Update all #include directives to the currently preferred style. I left src/ui/gui alone for now. --- diff --git a/src/data/any-reader.c b/src/data/any-reader.c index 807c4fe9..03a7b23b 100644 --- a/src/data/any-reader.c +++ b/src/data/any-reader.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006, 2010 Free Software Foundation, Inc. + Copyright (C) 2006, 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 @@ -15,21 +15,25 @@ along with this program. If not, see . */ #include -#include "any-reader.h" + +#include "data/any-reader.h" + #include #include #include #include #include -#include -#include -#include "file-handle-def.h" -#include "file-name.h" -#include "por-file-reader.h" -#include "sys-file-reader.h" -#include -#include "scratch-reader.h" -#include "xalloc.h" + +#include "data/file-handle-def.h" +#include "data/file-name.h" +#include "data/por-file-reader.h" +#include "data/scratch-reader.h" +#include "data/sys-file-reader.h" +#include "libpspp/assertion.h" +#include "libpspp/message.h" +#include "libpspp/str.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/data/any-writer.c b/src/data/any-writer.c index 94dff952..b398c70f 100644 --- a/src/data/any-writer.c +++ b/src/data/any-writer.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 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 @@ -15,21 +15,25 @@ along with this program. If not, see . */ #include -#include "any-writer.h" + +#include "data/any-writer.h" + #include #include #include #include #include -#include -#include -#include "file-handle-def.h" -#include "file-name.h" -#include "por-file-writer.h" -#include "sys-file-writer.h" -#include -#include "scratch-writer.h" -#include "xalloc.h" + +#include "data/file-handle-def.h" +#include "data/file-name.h" +#include "data/por-file-writer.h" +#include "data/scratch-writer.h" +#include "data/sys-file-writer.h" +#include "libpspp/assertion.h" +#include "libpspp/message.h" +#include "libpspp/str.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/data/attributes.c b/src/data/attributes.c index d99e945b..7fc546ee 100644 --- a/src/data/attributes.c +++ b/src/data/attributes.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2008, 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 @@ -16,12 +16,15 @@ #include -#include +#include "data/attributes.h" + #include #include -#include -#include -#include "xalloc.h" + +#include "libpspp/array.h" +#include "libpspp/hash-functions.h" + +#include "gl/xalloc.h" /* A custom attribute of the sort maintained by the DATAFILE ATTRIBUTE and VARIABLE ATTRIBUTE commands. diff --git a/src/data/attributes.h b/src/data/attributes.h index 87cb7726..61b68f11 100644 --- a/src/data/attributes.h +++ b/src/data/attributes.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008 Free Software Foundation, Inc. + Copyright (C) 2008, 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 @@ -17,7 +17,7 @@ #ifndef DATA_ATTRIBUTES_H #define DATA_ATTRIBUTES_H 1 -#include +#include "libpspp/hmapx.h" /* This header supports custom attribute of the sort maintained by the DATAFILE ATTRIBUTE and VARIABLE ATTRIBUTE commands. diff --git a/src/data/calendar.c b/src/data/calendar.c index ef6aa675..a2bb7e60 100644 --- a/src/data/calendar.c +++ b/src/data/calendar.c @@ -1,9 +1,28 @@ +/* PSPP - a program for statistical analysis. + Copyright (C) 2006, 2007, 2008, 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 + 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 . */ + #include -#include "calendar.h" + +#include "data/calendar.h" + #include #include -#include -#include + +#include "data/settings.h" +#include "data/val-type.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/data/case-map.c b/src/data/case-map.c index 49297d13..c54e6753 100644 --- a/src/data/case-map.c +++ b/src/data/case-map.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 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 @@ -16,19 +16,19 @@ #include -#include +#include "data/case-map.h" #include #include -#include -#include -#include -#include -#include -#include +#include "data/casereader.h" +#include "data/casewriter.h" +#include "data/dictionary.h" +#include "data/variable.h" +#include "data/case.h" +#include "libpspp/assertion.h" -#include "xalloc.h" +#include "gl/xalloc.h" /* A case map. */ struct case_map diff --git a/src/data/case-matcher.c b/src/data/case-matcher.c index 37cb4a60..46272bbe 100644 --- a/src/data/case-matcher.c +++ b/src/data/case-matcher.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2008, 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 @@ -16,16 +16,16 @@ #include -#include +#include "data/case-matcher.h" #include -#include -#include -#include -#include +#include "data/case.h" +#include "data/subcase.h" +#include "data/value.h" +#include "libpspp/assertion.h" -#include "xalloc.h" +#include "gl/xalloc.h" struct case_matcher_input { diff --git a/src/data/case-tmpfile.c b/src/data/case-tmpfile.c index 58e437ad..907a926f 100644 --- a/src/data/case-tmpfile.c +++ b/src/data/case-tmpfile.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 @@ -16,18 +16,18 @@ #include -#include +#include "data/case-tmpfile.h" #include #include #include -#include -#include -#include +#include "libpspp/assertion.h" +#include "libpspp/taint.h" +#include "libpspp/ext-array.h" -#include "error.h" -#include "xalloc.h" +#include "gl/error.h" +#include "gl/xalloc.h" /* A temporary file that stores an array of cases. */ struct case_tmpfile diff --git a/src/data/case-tmpfile.h b/src/data/case-tmpfile.h index bbf736e3..3659e580 100644 --- a/src/data/case-tmpfile.h +++ b/src/data/case-tmpfile.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -29,7 +29,7 @@ #ifndef DATA_CASE_TMPFILE_H #define DATA_CASE_TMPFILE_H 1 -#include +#include "data/case.h" struct caseproto; diff --git a/src/data/case.c b/src/data/case.c index ffb47fe8..bb6f7c0a 100644 --- a/src/data/case.c +++ b/src/data/case.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2004, 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2004, 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 @@ -16,19 +16,19 @@ #include -#include +#include "data/case.h" #include #include #include -#include -#include -#include -#include +#include "data/value.h" +#include "data/variable.h" +#include "libpspp/assertion.h" +#include "libpspp/str.h" -#include "minmax.h" -#include "xalloc.h" +#include "gl/minmax.h" +#include "gl/xalloc.h" /* Set this flag to 1 to copy cases instead of ref counting them. This is sometimes helpful in debugging situations. */ diff --git a/src/data/case.h b/src/data/case.h index c07b07d2..1f5e192f 100644 --- a/src/data/case.h +++ b/src/data/case.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2004, 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2004, 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 @@ -21,8 +21,9 @@ #include #include #include -#include -#include + +#include "libpspp/compiler.h" +#include "data/caseproto.h" struct variable; diff --git a/src/data/casegrouper.c b/src/data/casegrouper.c index dee1488e..52238c8c 100644 --- a/src/data/casegrouper.c +++ b/src/data/casegrouper.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,17 +16,17 @@ #include -#include +#include "data/casegrouper.h" #include -#include -#include -#include -#include -#include +#include "data/casereader.h" +#include "data/casewriter.h" +#include "data/dictionary.h" +#include "data/subcase.h" +#include "libpspp/taint.h" -#include "xalloc.h" +#include "gl/xalloc.h" /* A casegrouper. */ struct casegrouper diff --git a/src/data/caseinit.c b/src/data/caseinit.c index 572f9160..69a0f018 100644 --- a/src/data/caseinit.c +++ b/src/data/caseinit.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,21 +16,21 @@ #include -#include +#include "data/caseinit.h" #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include "data/case.h" +#include "data/dictionary.h" +#include "data/value.h" +#include "data/variable.h" +#include "libpspp/array.h" +#include "libpspp/assertion.h" +#include "libpspp/compiler.h" -#include "xalloc.h" +#include "gl/xalloc.h" /* Initializer list: a set of values to write to locations within a case. */ diff --git a/src/data/caseproto.c b/src/data/caseproto.c index 9837013a..d62af283 100644 --- a/src/data/caseproto.c +++ b/src/data/caseproto.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,14 +16,15 @@ #include -#include -#include -#include -#include -#include -#include +#include "data/caseproto.h" -#include "minmax.h" +#include "data/val-type.h" +#include "data/value.h" +#include "libpspp/array.h" +#include "libpspp/assertion.h" +#include "libpspp/pool.h" + +#include "gl/minmax.h" static struct caseproto *caseproto_unshare (struct caseproto *); static bool try_init_long_strings (const struct caseproto *, diff --git a/src/data/caseproto.h b/src/data/caseproto.h index b0f45c41..0bc02812 100644 --- a/src/data/caseproto.h +++ b/src/data/caseproto.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -21,9 +21,10 @@ #include #include #include -#include -#include -#include + +#include "data/value.h" +#include "libpspp/cast.h" +#include "libpspp/compiler.h" /* Case prototype. diff --git a/src/data/casereader-filter.c b/src/data/casereader-filter.c index da515c6d..15fa4a5e 100644 --- a/src/data/casereader-filter.c +++ b/src/data/casereader-filter.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,18 +16,18 @@ #include -#include +#include "data/casereader.h" #include -#include -#include -#include -#include -#include -#include +#include "data/casereader-provider.h" +#include "data/casewriter.h" +#include "data/variable.h" +#include "data/dictionary.h" +#include "libpspp/taint.h" +#include "libpspp/message.h" -#include "xalloc.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/data/casereader-project.c b/src/data/casereader-project.c index 116a3359..d3d560f2 100644 --- a/src/data/casereader-project.c +++ b/src/data/casereader-project.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,8 +16,8 @@ #include -#include -#include +#include "data/casereader-provider.h" +#include "data/subcase.h" #include "gl/xalloc.h" diff --git a/src/data/casereader-provider.h b/src/data/casereader-provider.h index b8d53500..f22cf4ac 100644 --- a/src/data/casereader-provider.h +++ b/src/data/casereader-provider.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -36,7 +36,7 @@ #ifndef DATA_CASEREADER_PROVIDER_H #define DATA_CASEREADER_PROVIDER_H 1 -#include +#include "data/casereader.h" /* Casereader class for sequential data sources. */ struct casereader_class diff --git a/src/data/casereader-select.c b/src/data/casereader-select.c index d75a605b..26accb41 100644 --- a/src/data/casereader-select.c +++ b/src/data/casereader-select.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2010 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 @@ -16,7 +16,7 @@ #include -#include +#include "data/casereader-provider.h" #include "gl/xalloc.h" diff --git a/src/data/casereader-translator.c b/src/data/casereader-translator.c index fc823049..06218469 100644 --- a/src/data/casereader-translator.c +++ b/src/data/casereader-translator.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -15,15 +15,16 @@ along with this program. If not, see . */ #include -#include -#include + #include -#include -#include -#include +#include "data/casereader-provider.h" +#include "data/casereader.h" +#include "data/val-type.h" +#include "data/variable.h" +#include "libpspp/taint.h" -#include "xalloc.h" +#include "gl/xalloc.h" /* Casereader that applies a user-supplied function to translate each case into another in an arbitrary fashion. */ diff --git a/src/data/casereader.h b/src/data/casereader.h index a2e789ae..8f80c30c 100644 --- a/src/data/casereader.h +++ b/src/data/casereader.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -51,9 +51,9 @@ #ifndef DATA_CASEREADER_H #define DATA_CASEREADER_H 1 -#include -#include -#include +#include "libpspp/compiler.h" +#include "data/case.h" +#include "data/missing-values.h" struct dictionary; struct casereader; diff --git a/src/data/casewindow.c b/src/data/casewindow.c index 936b6aa9..804a58aa 100644 --- a/src/data/casewindow.c +++ b/src/data/casewindow.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -20,17 +20,17 @@ #include -#include +#include "data/casewindow.h" #include -#include -#include -#include -#include -#include +#include "data/case-tmpfile.h" +#include "libpspp/assertion.h" +#include "libpspp/compiler.h" +#include "libpspp/deque.h" +#include "libpspp/taint.h" -#include "xalloc.h" +#include "gl/xalloc.h" /* A queue of cases. */ struct casewindow diff --git a/src/data/casewindow.h b/src/data/casewindow.h index b303c85d..c7a863ea 100644 --- a/src/data/casewindow.h +++ b/src/data/casewindow.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -28,7 +28,7 @@ #ifndef DATA_CASEWINDOW_H #define DATA_CASEWINDOW_H 1 -#include +#include "data/case.h" struct caseproto; diff --git a/src/data/casewriter-provider.h b/src/data/casewriter-provider.h index 7231a1f3..822edfd0 100644 --- a/src/data/casewriter-provider.h +++ b/src/data/casewriter-provider.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -17,7 +17,7 @@ #ifndef DATA_CASEWRITER_PROVIDER_H #define DATA_CASEWRITER_PROVIDER_H 1 -#include +#include "data/casewriter.h" struct casewriter_class { diff --git a/src/data/casewriter-translator.c b/src/data/casewriter-translator.c index e80b9d68..c750c7c7 100644 --- a/src/data/casewriter-translator.c +++ b/src/data/casewriter-translator.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,14 +16,14 @@ #include -#include -#include +#include "data/casewriter.h" +#include "data/casewriter-provider.h" #include -#include +#include "libpspp/taint.h" -#include "xalloc.h" +#include "gl/xalloc.h" struct casewriter_translator { diff --git a/src/data/casewriter.c b/src/data/casewriter.c index 7631d776..6029fc0d 100644 --- a/src/data/casewriter.c +++ b/src/data/casewriter.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,21 +16,21 @@ #include -#include -#include +#include "data/casewriter.h" +#include "data/casewriter-provider.h" #include #include -#include -#include -#include -#include -#include -#include -#include +#include "data/casereader.h" +#include "data/casereader-provider.h" +#include "data/casewindow.h" +#include "data/settings.h" +#include "libpspp/assertion.h" +#include "libpspp/compiler.h" +#include "libpspp/taint.h" -#include "xalloc.h" +#include "gl/xalloc.h" /* A casewriter. */ struct casewriter diff --git a/src/data/casewriter.h b/src/data/casewriter.h index 146cc654..ffe7798a 100644 --- a/src/data/casewriter.h +++ b/src/data/casewriter.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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,8 @@ #define DATA_CASEWRITER_H 1 #include -#include -#include +#include "data/transformations.h" +#include "libpspp/compiler.h" struct casewriter; diff --git a/src/data/data-out.c b/src/data/data-out.c index 96bf58bd..df447a6a 100644 --- a/src/data/data-out.c +++ b/src/data/data-out.c @@ -16,7 +16,7 @@ #include -#include "data-out.h" +#include "data/data-out.h" #include #include @@ -26,22 +26,21 @@ #include #include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "minmax.h" +#include "data/calendar.h" +#include "data/format.h" +#include "data/settings.h" +#include "data/value.h" +#include "libpspp/assertion.h" +#include "libpspp/cast.h" +#include "libpspp/float-format.h" +#include "libpspp/i18n.h" +#include "libpspp/integer-format.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/pool.h" +#include "libpspp/str.h" + +#include "gl/minmax.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/data/data-out.h b/src/data/data-out.h index 00affb0a..7dff4412 100644 --- a/src/data/data-out.h +++ b/src/data/data-out.h @@ -18,8 +18,8 @@ #define DATA_OUT_H 1 #include -#include -#include +#include "libpspp/float-format.h" +#include "libpspp/integer-format.h" struct fmt_spec; struct string; diff --git a/src/data/datasheet.c b/src/data/datasheet.c index de59e73f..ad833325 100644 --- a/src/data/datasheet.c +++ b/src/data/datasheet.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 @@ -16,28 +16,28 @@ #include -#include +#include "data/datasheet.h" #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "minmax.h" -#include "md4.h" -#include "xalloc.h" +#include "data/casereader-provider.h" +#include "data/casereader.h" +#include "data/casewriter.h" +#include "data/lazy-casereader.h" +#include "data/settings.h" +#include "libpspp/array.h" +#include "libpspp/assertion.h" +#include "libpspp/misc.h" +#include "libpspp/range-map.h" +#include "libpspp/range-set.h" +#include "libpspp/sparse-xarray.h" +#include "libpspp/taint.h" +#include "libpspp/tower.h" + +#include "gl/minmax.h" +#include "gl/md4.h" +#include "gl/xalloc.h" struct column; diff --git a/src/data/datasheet.h b/src/data/datasheet.h index 0508896a..ab6c28d8 100644 --- a/src/data/datasheet.h +++ b/src/data/datasheet.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -17,8 +17,8 @@ #ifndef DATA_DATASHEET_H #define DATA_DATASHEET_H 1 -#include -#include +#include "data/case.h" +#include "data/value.h" struct caseproto; struct casereader; diff --git a/src/data/dict-class.c b/src/data/dict-class.c index c79b29a2..5f0d036f 100644 --- a/src/data/dict-class.c +++ b/src/data/dict-class.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007, 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 @@ -16,9 +16,9 @@ #include -#include +#include "data/dict-class.h" -#include +#include "libpspp/assertion.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/data/dictionary.h b/src/data/dictionary.h index 3455a74f..dd220e4d 100644 --- a/src/data/dictionary.h +++ b/src/data/dictionary.h @@ -19,8 +19,8 @@ #include #include -#include -#include +#include "data/case.h" +#include "data/dict-class.h" struct string; struct ccase; diff --git a/src/data/file-handle-def.c b/src/data/file-handle-def.c index 2d69e258..d411d691 100644 --- a/src/data/file-handle-def.c +++ b/src/data/file-handle-def.c @@ -16,25 +16,25 @@ #include -#include "file-handle-def.h" +#include "data/file-handle-def.h" #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "libpspp/compiler.h" +#include "libpspp/hmap.h" +#include "libpspp/i18n.h" +#include "libpspp/ll.h" +#include "libpspp/message.h" +#include "libpspp/str.h" +#include "libpspp/hash-functions.h" +#include "data/file-name.h" +#include "data/variable.h" +#include "data/scratch-handle.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/data/format-guesser.c b/src/data/format-guesser.c index bdf46a06..17c5da90 100644 --- a/src/data/format-guesser.c +++ b/src/data/format-guesser.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008, 2010 Free Software Foundation, Inc. + Copyright (C) 2008, 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 @@ -16,19 +16,19 @@ #include -#include "format-guesser.h" +#include "data/format-guesser.h" #include #include -#include "c-ctype.h" -#include "minmax.h" -#include "xalloc.h" +#include "data/format.h" +#include "data/settings.h" +#include "libpspp/assertion.h" +#include "libpspp/str.h" -#include -#include -#include -#include +#include "gl/c-ctype.h" +#include "gl/minmax.h" +#include "gl/xalloc.h" /* A token in which potential date or time fields are broken. diff --git a/src/data/format-guesser.h b/src/data/format-guesser.h index 23249f6a..395da577 100644 --- a/src/data/format-guesser.h +++ b/src/data/format-guesser.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008 Free Software Foundation, Inc. + Copyright (C) 2008, 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 @@ -17,7 +17,8 @@ #ifndef FORMAT_GUESSER_H #define FORMAT_GUESSER_H 1 -#include +#include "libpspp/str.h" + struct fmt_spec; struct fmt_guesser *fmt_guesser_create (void); diff --git a/src/data/format.h b/src/data/format.h index 7df37445..481ac87f 100644 --- a/src/data/format.h +++ b/src/data/format.h @@ -20,8 +20,8 @@ /* Display format types. */ #include -#include -#include +#include "data/val-type.h" +#include "libpspp/str.h" /* Format type categories. diff --git a/src/data/gnumeric-reader.c b/src/data/gnumeric-reader.c index 9772d82a..6392f9b8 100644 --- a/src/data/gnumeric-reader.c +++ b/src/data/gnumeric-reader.c @@ -18,10 +18,10 @@ #include -#include -#include +#include "libpspp/message.h" +#include "libpspp/misc.h" -#include "minmax.h" +#include "gl/minmax.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -40,26 +40,24 @@ gnumeric_open_reader (struct gnumeric_read_info *gri, struct dictionary **dict) #else +#include "data/gnumeric-reader.h" + #include #include #include - -#include - #include #include -#include -#include -#include -#include -#include -#include - -#include -#include +#include "data/case.h" +#include "data/casereader-provider.h" +#include "data/dictionary.h" +#include "data/identifier.h" +#include "data/value.h" +#include "data/variable.h" +#include "libpspp/i18n.h" +#include "libpspp/str.h" -#include "gnumeric-reader.h" +#include "gl/xalloc.h" /* Default width of string variables. */ #define GNUMERIC_DEFAULT_WIDTH 8 diff --git a/src/data/lazy-casereader.c b/src/data/lazy-casereader.c index 44897d16..bc68b938 100644 --- a/src/data/lazy-casereader.c +++ b/src/data/lazy-casereader.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,16 +16,16 @@ #include -#include +#include "data/lazy-casereader.h" #include -#include -#include -#include -#include +#include "data/case.h" +#include "data/casereader.h" +#include "data/casereader-provider.h" +#include "libpspp/assertion.h" -#include "xalloc.h" +#include "gl/xalloc.h" /* A lazy casereader's auxiliary data. */ struct lazy_casereader diff --git a/src/data/lazy-casereader.h b/src/data/lazy-casereader.h index 561d98eb..ed0e37b4 100644 --- a/src/data/lazy-casereader.h +++ b/src/data/lazy-casereader.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -27,7 +27,7 @@ #define DATA_LAZY_CASEREADER_H 1 #include -#include +#include "data/case.h" struct casereader *lazy_casereader_create (const struct caseproto *, casenumber case_cnt, diff --git a/src/data/missing-values.c b/src/data/missing-values.c index 61bb9bcb..0fc9d01a 100644 --- a/src/data/missing-values.c +++ b/src/data/missing-values.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2005, 2009 Free Software Foundation, Inc. + Copyright (C) 2005, 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 @@ -15,12 +15,15 @@ along with this program. If not, see . */ #include -#include + +#include "data/missing-values.h" + #include #include -#include -#include -#include + +#include "data/variable.h" +#include "libpspp/assertion.h" +#include "libpspp/str.h" /* Types of user-missing values. Invisible--use access functions defined below instead. */ diff --git a/src/data/por-file-reader.c b/src/data/por-file-reader.c index bee1008e..3f8ee3c9 100644 --- a/src/data/por-file-reader.c +++ b/src/data/por-file-reader.c @@ -15,7 +15,8 @@ along with this program. If not, see . */ #include -#include "por-file-reader.h" + +#include "data/por-file-reader.h" #include #include @@ -26,21 +27,21 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "data/casereader-provider.h" +#include "data/casereader.h" +#include "data/dictionary.h" +#include "data/file-handle-def.h" +#include "data/file-name.h" +#include "data/format.h" +#include "data/missing-values.h" +#include "data/short-names.h" +#include "data/value-labels.h" +#include "data/variable.h" +#include "libpspp/compiler.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/pool.h" +#include "libpspp/str.h" #include "gl/intprops.h" #include "gl/minmax.h" diff --git a/src/data/por-file-writer.c b/src/data/por-file-writer.c index c5f758a1..ee84e7c9 100644 --- a/src/data/por-file-writer.c +++ b/src/data/por-file-writer.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 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 @@ -15,7 +15,8 @@ along with this program. If not, see . */ #include -#include "por-file-writer.h" + +#include "data/por-file-writer.h" #include #include @@ -26,26 +27,25 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include "minmax.h" -#include "xalloc.h" +#include "data/case.h" +#include "data/casewriter-provider.h" +#include "data/casewriter.h" +#include "data/dictionary.h" +#include "data/file-handle-def.h" +#include "data/file-name.h" +#include "data/format.h" +#include "data/make-file.h" +#include "data/missing-values.h" +#include "data/short-names.h" +#include "data/value-labels.h" +#include "data/variable.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/str.h" +#include "libpspp/version.h" + +#include "gl/minmax.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/data/procedure.h b/src/data/procedure.h index bb4dad2b..fd3af604 100644 --- a/src/data/procedure.h +++ b/src/data/procedure.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 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 @@ -20,8 +20,8 @@ #include #include -#include -#include +#include "data/transformations.h" +#include "libpspp/compiler.h" struct casereader; struct dataset; diff --git a/src/data/psql-reader.c b/src/data/psql-reader.c index 378a56af..346d214a 100644 --- a/src/data/psql-reader.c +++ b/src/data/psql-reader.c @@ -16,23 +16,23 @@ #include -#include -#include -#include -#include -#include -#include - -#include "psql-reader.h" -#include "variable.h" -#include "format.h" -#include "calendar.h" +#include "data/psql-reader.h" #include -#include -#include +#include +#include -#include "minmax.h" +#include "data/calendar.h" +#include "data/casereader-provider.h" +#include "data/dictionary.h" +#include "data/format.h" +#include "data/variable.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/str.h" + +#include "gl/xalloc.h" +#include "gl/minmax.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/data/psql-reader.h b/src/data/psql-reader.h index 2811daa5..8fd584c6 100644 --- a/src/data/psql-reader.h +++ b/src/data/psql-reader.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008 Free Software Foundation, Inc. + Copyright (C) 2008, 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,7 +18,7 @@ #define PSQL_READER_H 1 #include -#include +#include "libpspp/str.h" struct casereader; diff --git a/src/data/scratch-handle.c b/src/data/scratch-handle.c index 66819369..a95f2cc2 100644 --- a/src/data/scratch-handle.c +++ b/src/data/scratch-handle.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 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 @@ -15,10 +15,13 @@ along with this program. If not, see . */ #include + +#include "data/scratch-handle.h" + #include -#include -#include -#include + +#include "data/casereader.h" +#include "data/dictionary.h" /* Destroys HANDLE. */ void diff --git a/src/data/scratch-reader.c b/src/data/scratch-reader.c index 3aa1768d..5def728e 100644 --- a/src/data/scratch-reader.c +++ b/src/data/scratch-reader.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 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 @@ -16,19 +16,19 @@ #include -#include +#include "data/scratch-reader.h" #include -#include -#include -#include -#include -#include -#include -#include +#include "data/case.h" +#include "data/casereader.h" +#include "data/dictionary.h" +#include "data/file-handle-def.h" +#include "data/scratch-handle.h" +#include "libpspp/assertion.h" +#include "libpspp/message.h" -#include "xalloc.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/data/scratch-writer.c b/src/data/scratch-writer.c index 631305fe..2c545c7d 100644 --- a/src/data/scratch-writer.c +++ b/src/data/scratch-writer.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,23 +16,23 @@ #include -#include "scratch-writer.h" +#include "data/scratch-writer.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/case.h" +#include "data/case-map.h" +#include "data/casereader.h" +#include "data/casewriter-provider.h" +#include "data/casewriter.h" +#include "data/dictionary.h" +#include "data/file-handle-def.h" +#include "data/scratch-handle.h" +#include "data/variable.h" +#include "libpspp/compiler.h" +#include "libpspp/taint.h" + +#include "gl/xalloc.h" #define N_(msgid) (msgid) diff --git a/src/data/subcase.c b/src/data/subcase.c index 32056215..f87093cd 100644 --- a/src/data/subcase.c +++ b/src/data/subcase.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2008, 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 @@ -15,13 +15,16 @@ along with this program. If not, see . */ #include -#include + +#include "data/subcase.h" + #include -#include -#include -#include -#include "xalloc.h" +#include "data/case.h" +#include "data/variable.h" +#include "libpspp/assertion.h" + +#include "gl/xalloc.h" static void invalidate_proto (struct subcase *sc); diff --git a/src/data/sys-file-reader.h b/src/data/sys-file-reader.h index 24285749..74956516 100644 --- a/src/data/sys-file-reader.h +++ b/src/data/sys-file-reader.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009 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 @@ -20,9 +20,9 @@ #include #include -#include -#include -#include +#include "data/case.h" +#include "libpspp/float-format.h" +#include "libpspp/integer-format.h" /* Reading system files. */ diff --git a/src/data/transformations.c b/src/data/transformations.c index 2a73cade..8321cf5d 100644 --- a/src/data/transformations.c +++ b/src/data/transformations.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2009 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 @@ -16,14 +16,14 @@ #include -#include +#include "data/transformations.h" #include #include -#include +#include "libpspp/str.h" -#include "xalloc.h" +#include "gl/xalloc.h" /* A single transformation. */ struct transformation diff --git a/src/data/transformations.h b/src/data/transformations.h index 59001f11..013bcaa7 100644 --- a/src/data/transformations.h +++ b/src/data/transformations.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2009 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 @@ -19,7 +19,7 @@ #include #include -#include +#include "data/case.h" /* trns_proc_func return values. */ enum trns_result diff --git a/src/data/val-type.h b/src/data/val-type.h index 27139af9..8aaa06a0 100644 --- a/src/data/val-type.h +++ b/src/data/val-type.h @@ -1,5 +1,5 @@ /* PSPP - computes sample statistics. - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007, 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 @@ -21,7 +21,7 @@ #include #include -#include +#include "libpspp/float-format.h" /* Special numeric values. */ #define SYSMIS (-DBL_MAX) /* System-missing value. */ diff --git a/src/data/value-labels.c b/src/data/value-labels.c index b1c0dc7a..6d8f5175 100644 --- a/src/data/value-labels.c +++ b/src/data/value-labels.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -16,23 +16,23 @@ #include -#include "value-labels.h" +#include "data/value-labels.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "data/data-out.h" +#include "data/value.h" +#include "data/variable.h" +#include "libpspp/array.h" +#include "libpspp/cast.h" +#include "libpspp/compiler.h" +#include "libpspp/hash-functions.h" +#include "libpspp/hmap.h" +#include "libpspp/intern.h" +#include "libpspp/message.h" +#include "libpspp/str.h" -#include "xalloc.h" +#include "gl/xalloc.h" /* Creates and returns a new, empty set of value labels with the given WIDTH. */ diff --git a/src/data/value-labels.h b/src/data/value-labels.h index d6f65d43..6cb5259e 100644 --- a/src/data/value-labels.h +++ b/src/data/value-labels.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009 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 @@ -27,8 +27,8 @@ #include #include -#include -#include +#include "data/value.h" +#include "libpspp/hmap.h" /* One value label. diff --git a/src/data/value.c b/src/data/value.c index 65b250e0..144f39b5 100644 --- a/src/data/value.c +++ b/src/data/value.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -15,17 +15,18 @@ along with this program. If not, see . */ #include -#include -#include -#include -#include -#include -#include -#include +#include "data/value.h" -#include "minmax.h" -#include "xalloc.h" +#include "data/val-type.h" +#include "data/variable.h" +#include "libpspp/hash-functions.h" +#include "libpspp/pool.h" +#include "libpspp/str.h" +#include "gl/unistr.h" + +#include "gl/minmax.h" +#include "gl/xalloc.h" /* Copies the contents of string value SRC with width SRC_WIDTH to string value DST with width DST_WIDTH. If SRC_WIDTH is diff --git a/src/data/variable.c b/src/data/variable.c index cd8d498d..2ceeb0d0 100644 --- a/src/data/variable.c +++ b/src/data/variable.c @@ -15,28 +15,28 @@ along with this program. If not, see . */ #include -#include "variable.h" + +#include "data/variable.h" #include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "minmax.h" -#include "xalloc.h" +#include "data/attributes.h" +#include "data/data-out.h" +#include "data/dictionary.h" +#include "data/format.h" +#include "data/identifier.h" +#include "data/missing-values.h" +#include "data/value-labels.h" +#include "data/vardict.h" +#include "libpspp/assertion.h" +#include "libpspp/compiler.h" +#include "libpspp/hash-functions.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/str.h" + +#include "gl/minmax.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/data/variable.h b/src/data/variable.h index 524a6be2..03257502 100644 --- a/src/data/variable.h +++ b/src/data/variable.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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,9 +19,9 @@ #include #include -#include -#include -#include +#include "data/dict-class.h" +#include "data/missing-values.h" +#include "data/val-type.h" union value; diff --git a/src/data/vector.h b/src/data/vector.h index b009fcb2..fc2bf951 100644 --- a/src/data/vector.h +++ b/src/data/vector.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 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,7 +18,7 @@ #define DATA_VECTOR_H 1 #include -#include +#include "data/variable.h" struct dictionary; diff --git a/src/language/control/control-stack.c b/src/language/control/control-stack.c index 8456f819..f806c780 100644 --- a/src/language/control/control-stack.c +++ b/src/language/control/control-stack.c @@ -1,10 +1,14 @@ #include -#include "control-stack.h" + +#include "language/control/control-stack.h" + #include #include -#include -#include -#include "xalloc.h" + +#include "libpspp/compiler.h" +#include "libpspp/message.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/control/do-if.c b/src/language/control/do-if.c index b3b6135f..a80dae31 100644 --- a/src/language/control/do-if.c +++ b/src/language/control/do-if.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009 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 @@ -18,19 +18,19 @@ #include -#include "control-stack.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/case.h" +#include "data/procedure.h" +#include "data/transformations.h" +#include "data/value.h" +#include "language/command.h" +#include "language/control/control-stack.h" +#include "language/expressions/public.h" +#include "language/lexer/lexer.h" +#include "libpspp/compiler.h" +#include "libpspp/message.h" +#include "libpspp/str.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/control/loop.c b/src/language/control/loop.c index 5e99232f..362f1993 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 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -16,24 +16,24 @@ #include -#include "control-stack.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "language/control/control-stack.h" + +#include "data/case.h" +#include "data/dictionary.h" +#include "data/procedure.h" +#include "data/settings.h" +#include "data/transformations.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/expressions/public.h" +#include "language/lexer/lexer.h" +#include "libpspp/compiler.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/pool.h" +#include "libpspp/str.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/control/repeat.c b/src/language/control/repeat.c index 7b5634c8..24e3272a 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 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -16,29 +16,29 @@ #include -#include "repeat.h" +#include "language/control/repeat.h" #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "intprops.h" -#include "xalloc.h" +#include "data/dictionary.h" +#include "data/procedure.h" +#include "data/settings.h" +#include "libpspp/getl.h" +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/cast.h" +#include "libpspp/ll.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/pool.h" +#include "libpspp/str.h" +#include "data/variable.h" + +#include "gl/intprops.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/control/temporary.c b/src/language/control/temporary.c index bc3c767c..eda939bb 100644 --- a/src/language/control/temporary.c +++ b/src/language/control/temporary.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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,18 +19,18 @@ #include #include -#include "control-stack.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/dictionary.h" +#include "data/procedure.h" +#include "data/transformations.h" +#include "data/value-labels.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/control/control-stack.h" +#include "language/lexer/lexer.h" +#include "libpspp/message.h" +#include "libpspp/str.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/combine-files.c b/src/language/data-io/combine-files.c index 0f951889..82c36945 100644 --- a/src/language/data-io/combine-files.c +++ b/src/language/data-io/combine-files.c @@ -18,28 +18,28 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/any-reader.h" +#include "data/case-matcher.h" +#include "data/case.h" +#include "data/casereader.h" +#include "data/casewriter.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" +#include "language/data-io/file-handle.h" +#include "language/data-io/trim.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "language/stats/sort-criteria.h" +#include "libpspp/assertion.h" +#include "libpspp/message.h" +#include "libpspp/taint.h" +#include "math/sort.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/data-list.c b/src/language/data-io/data-list.c index 046c7b0e..043b424d 100644 --- a/src/language/data-io/data-list.c +++ b/src/language/data-io/data-list.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 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 @@ -22,33 +22,33 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xsize.h" -#include "xalloc.h" +#include "data/case.h" +#include "data/casereader.h" +#include "data/data-in.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" +#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/lexer/format-parser.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/assertion.h" +#include "libpspp/compiler.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/pool.h" +#include "libpspp/str.h" + +#include "gl/xsize.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/data-parser.c b/src/language/data-io/data-parser.c index 1e67c713..630363af 100644 --- a/src/language/data-io/data-parser.c +++ b/src/language/data-io/data-parser.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 @@ -16,24 +16,24 @@ #include -#include +#include "language/data-io/data-parser.h" #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/casereader-provider.h" +#include "data/data-in.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" +#include "libpspp/str.h" +#include "output/tab.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/data-parser.h b/src/language/data-io/data-parser.h index 5a53a2f6..013e7078 100644 --- a/src/language/data-io/data-parser.h +++ b/src/language/data-io/data-parser.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007, 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 @@ -20,8 +20,8 @@ /* Abstraction of a DATA LIST or GET DATA TYPE=TXT data parser. */ #include -#include -#include +#include "data/case.h" +#include "libpspp/str.h" struct dataset; struct dfm_reader; diff --git a/src/language/data-io/data-reader.c b/src/language/data-io/data-reader.c index 5ff16933..2cec413b 100644 --- a/src/language/data-io/data-reader.c +++ b/src/language/data-io/data-reader.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-2004, 2006, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-2004, 2006, 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 @@ -16,7 +16,7 @@ #include -#include +#include "language/data-io/data-reader.h" #include #include @@ -25,22 +25,22 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "minmax.h" -#include "xalloc.h" +#include "data/casereader.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" +#include "language/prompt.h" +#include "libpspp/assertion.h" +#include "libpspp/cast.h" +#include "libpspp/integer-format.h" +#include "libpspp/message.h" +#include "libpspp/str.h" + +#include "gl/minmax.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/data-writer.c b/src/language/data-io/data-writer.c index fd77d504..113be588 100644 --- a/src/language/data-io/data-writer.c +++ b/src/language/data-io/data-writer.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-2004, 2006, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-2004, 2006, 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 @@ -16,7 +16,7 @@ #include -#include +#include "language/data-io/data-writer.h" #include #include @@ -24,16 +24,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "data/file-name.h" +#include "data/make-file.h" +#include "language/data-io/file-handle.h" +#include "libpspp/assertion.h" +#include "libpspp/integer-format.h" +#include "libpspp/message.h" +#include "libpspp/str.h" -#include "minmax.h" -#include "xalloc.h" +#include "gl/minmax.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/file-handle.h b/src/language/data-io/file-handle.h index 86518f73..2dfb5e16 100644 --- a/src/language/data-io/file-handle.h +++ b/src/language/data-io/file-handle.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -21,7 +21,7 @@ #include #include -#include +#include "data/file-handle-def.h" struct lexer ; struct file_handle *fh_parse (struct lexer *, enum fh_referent); diff --git a/src/language/data-io/file-handle.q b/src/language/data-io/file-handle.q index a3ff4102..e847e00f 100644 --- a/src/language/data-io/file-handle.q +++ b/src/language/data-io/file-handle.q @@ -19,17 +19,18 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" + +#include "data/file-name.h" +#include "language/command.h" +#include "language/data-io/file-handle.h" +#include "language/lexer/lexer.h" +#include "libpspp/assertion.h" +#include "libpspp/message.h" +#include "libpspp/str.h" +#include "data/variable.h" +#include "data/file-handle-def.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/get-data.c b/src/language/data-io/get-data.c index f055af2d..7e75b413 100644 --- a/src/language/data-io/get-data.c +++ b/src/language/data-io/get-data.c @@ -18,23 +18,22 @@ #include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.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" +#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/lexer/format-parser.h" +#include "language/lexer/lexer.h" +#include "libpspp/message.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/get.c b/src/language/data-io/get.c index fea38812..aa2b91fe 100644 --- a/src/language/data-io/get.c +++ b/src/language/data-io/get.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2007, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -18,22 +18,22 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/any-reader.h" +#include "data/case-map.h" +#include "data/case.h" +#include "data/casereader.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" +#include "language/lexer/lexer.h" +#include "libpspp/compiler.h" +#include "libpspp/misc.h" +#include "libpspp/str.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/inpt-pgm.c b/src/language/data-io/inpt-pgm.c index 405f605a..415c48c7 100644 --- a/src/language/data-io/inpt-pgm.c +++ b/src/language/data-io/inpt-pgm.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -20,26 +20,26 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/case.h" +#include "data/caseinit.h" +#include "data/casereader-provider.h" +#include "data/dictionary.h" +#include "data/procedure.h" +#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/expressions/public.h" +#include "language/lexer/lexer.h" +#include "libpspp/assertion.h" +#include "libpspp/compiler.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/str.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/list.q b/src/language/data-io/list.q index 738b6671..33b82830 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 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 @@ -20,29 +20,28 @@ #include #include -#include "intprops.h" -#include "xmalloca.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "minmax.h" -#include "xalloc.h" +#include "data/casegrouper.h" +#include "data/casereader.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" +#include "language/dictionary/split-file.h" +#include "language/lexer/lexer.h" +#include "libpspp/compiler.h" +#include "libpspp/ll.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "output/tab.h" +#include "output/table-item.h" + +#include "gl/intprops.h" +#include "gl/minmax.h" +#include "gl/xalloc.h" +#include "gl/xmalloca.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/placement-parser.c b/src/language/data-io/placement-parser.c index 820560df..4d0a0b4c 100644 --- a/src/language/data-io/placement-parser.c +++ b/src/language/data-io/placement-parser.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006, 2010 Free Software Foundation, Inc. + Copyright (C) 2006, 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 @@ -16,20 +16,19 @@ #include -#include +#include "language/data-io/placement-parser.h" #include -#include -#include -#include -#include -#include +#include "data/format.h" +#include "language/lexer/format-parser.h" +#include "language/lexer/lexer.h" +#include "libpspp/message.h" +#include "libpspp/pool.h" +#include "libpspp/str.h" -#include - -#include "xalloc.h" -#include "xsize.h" +#include "gl/xalloc.h" +#include "gl/xsize.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/print-space.c b/src/language/data-io/print-space.c index 73712c0d..b7683670 100644 --- a/src/language/data-io/print-space.c +++ b/src/language/data-io/print-space.c @@ -19,17 +19,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/procedure.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/expressions/public.h" +#include "language/lexer/lexer.h" +#include "libpspp/message.h" +#include "output/text-item.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/print.c b/src/language/data-io/print.c index 62798272..c52a59cf 100644 --- a/src/language/data-io/print.c +++ b/src/language/data-io/print.c @@ -18,30 +18,30 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/case.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" +#include "language/data-io/data-writer.h" +#include "language/data-io/file-handle.h" +#include "language/data-io/placement-parser.h" +#include "language/lexer/format-parser.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/assertion.h" +#include "libpspp/compiler.h" +#include "libpspp/i18n.h" +#include "libpspp/ll.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/pool.h" +#include "output/tab.h" +#include "output/text-item.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/save.c b/src/language/data-io/save.c index 5b51309b..b06a850a 100644 --- a/src/language/data-io/save.c +++ b/src/language/data-io/save.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2007, 2008, 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 @@ -18,25 +18,25 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/any-writer.h" +#include "data/case-map.h" +#include "data/case.h" +#include "data/casereader.h" +#include "data/casewriter.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" +#include "language/command.h" +#include "language/data-io/file-handle.h" +#include "language/data-io/trim.h" +#include "language/lexer/lexer.h" +#include "libpspp/assertion.h" +#include "libpspp/compiler.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/data-io/trim.c b/src/language/data-io/trim.c index 9f76b105..ac8bf272 100644 --- a/src/language/data-io/trim.c +++ b/src/language/data-io/trim.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2007, 2008, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2007, 2008, 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 @@ -16,17 +16,17 @@ #include -#include +#include "language/data-io/trim.h" #include -#include -#include -#include -#include -#include +#include "data/dictionary.h" +#include "data/variable.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/message.h" -#include "xalloc.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/dictionary/apply-dictionary.c b/src/language/dictionary/apply-dictionary.c index 3eb29e7e..7fdbdd47 100644 --- a/src/language/dictionary/apply-dictionary.c +++ b/src/language/dictionary/apply-dictionary.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -18,19 +18,19 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "data/any-reader.h" +#include "data/casereader.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" +#include "language/data-io/file-handle.h" +#include "language/lexer/lexer.h" +#include "libpspp/message.h" +#include "libpspp/str.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/dictionary/attributes.c b/src/language/dictionary/attributes.c index 1f9e9849..b0c9ddfd 100644 --- a/src/language/dictionary/attributes.c +++ b/src/language/dictionary/attributes.c @@ -18,16 +18,16 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/attributes.h" +#include "data/dictionary.h" +#include "data/procedure.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/message.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/dictionary/delete-variables.c b/src/language/dictionary/delete-variables.c index 97c54a81..526fa1cd 100644 --- a/src/language/dictionary/delete-variables.c +++ b/src/language/dictionary/delete-variables.c @@ -18,12 +18,12 @@ #include -#include -#include -#include -#include -#include -#include +#include "data/casereader.h" +#include "data/dictionary.h" +#include "data/procedure.h" +#include "language/command.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/message.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/dictionary/formats.c b/src/language/dictionary/formats.c index de586156..b40f202c 100644 --- a/src/language/dictionary/formats.c +++ b/src/language/dictionary/formats.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 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 @@ -20,16 +20,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "data/format.h" +#include "data/procedure.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/lexer/format-parser.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/str.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/dictionary/missing-values.c b/src/language/dictionary/missing-values.c index 4a14ee19..ace99484 100644 --- a/src/language/dictionary/missing-values.c +++ b/src/language/dictionary/missing-values.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 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 @@ -18,18 +18,18 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "data/data-in.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" +#include "language/lexer/lexer.h" +#include "language/lexer/value-parser.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/message.h" +#include "libpspp/str.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/dictionary/modify-variables.c b/src/language/dictionary/modify-variables.c index aae81222..afb90899 100644 --- a/src/language/dictionary/modify-variables.c +++ b/src/language/dictionary/modify-variables.c @@ -18,21 +18,21 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/dictionary.h" +#include "data/procedure.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/assertion.h" +#include "libpspp/bit-vector.h" +#include "libpspp/compiler.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/str.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/dictionary/numeric.c b/src/language/dictionary/numeric.c index 946c35c1..25b2ecf8 100644 --- a/src/language/dictionary/numeric.c +++ b/src/language/dictionary/numeric.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 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 @@ -18,17 +18,17 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "data/dictionary.h" +#include "data/procedure.h" +#include "data/variable.h" +#include "data/format.h" +#include "language/command.h" +#include "language/lexer/format-parser.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/assertion.h" +#include "libpspp/message.h" +#include "libpspp/str.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/dictionary/rename-variables.c b/src/language/dictionary/rename-variables.c index 79ab997c..43745045 100644 --- a/src/language/dictionary/rename-variables.c +++ b/src/language/dictionary/rename-variables.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -18,16 +18,16 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "data/dictionary.h" +#include "data/procedure.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/message.h" +#include "libpspp/str.h" -#include "xalloc.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/dictionary/split-file.c b/src/language/dictionary/split-file.c index d27ab3a6..02e7696b 100644 --- a/src/language/dictionary/split-file.c +++ b/src/language/dictionary/split-file.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009 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 @@ -18,22 +18,22 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/case.h" +#include "data/data-out.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" +#include "language/dictionary/split-file.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/message.h" +#include "libpspp/str.h" +#include "output/tab.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/dictionary/sys-file-info.c b/src/language/dictionary/sys-file-info.c index 30402422..952930b5 100644 --- a/src/language/dictionary/sys-file-info.c +++ b/src/language/dictionary/sys-file-info.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 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,28 +19,28 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "minmax.h" -#include "xalloc.h" +#include "data/attributes.h" +#include "data/casereader.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" +#include "data/vector.h" +#include "language/command.h" +#include "language/data-io/file-handle.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/array.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "output/tab.h" + +#include "gl/minmax.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c index 8c312ab8..9068290b 100644 --- a/src/language/dictionary/value-labels.c +++ b/src/language/dictionary/value-labels.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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,17 +19,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/procedure.h" +#include "data/value-labels.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "language/lexer/value-parser.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/message.h" +#include "libpspp/str.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c index 8351ff61..4b68f902 100644 --- a/src/language/dictionary/variable-display.c +++ b/src/language/dictionary/variable-display.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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,16 +19,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "data/procedure.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/message.h" +#include "libpspp/str.h" -#include "minmax.h" -#include "xalloc.h" +#include "gl/minmax.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/dictionary/variable-label.c b/src/language/dictionary/variable-label.c index 804a4213..4735047c 100644 --- a/src/language/dictionary/variable-label.c +++ b/src/language/dictionary/variable-label.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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,15 +19,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "data/procedure.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/message.h" +#include "libpspp/str.h" -#include "xalloc.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/dictionary/vector.c b/src/language/dictionary/vector.c index 8eb7ef16..bf257194 100644 --- a/src/language/dictionary/vector.c +++ b/src/language/dictionary/vector.c @@ -18,22 +18,22 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "intprops.h" -#include "xalloc.h" +#include "data/format.h" +#include "data/procedure.h" +#include "data/dictionary.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/lexer/format-parser.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/assertion.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/pool.h" +#include "libpspp/str.h" + +#include "gl/intprops.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/dictionary/weight.c b/src/language/dictionary/weight.c index 7e25a646..cca9aebe 100644 --- a/src/language/dictionary/weight.c +++ b/src/language/dictionary/weight.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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,14 +18,14 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "data/procedure.h" +#include "data/dictionary.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/message.h" +#include "libpspp/str.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/expressions/evaluate.c b/src/language/expressions/evaluate.c index 6ac05721..fea0e56b 100644 --- a/src/language/expressions/evaluate.c +++ b/src/language/expressions/evaluate.c @@ -15,15 +15,17 @@ along with this program. If not, see . */ #include -#include "evaluate.h" + +#include "language/expressions/evaluate.h" #include -#include -#include -#include -#include -#include -#include + +#include "libpspp/assertion.h" +#include "libpspp/message.h" +#include "language/expressions/helpers.h" +#include "language/expressions/private.h" +#include "language/lexer/value-parser.h" +#include "libpspp/pool.h" #include "xalloc.h" @@ -102,8 +104,8 @@ expr_evaluate_str (struct expression *e, const struct ccase *c, int case_idx, buf_copy_rpad (dst, dst_size, s.string, s.length, ' '); } -#include -#include +#include "language/lexer/lexer.h" +#include "language/command.h" int cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED) diff --git a/src/language/expressions/helpers.c b/src/language/expressions/helpers.c index ac17c1ce..7c3371f5 100644 --- a/src/language/expressions/helpers.c +++ b/src/language/expressions/helpers.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008, 2010 Free Software Foundation, Inc. + Copyright (C) 2008, 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 @@ -15,12 +15,15 @@ along with this program. If not, see . */ #include -#include "helpers.h" + +#include "language/expressions/helpers.h" + #include #include -#include -#include -#include "private.h" + +#include "language/expressions/private.h" +#include "libpspp/assertion.h" +#include "libpspp/pool.h" const struct substring empty_string = {NULL, 0}; diff --git a/src/language/expressions/helpers.h b/src/language/expressions/helpers.h index 59be4005..570cf132 100644 --- a/src/language/expressions/helpers.h +++ b/src/language/expressions/helpers.h @@ -10,24 +10,24 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "data/calendar.h" +#include "data/case.h" +#include "data/data-in.h" +#include "data/data-out.h" +#include "data/dictionary.h" +#include "data/procedure.h" +#include "data/settings.h" +#include "data/value.h" +#include "data/variable.h" +#include "data/vector.h" +#include "language/expressions/public.h" +#include "libpspp/compiler.h" +#include "libpspp/i18n.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/str.h" +#include "math/moments.h" +#include "math/random.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/expressions/optimize.c b/src/language/expressions/optimize.c index b0abd946..8f090778 100644 --- a/src/language/expressions/optimize.c +++ b/src/language/expressions/optimize.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -15,24 +15,27 @@ along with this program. If not, see . */ #include -#include "private.h" + +#include "language/expressions/private.h" + #include #include #include #include -#include -#include -#include -#include -#include "evaluate.h" -#include "helpers.h" -#include -#include -#include "public.h" -#include -#include - -#include "xalloc.h" + +#include "data/calendar.h" +#include "data/data-in.h" +#include "data/variable.h" +#include "language/expressions/evaluate.h" +#include "language/expressions/helpers.h" +#include "language/expressions/public.h" +#include "libpspp/assertion.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/pool.h" +#include "libpspp/str.h" + +#include "gl/xalloc.h" static union any_node *evaluate_tree (struct composite_node *, struct expression *); diff --git a/src/language/expressions/parse.c b/src/language/expressions/parse.c index b311c486..a9c324bc 100644 --- a/src/language/expressions/parse.c +++ b/src/language/expressions/parse.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 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 @@ -23,22 +23,22 @@ #include #include -#include "helpers.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/case.h" +#include "data/dictionary.h" +#include "data/settings.h" +#include "data/variable.h" +#include "language/expressions/helpers.h" +#include "language/lexer/format-parser.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/array.h" +#include "libpspp/assertion.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/pool.h" +#include "libpspp/str.h" + +#include "gl/xalloc.h" /* Declarations. */ diff --git a/src/language/expressions/private.h b/src/language/expressions/private.h index 4283b4ae..1a485bb4 100644 --- a/src/language/expressions/private.h +++ b/src/language/expressions/private.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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,12 +19,11 @@ #include #include -#include -#include "public.h" -#include "operations.h" - -#include +#include "data/format.h" +#include "language/expressions/operations.h" +#include "language/expressions/public.h" +#include "libpspp/str.h" enum operation_flags { diff --git a/src/language/lexer/format-parser.c b/src/language/lexer/format-parser.c index 4b25020e..e3ca9cca 100644 --- a/src/language/lexer/format-parser.c +++ b/src/language/lexer/format-parser.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 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 @@ -16,19 +16,19 @@ #include -#include "format-parser.h" +#include "language/lexer/format-parser.h" #include #include #include -#include "lexer.h" -#include -#include -#include -#include -#include -#include +#include "data/format.h" +#include "data/variable.h" +#include "language/lexer/format-parser.h" +#include "language/lexer/lexer.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/str.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/lexer/lexer.c b/src/language/lexer/lexer.c index a409a83e..eee15d64 100644 --- a/src/language/lexer/lexer.c +++ b/src/language/lexer/lexer.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 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 @@ -16,7 +16,8 @@ #include -#include "lexer.h" +#include "language/lexer/lexer.h" + #include #include #include @@ -25,16 +26,17 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" + +#include "data/settings.h" +#include "language/command.h" +#include "libpspp/assertion.h" +#include "libpspp/getl.h" +#include "libpspp/message.h" +#include "libpspp/str.h" +#include "output/journal.h" +#include "output/text-item.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/lexer/lexer.h b/src/language/lexer/lexer.h index 1abefb6b..f00ca77d 100644 --- a/src/language/lexer/lexer.h +++ b/src/language/lexer/lexer.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -20,9 +20,10 @@ #include #include #include -#include -#include -#include + +#include "data/identifier.h" +#include "data/variable.h" +#include "libpspp/getl.h" struct lexer; diff --git a/src/language/lexer/q2c.c b/src/language/lexer/q2c.c index 4858a257..d578dbc2 100644 --- a/src/language/lexer/q2c.c +++ b/src/language/lexer/q2c.c @@ -2128,17 +2128,19 @@ main (int argc, char *argv[]) indent = 0; dump (0, "#include "); - dump (0, "#include "); - dump (0, "#include "); - dump (0, "#include "); - dump (0, "#include "); - dump (0, "#include "); - dump (0, "#include "); - dump (0, "#include "); - dump (0, "#include "); + dump_blank_line (0); + + dump (0, "#include \"data/settings.h\""); + dump (0, "#include \"data/variable.h\""); + dump (0, "#include \"language/lexer/lexer.h\""); + dump (0, "#include \"language/lexer/subcommand-list.h\""); + dump (0, "#include \"language/lexer/variable-parser.h\""); + dump (0, "#include \"libpspp/assertion.h\""); + dump (0, "#include \"libpspp/message.h\""); + dump (0, "#include \"libpspp/str.h\""); dump_blank_line (0); - dump (0, "#include \"xalloc.h\""); + dump (0, "#include \"gl/xalloc.h\""); dump_blank_line (0); dump (0, "#include \"gettext.h\""); diff --git a/src/language/prompt.c b/src/language/prompt.c index 8701f6c9..614796e1 100644 --- a/src/language/prompt.c +++ b/src/language/prompt.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -20,20 +20,20 @@ #include #include -#include "prompt.h" +#include "language/prompt.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "data/file-name.h" +#include "data/settings.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "libpspp/assertion.h" +#include "libpspp/message.h" +#include "libpspp/str.h" +#include "libpspp/version.h" +#include "output/tab.h" -#include "xalloc.h" +#include "gl/xalloc.h" /* Current prompting style. */ static enum prompt_style current_style; diff --git a/src/language/stats/aggregate.c b/src/language/stats/aggregate.c index dcadff96..319e19a3 100644 --- a/src/language/stats/aggregate.c +++ b/src/language/stats/aggregate.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2008, 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 @@ -16,40 +16,40 @@ #include +#include "language/stats/aggregate.h" + #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "aggregate.h" - -#include "minmax.h" -#include "xalloc.h" +#include "data/any-writer.h" +#include "data/case.h" +#include "data/casegrouper.h" +#include "data/casereader.h" +#include "data/casewriter.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" +#include "data/variable.h" +#include "language/command.h" +#include "language/data-io/file-handle.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "language/stats/sort-criteria.h" +#include "libpspp/assertion.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/pool.h" +#include "libpspp/str.h" +#include "math/moments.h" +#include "math/sort.h" +#include "math/statistic.h" +#include "math/percentiles.h" + +#include "gl/minmax.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/aggregate.h b/src/language/stats/aggregate.h index 1a50bbe4..8cddbcfa 100644 --- a/src/language/stats/aggregate.h +++ b/src/language/stats/aggregate.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2010 Free Software Foundation, Inc. + Copyright (C) 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 @@ -18,11 +18,11 @@ #ifndef AGGREGATE_H #define AGGREGATE_H -#include -#include - #include +#include "data/format.h" +#include "data/val-type.h" + enum agr_src_vars { AGR_SV_NO, diff --git a/src/language/stats/binomial.c b/src/language/stats/binomial.c index 8126daf3..c83e4570 100644 --- a/src/language/stats/binomial.c +++ b/src/language/stats/binomial.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2006, 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 @@ -15,36 +15,33 @@ along with this program. If not, see . */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "language/stats/binomial.h" -#include -#include - -#include "binomial.h" -#include "freq.h" +#include +#include -#include "xalloc.h" +#include "data/case.h" +#include "data/casereader.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" +#include "language/stats/freq.h" +#include "libpspp/assertion.h" +#include "libpspp/compiler.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "output/tab.h" + +#include "gl/xalloc.h" +#include "gl/minmax.h" #include "gettext.h" #define _(msgid) gettext (msgid) -#include - -#include -#include - -#include - static double calculate_binomial_internal (double n1, double n2, double p); diff --git a/src/language/stats/chisquare.c b/src/language/stats/chisquare.c index 62182286..ed91013e 100644 --- a/src/language/stats/chisquare.c +++ b/src/language/stats/chisquare.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006, 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2006, 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 @@ -16,7 +16,7 @@ #include -#include +#include "language/stats/chisquare.h" #include #include diff --git a/src/language/stats/chisquare.h b/src/language/stats/chisquare.h index 182e092e..da9329c0 100644 --- a/src/language/stats/chisquare.h +++ b/src/language/stats/chisquare.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 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 -#include +#include "language/stats/npar.h" struct chisquare_test { diff --git a/src/language/stats/cochran.c b/src/language/stats/cochran.c index 3b6af22d..8576f985 100644 --- a/src/language/stats/cochran.c +++ b/src/language/stats/cochran.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2010 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,27 +16,26 @@ #include -#include "cochran.h" -#include "npar.h" -#include -#include -#include -#include - -#include -#include -#include -#include -#include +#include "language/stats/cochran.h" #include +#include + +#include "data/casereader.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" +#include "libpspp/cast.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "output/tab.h" -#include -#include #include "gettext.h" #define _(msgid) gettext (msgid) - struct cochran { double success; diff --git a/src/language/stats/cochran.h b/src/language/stats/cochran.h index 1ea75053..db42cc3c 100644 --- a/src/language/stats/cochran.h +++ b/src/language/stats/cochran.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2010 Free Software Foundation, Inc. + Copyright (C) 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 -#include +#include "language/stats/npar.h" diff --git a/src/language/stats/correlations.c b/src/language/stats/correlations.c index 4f476433..aa7841e7 100644 --- a/src/language/stats/correlations.c +++ b/src/language/stats/correlations.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2010 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 @@ -16,29 +16,30 @@ #include -#include -#include -#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include -#include "xalloc.h" -#include "minmax.h" -#include -#include + +#include "data/casegrouper.h" +#include "data/casereader.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" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/assertion.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "math/correlation.h" +#include "math/covariance.h" +#include "math/moments.h" +#include "output/tab.h" + +#include "gl/xalloc.h" +#include "gl/minmax.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/crosstabs.q b/src/language/stats/crosstabs.q index e3d07942..b12bf6cf 100644 --- a/src/language/stats/crosstabs.q +++ b/src/language/stats/crosstabs.q @@ -33,34 +33,34 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "minmax.h" -#include "xalloc.h" -#include "xsize.h" +#include "data/case.h" +#include "data/casegrouper.h" +#include "data/casereader.h" +#include "data/data-out.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" +#include "language/dictionary/split-file.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/array.h" +#include "libpspp/assertion.h" +#include "libpspp/compiler.h" +#include "libpspp/hash-functions.h" +#include "libpspp/hmap.h" +#include "libpspp/hmapx.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/pool.h" +#include "libpspp/str.h" +#include "output/tab.h" + +#include "gl/minmax.h" +#include "gl/xalloc.h" +#include "gl/xsize.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/descriptives.c b/src/language/stats/descriptives.c index a21ccc5f..50d52d3c 100644 --- a/src/language/stats/descriptives.c +++ b/src/language/stats/descriptives.c @@ -20,24 +20,24 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/casegrouper.h" +#include "data/casereader.h" +#include "data/dictionary.h" +#include "data/procedure.h" +#include "data/transformations.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/dictionary/split-file.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/array.h" +#include "libpspp/compiler.h" +#include "libpspp/message.h" +#include "libpspp/assertion.h" +#include "math/moments.h" +#include "output/tab.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/examine.q b/src/language/stats/examine.q index aa578e1e..50d9525b 100644 --- a/src/language/stats/examine.q +++ b/src/language/stats/examine.q @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2004, 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2004, 2008, 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 @@ -21,46 +21,46 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "minmax.h" -#include "xalloc.h" +#include "data/case.h" +#include "data/casegrouper.h" +#include "data/casereader.h" +#include "data/casewriter.h" +#include "data/dictionary.h" +#include "data/procedure.h" +#include "data/subcase.h" +#include "data/value-labels.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/dictionary/split-file.h" +#include "language/lexer/lexer.h" +#include "libpspp/compiler.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/str.h" +#include "math/box-whisker.h" +#include "math/extrema.h" +#include "math/histogram.h" +#include "math/moments.h" +#include "math/np.h" +#include "math/order-stats.h" +#include "math/percentiles.h" +#include "math/sort.h" +#include "math/trimmed-mean.h" +#include "math/tukey-hinges.h" +#include "output/chart-item.h" +#include "output/charts/boxplot.h" +#include "output/charts/np-plot.h" +#include "output/charts/plot-hist.h" +#include "output/tab.h" + +#include "gl/minmax.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) #define N_(msgid) msgid /* (headers) */ -#include -#include /* (specification) "EXAMINE" (xmn_): diff --git a/src/language/stats/factor.c b/src/language/stats/factor.c index eae6840f..a19cf69e 100644 --- a/src/language/stats/factor.c +++ b/src/language/stats/factor.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2010 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 @@ -16,7 +16,6 @@ #include - #include #include #include @@ -24,30 +23,25 @@ #include #include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include -#include - -#include - -#include -#include +#include "data/casegrouper.h" +#include "data/casereader.h" +#include "data/casewriter.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" +#include "language/lexer/value-parser.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "math/correlation.h" +#include "math/covariance.h" +#include "math/moments.h" +#include "output/chart-item.h" +#include "output/charts/scree.h" +#include "output/tab.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/flip.c b/src/language/stats/flip.c index 487417ba..534efb49 100644 --- a/src/language/stats/flip.c +++ b/src/language/stats/flip.c @@ -22,29 +22,30 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "intprops.h" -#include "minmax.h" -#include "xalloc.h" +#include "data/case.h" +#include "data/casereader.h" +#include "data/casereader-provider.h" +#include "data/dictionary.h" +#include "data/procedure.h" +#include "data/settings.h" +#include "data/short-names.h" +#include "data/value.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/assertion.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/pool.h" +#include "libpspp/str.h" +#include "data/data-in.h" +#include "data/data-out.h" + +#include "gl/intprops.h" +#include "gl/minmax.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/friedman.c b/src/language/stats/friedman.c index 9950543f..d853bd39 100644 --- a/src/language/stats/friedman.c +++ b/src/language/stats/friedman.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. -*-c-*- - Copyright (C) 2010 Free Software Foundation, Inc. + Copyright (C) 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 @@ -17,20 +17,19 @@ #include -#include "friedman.h" +#include "language/stats/friedman.h" #include #include -#include - -#include -#include -#include -#include -#include -#include - +#include "data/casereader.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" +#include "output/tab.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -213,7 +212,6 @@ friedman_execute (const struct dataset *ds, -#include static void show_ranks_box (const struct one_sample_test *ost, const struct friedman *fr) diff --git a/src/language/stats/friedman.h b/src/language/stats/friedman.h index 22154c9c..d6cf0036 100644 --- a/src/language/stats/friedman.h +++ b/src/language/stats/friedman.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2010 Free Software Foundation, Inc. + Copyright (C) 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,9 +19,7 @@ #include #include -#include - - +#include "language/stats/npar.h" struct friedman_test { diff --git a/src/language/stats/glm.c b/src/language/stats/glm.c index 862f49ce..ba75a8e4 100644 --- a/src/language/stats/glm.c +++ b/src/language/stats/glm.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2010 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,38 +16,31 @@ #include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include - #include +#include #include -#include - -#include -#include +#include "data/case.h" +#include "data/casegrouper.h" +#include "data/casereader.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" +#include "language/lexer/lexer.h" +#include "language/lexer/value-parser.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/ll.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/taint.h" +#include "linreg/sweep.h" +#include "math/categoricals.h" +#include "math/covariance.h" +#include "math/moments.h" +#include "output/tab.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/kruskal-wallis.c b/src/language/stats/kruskal-wallis.c index ea8fe8ce..ae388068 100644 --- a/src/language/stats/kruskal-wallis.c +++ b/src/language/stats/kruskal-wallis.c @@ -1,5 +1,5 @@ /* Pspp - a program for statistical analysis. - Copyright (C) 2010 Free Software Foundation, Inc. + Copyright (C) 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,23 +22,22 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "data/casereader.h" +#include "data/casewriter.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" +#include "libpspp/hmap.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "math/sort.h" +#include "output/tab.h" -#include -#include -#include -#include -#include - - -#include "minmax.h" -#include "xalloc.h" +#include "gl/minmax.h" +#include "gl/xalloc.h" /* Returns true iff the independent variable lies in the range [nst->val1, nst->val2] */ @@ -224,7 +223,6 @@ kruskal_wallis_execute (const struct dataset *ds, } -#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/kruskal-wallis.h b/src/language/stats/kruskal-wallis.h index 6194759d..b067d3fd 100644 --- a/src/language/stats/kruskal-wallis.h +++ b/src/language/stats/kruskal-wallis.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2010 Free Software Foundation, Inc. + Copyright (C) 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,9 +19,8 @@ #include #include -#include -#include - +#include "data/case.h" +#include "language/stats/npar.h" struct kruskal_wallis_test { diff --git a/src/language/stats/mann-whitney.c b/src/language/stats/mann-whitney.c index eafafdd9..4db82f8e 100644 --- a/src/language/stats/mann-whitney.c +++ b/src/language/stats/mann-whitney.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2010 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,20 +16,20 @@ #include -#include "mann-whitney.h" +#include "language/stats/mann-whitney.h" #include -#include -#include - -#include -#include -#include -#include -#include -#include -#include +#include "data/case.h" +#include "data/casereader.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" +#include "math/sort.h" +#include "output/tab.h" /* Calculates the adjustment necessary for tie compensation */ static void @@ -147,7 +147,6 @@ mann_whitney_execute (const struct dataset *ds, -#include #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/mann-whitney.h b/src/language/stats/mann-whitney.h index 00da9f87..aad691c6 100644 --- a/src/language/stats/mann-whitney.h +++ b/src/language/stats/mann-whitney.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2010 Free Software Foundation, Inc. + Copyright (C) 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 -#include +#include "language/stats/npar.h" struct mann_whitney_test diff --git a/src/language/stats/npar-summary.c b/src/language/stats/npar-summary.c index 2341761f..e1870f62 100644 --- a/src/language/stats/npar-summary.c +++ b/src/language/stats/npar-summary.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2006, 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 @@ -16,16 +16,19 @@ #include -#include -#include -#include -#include -#include "npar-summary.h" -#include -#include -#include +#include "language/stats/npar-summary.h" + #include -#include + +#include "data/case.h" +#include "data/casereader.h" +#include "data/dictionary.h" +#include "data/format.h" +#include "data/variable.h" +#include "math/moments.h" +#include "output/tab.h" + +#include "gl/minmax.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/npar-summary.h b/src/language/stats/npar-summary.h index a8b12797..a78d1b7e 100644 --- a/src/language/stats/npar-summary.h +++ b/src/language/stats/npar-summary.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 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 @@ -17,6 +17,8 @@ #if !n_par_summary_h #define n_par_summary_h 1 +#include "data/missing-values.h" + struct variable ; struct casereader ; struct dictionary; diff --git a/src/language/stats/npar.c b/src/language/stats/npar.c index 3f2bae29..3a178b23 100644 --- a/src/language/stats/npar.c +++ b/src/language/stats/npar.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. -*-c-*- - Copyright (C) 2006, 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2006, 2008, 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 @@ -16,44 +16,44 @@ #include -#include -#include "npar-summary.h" +#include "language/stats/npar.h" #include #include -#include "xalloc.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "data/case.h" +#include "data/casegrouper.h" +#include "data/casereader.h" +#include "data/dictionary.h" +#include "data/procedure.h" +#include "data/settings.h" +#include "data/variable.h" +#include "language/command.h" +#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/cochran.h" +#include "language/stats/friedman.h" +#include "language/stats/kruskal-wallis.h" +#include "language/stats/mann-whitney.h" +#include "language/stats/npar-summary.h" +#include "language/stats/runs.h" +#include "language/stats/sign.h" +#include "language/stats/wilcoxon.h" +#include "libpspp/array.h" +#include "libpspp/assertion.h" +#include "libpspp/cast.h" +#include "libpspp/hash-functions.h" +#include "libpspp/hmapx.h" +#include "libpspp/message.h" +#include "libpspp/pool.h" +#include "libpspp/str.h" +#include "libpspp/taint.h" +#include "math/moments.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/npar.h b/src/language/stats/npar.h index af093ffb..367cf65d 100644 --- a/src/language/stats/npar.h +++ b/src/language/stats/npar.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 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 -#include -#include +#include "data/missing-values.h" +#include "data/value.h" typedef const struct variable *variable_pair[2]; diff --git a/src/language/stats/oneway.c b/src/language/stats/oneway.c index 0a2b8e71..e2d39910 100644 --- a/src/language/stats/oneway.c +++ b/src/language/stats/oneway.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -16,40 +16,32 @@ #include -#include -#include -#include -#include -#include -#include - - -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include - - -#include -#include -#include - -#include - #include +#include #include -#include -#include +#include "data/case.h" +#include "data/casegrouper.h" +#include "data/casereader.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" +#include "language/lexer/lexer.h" +#include "language/lexer/value-parser.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/ll.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/taint.h" +#include "linreg/sweep.h" +#include "math/categoricals.h" +#include "math/covariance.h" +#include "math/levene.h" +#include "math/moments.h" +#include "output/tab.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/rank.q b/src/language/stats/rank.q index f53ef2d0..49a040e3 100644 --- a/src/language/stats/rank.q +++ b/src/language/stats/rank.q @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2005, 2006, 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 @@ -16,28 +16,27 @@ #include +#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include +#include "data/case.h" +#include "data/casegrouper.h" +#include "data/casereader.h" +#include "data/casewriter.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" +#include "language/command.h" +#include "language/stats/sort-criteria.h" +#include "libpspp/compiler.h" +#include "libpspp/taint.h" +#include "math/sort.h" +#include "output/tab.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/regression.q b/src/language/stats/regression.q index b879cae9..5ca581d8 100644 --- a/src/language/stats/regression.q +++ b/src/language/stats/regression.q @@ -21,26 +21,27 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include "data/case.h" +#include "data/casegrouper.h" +#include "data/casereader.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" +#include "language/command.h" +#include "language/data-io/file-handle.h" +#include "language/dictionary/split-file.h" +#include "language/lexer/lexer.h" +#include "libpspp/compiler.h" +#include "libpspp/message.h" +#include "libpspp/taint.h" +#include "math/covariance.h" +#include "math/linreg.h" +#include "math/moments.h" +#include "output/tab.h" #include "gl/intprops.h" #include "gl/xalloc.h" diff --git a/src/language/stats/reliability.c b/src/language/stats/reliability.c index 3633b3dd..92f4ac1c 100644 --- a/src/language/stats/reliability.c +++ b/src/language/stats/reliability.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2010 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 @@ -18,26 +18,21 @@ #include -#include - -#include -#include - - -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include +#include "data/casegrouper.h" +#include "data/casereader.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" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/str.h" +#include "math/moments.h" +#include "output/tab.h" +#include "output/text-item.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/roc.c b/src/language/stats/roc.c index 22e4acb6..b07a58d1 100644 --- a/src/language/stats/roc.c +++ b/src/language/stats/roc.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2010 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 @@ -16,27 +16,27 @@ #include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "language/stats/roc.h" #include +#include "data/casegrouper.h" +#include "data/casereader.h" +#include "data/casewriter.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" +#include "language/lexer/value-parser.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/misc.h" +#include "math/sort.h" +#include "output/chart-item.h" +#include "output/charts/roc-chart.h" +#include "output/tab.h" + #include "gettext.h" #define _(msgid) gettext (msgid) #define N_(msgid) msgid diff --git a/src/language/stats/runs.c b/src/language/stats/runs.c index cbabcd24..73fbb735 100644 --- a/src/language/stats/runs.c +++ b/src/language/stats/runs.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. -*-c-*- - Copyright (C) 2010 Free Software Foundation, Inc. + Copyright (C) 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 @@ -17,25 +17,24 @@ #include -#include "runs.h" +#include "language/stats/runs.h" #include #include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - +#include "data/format.h" +#include "libpspp/misc.h" +#include "libpspp/message.h" +#include "data/procedure.h" +#include "data/casereader.h" +#include "data/casewriter.h" +#include "data/casegrouper.h" +#include "data/dictionary.h" +#include "data/subcase.h" +#include "data/variable.h" +#include "math/percentiles.h" +#include "math/sort.h" +#include "output/tab.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -303,7 +302,6 @@ runs_execute (const struct dataset *ds, } -#include static void show_runs_result (const struct runs_test *rt, const struct run_state *rs, const struct dictionary *dict) diff --git a/src/language/stats/runs.h b/src/language/stats/runs.h index b50afde3..8dbce96c 100644 --- a/src/language/stats/runs.h +++ b/src/language/stats/runs.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 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 -#include +#include "language/stats/npar.h" enum cp_mode { diff --git a/src/language/stats/sign.c b/src/language/stats/sign.c index 38489113..45973262 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 Free Software Foundation, Inc. + Copyright (C) 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 @@ -15,22 +15,24 @@ along with this program. If not, see . */ #include -#include "sign.h" -#include -#include -#include +#include "language/stats/sign.h" + #include #include -#include "npar.h" -#include -#include -#include -#include -#include - -#include "minmax.h" -#include "xalloc.h" + +#include "data/casereader.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" +#include "output/tab.h" + +#include "gl/minmax.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/sign.h b/src/language/stats/sign.h index 1404e006..d23b8351 100644 --- a/src/language/stats/sign.h +++ b/src/language/stats/sign.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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,7 +19,7 @@ #include -#include +#include "data/missing-values.h" struct casereader; struct dataset; diff --git a/src/language/stats/sort-cases.c b/src/language/stats/sort-cases.c index 8998120a..1134874d 100644 --- a/src/language/stats/sort-cases.c +++ b/src/language/stats/sort-cases.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -17,21 +17,21 @@ #include #include -#include #include - -#include "sort-criteria.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include #include -#include "xalloc.h" +#include "data/procedure.h" +#include "data/settings.h" +#include "data/subcase.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "language/stats/sort-criteria.h" +#include "libpspp/message.h" +#include "math/sort.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/sort-criteria.c b/src/language/stats/sort-criteria.c index 64976023..b8bdbd06 100644 --- a/src/language/stats/sort-criteria.c +++ b/src/language/stats/sort-criteria.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 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 @@ -16,16 +16,16 @@ #include -#include +#include "language/stats/sort-criteria.h" #include -#include -#include -#include -#include -#include -#include +#include "data/dictionary.h" +#include "data/subcase.h" +#include "data/variable.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/message.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/t-test.q b/src/language/stats/t-test.q index 9bfa4f97..3cd921eb 100644 --- a/src/language/stats/t-test.q +++ b/src/language/stats/t-test.q @@ -22,34 +22,34 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "minmax.h" -#include "xalloc.h" -#include "xmemdup0.h" +#include "data/case.h" +#include "data/casegrouper.h" +#include "data/casereader.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" +#include "language/dictionary/split-file.h" +#include "language/lexer/lexer.h" +#include "language/lexer/value-parser.h" +#include "libpspp/array.h" +#include "libpspp/assertion.h" +#include "libpspp/compiler.h" +#include "libpspp/hash.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/str.h" +#include "libpspp/taint.h" +#include "math/correlation.h" +#include "math/group-proc.h" +#include "math/levene.h" +#include "output/tab.h" + +#include "gl/minmax.h" +#include "gl/xalloc.h" +#include "gl/xmemdup0.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/stats/wilcoxon.c b/src/language/stats/wilcoxon.c index 268296d7..19c3a403 100644 --- a/src/language/stats/wilcoxon.c +++ b/src/language/stats/wilcoxon.c @@ -1,5 +1,5 @@ /* Pspp - a program for statistical analysis. - Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2008, 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 @@ -18,27 +18,27 @@ #include -#include "wilcoxon.h" +#include "language/stats/wilcoxon.h" #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "minmax.h" -#include "xalloc.h" +#include "data/casereader.h" +#include "data/casewriter.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" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "math/sort.h" +#include "math/wilcoxon-sig.h" +#include "output/tab.h" + +#include "gl/minmax.h" +#include "gl/xalloc.h" static double append_difference (const struct ccase *c, casenumber n UNUSED, void *aux) diff --git a/src/language/stats/wilcoxon.h b/src/language/stats/wilcoxon.h index b0f86a2c..1650badd 100644 --- a/src/language/stats/wilcoxon.h +++ b/src/language/stats/wilcoxon.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008 Free Software Foundation, Inc. + Copyright (C) 2008, 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,9 +19,9 @@ #include #include -#include -#include +#include "data/case.h" +#include "language/stats/npar.h" struct rank_sum { diff --git a/src/language/syntax-file.c b/src/language/syntax-file.c index 97f73fd6..c5636088 100644 --- a/src/language/syntax-file.c +++ b/src/language/syntax-file.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -16,37 +16,33 @@ #include -#include "syntax-file.h" +#include "language/syntax-file.h" #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "prompt.h" - -#include "xalloc.h" +#include "data/file-name.h" +#include "data/settings.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "language/prompt.h" +#include "libpspp/assertion.h" +#include "libpspp/cast.h" +#include "libpspp/getl.h" +#include "libpspp/ll.h" +#include "libpspp/message.h" +#include "libpspp/str.h" +#include "libpspp/version.h" +#include "output/tab.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) -#include - - struct syntax_file_source { struct getl_interface parent ; diff --git a/src/language/syntax-string-source.c b/src/language/syntax-string-source.c index c40a221c..1d3d4d6b 100644 --- a/src/language/syntax-string-source.c +++ b/src/language/syntax-string-source.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical interface for PSPP. - 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 @@ -17,16 +17,16 @@ #include -#include -#include -#include -#include +#include "language/syntax-string-source.h" #include -#include "syntax-string-source.h" +#include "libpspp/cast.h" +#include "libpspp/getl.h" +#include "libpspp/compiler.h" +#include "libpspp/str.h" -#include "xalloc.h" +#include "gl/xalloc.h" struct syntax_string_source { diff --git a/src/language/tests/format-guesser-test.c b/src/language/tests/format-guesser-test.c index c95ea35f..b5dbe6d6 100644 --- a/src/language/tests/format-guesser-test.c +++ b/src/language/tests/format-guesser-test.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008, 2010 Free Software Foundation, Inc. + Copyright (C) 2008, 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 @@ -18,11 +18,11 @@ #include -#include -#include -#include -#include -#include +#include "data/format.h" +#include "data/format-guesser.h" +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "libpspp/message.h" /* Executes the DEBUG FORMAT GUESSER command. */ int diff --git a/src/language/tests/moments-test.c b/src/language/tests/moments-test.c index f5fc858d..f6499cb8 100644 --- a/src/language/tests/moments-test.c +++ b/src/language/tests/moments-test.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -15,16 +15,19 @@ along with this program. If not, see . */ #include -#include -#include "gettext.h" -#include -#include -#include + #include +#include #include -#include "xalloc.h" -#include +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "libpspp/compiler.h" +#include "math/moments.h" + +#include "gl/xalloc.h" + +#include "gettext.h" #define _(msgid) gettext (msgid) static bool diff --git a/src/language/tests/paper-size.c b/src/language/tests/paper-size.c index 4dbd9460..660fe9c7 100644 --- a/src/language/tests/paper-size.c +++ b/src/language/tests/paper-size.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2010 Free Software Foundation, Inc. + Copyright (C) 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 @@ -18,11 +18,11 @@ #include -#include -#include -#include -#include -#include +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "libpspp/assertion.h" +#include "libpspp/string-map.h" +#include "output/measure.h" /* Executes the DEBUG PAPER SIZE command. */ int diff --git a/src/language/tests/pool-test.c b/src/language/tests/pool-test.c index df91f1ae..9bfcad00 100644 --- a/src/language/tests/pool-test.c +++ b/src/language/tests/pool-test.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 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 @@ -15,14 +15,16 @@ along with this program. If not, see . */ #include -#include -#include + #include #include #include #include #include +#include "libpspp/pool.h" +#include "language/command.h" + #define N_ITERATIONS 8192 #define N_FILES 16 diff --git a/src/language/utilities/cd.c b/src/language/utilities/cd.c index 220164f0..90a1bcf8 100644 --- a/src/language/utilities/cd.c +++ b/src/language/utilities/cd.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008, 2010 Free Software Foundation, Inc. + Copyright (C) 2008, 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 @@ -15,12 +15,14 @@ along with this program. If not, see . */ #include -#include -#include + #include -#include #include +#include "language/command.h" +#include "libpspp/message.h" +#include "language/lexer/lexer.h" + #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/utilities/date.c b/src/language/utilities/date.c index f465eb37..80a09c21 100644 --- a/src/language/utilities/date.c +++ b/src/language/utilities/date.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 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 @@ -15,9 +15,10 @@ along with this program. If not, see . */ #include -#include -#include -#include + +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "libpspp/message.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/utilities/include.c b/src/language/utilities/include.c index f152684d..e326134d 100644 --- a/src/language/utilities/include.c +++ b/src/language/utilities/include.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2007, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -22,16 +22,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "data/file-name.h" +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "language/syntax-file.h" +#include "libpspp/getl.h" +#include "libpspp/message.h" +#include "libpspp/str.h" -#include "dirname.h" -#include "xalloc.h" +#include "gl/dirname.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/utilities/permissions.c b/src/language/utilities/permissions.c index ad9ffe75..83fa820c 100644 --- a/src/language/utilities/permissions.c +++ b/src/language/utilities/permissions.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2004, 2010 Free Software Foundation, Inc. + Copyright (C) 2004, 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 @@ -16,17 +16,18 @@ #include +#include #include -#include #include +#include #include -#include -#include -#include -#include -#include -#include -#include + +#include "data/settings.h" +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/str.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/utilities/set.q b/src/language/utilities/set.q index 55274706..9837d2cc 100644 --- a/src/language/utilities/set.q +++ b/src/language/utilities/set.q @@ -21,26 +21,26 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "data/data-in.h" +#include "data/data-out.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" +#include "language/command.h" +#include "language/lexer/format-parser.h" +#include "language/lexer/lexer.h" +#include "libpspp/compiler.h" +#include "libpspp/copyleft.h" +#include "libpspp/float-format.h" +#include "libpspp/i18n.h" +#include "libpspp/integer-format.h" +#include "libpspp/message.h" +#include "math/random.h" +#include "output/driver.h" +#include "output/journal.h" #if HAVE_LIBTERMCAP #if HAVE_TERMCAP_H diff --git a/src/language/utilities/title.c b/src/language/utilities/title.c index 82f7be50..9d5b8261 100644 --- a/src/language/utilities/title.c +++ b/src/language/utilities/title.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2007, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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,17 +19,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/dictionary.h" +#include "data/procedure.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "libpspp/message.h" +#include "libpspp/start-date.h" +#include "libpspp/version.h" +#include "output/text-item.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/xforms/compute.c b/src/language/xforms/compute.c index 442c15a4..5089d80d 100644 --- a/src/language/xforms/compute.c +++ b/src/language/xforms/compute.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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,20 +19,20 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/case.h" +#include "data/dictionary.h" +#include "data/procedure.h" +#include "data/transformations.h" +#include "data/variable.h" +#include "data/vector.h" +#include "language/command.h" +#include "language/expressions/public.h" +#include "language/lexer/lexer.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/str.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/xforms/count.c b/src/language/xforms/count.c index 550db8a5..172a5e2c 100644 --- a/src/language/xforms/count.c +++ b/src/language/xforms/count.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -18,21 +18,21 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/case.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/value-parser.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/compiler.h" +#include "libpspp/message.h" +#include "libpspp/pool.h" +#include "libpspp/str.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/xforms/sample.c b/src/language/xforms/sample.c index 6fbc758c..693f8447 100644 --- a/src/language/xforms/sample.c +++ b/src/language/xforms/sample.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009 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 @@ -21,16 +21,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "data/procedure.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "libpspp/compiler.h" +#include "libpspp/message.h" +#include "libpspp/str.h" +#include "math/random.h" -#include "xalloc.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/language/xforms/select-if.c b/src/language/xforms/select-if.c index 74edf2d0..4240f63b 100644 --- a/src/language/xforms/select-if.c +++ b/src/language/xforms/select-if.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -18,18 +18,18 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/dictionary.h" +#include "data/procedure.h" +#include "data/transformations.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/expressions/public.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/message.h" +#include "libpspp/str.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/libpspp/abt.c b/src/libpspp/abt.c index b7766129..c06047b4 100644 --- a/src/libpspp/abt.c +++ b/src/libpspp/abt.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -28,12 +28,12 @@ #include #endif -#include -#include +#include "libpspp/abt.h" #include -#include +#include "libpspp/cast.h" +#include "libpspp/assertion.h" static struct abt_node **down_link (struct abt *, struct abt_node *); static struct abt_node *skew (struct abt *, struct abt_node *); diff --git a/src/libpspp/abt.h b/src/libpspp/abt.h index 24d7268a..fa9d0dc8 100644 --- a/src/libpspp/abt.h +++ b/src/libpspp/abt.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -150,7 +150,7 @@ tree paper. */ #include -#include +#include "libpspp/cast.h" /* Returns the data structure corresponding to the given NODE, assuming that NODE is embedded as the given MEMBER name in diff --git a/src/libpspp/argv-parser.c b/src/libpspp/argv-parser.c index dfa86fad..c72c2503 100644 --- a/src/libpspp/argv-parser.c +++ b/src/libpspp/argv-parser.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2010 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 @@ -16,14 +16,14 @@ #include -#include +#include "libpspp/argv-parser.h" #include -#include -#include +#include "libpspp/assertion.h" +#include "libpspp/str.h" -#include "xalloc.h" +#include "gl/xalloc.h" struct argv_option_plus { diff --git a/src/libpspp/array.c b/src/libpspp/array.c index f82bce91..a0ac943a 100644 --- a/src/libpspp/array.c +++ b/src/libpspp/array.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -90,10 +90,10 @@ #include #include #include -#include +#include "libpspp/assertion.h" -#include "xalloc.h" -#include "minmax.h" +#include "gl/xalloc.h" +#include "gl/minmax.h" /* Finds an element in ARRAY, which contains COUNT elements of SIZE bytes each, using COMPARE for comparisons. Returns the diff --git a/src/libpspp/bt.c b/src/libpspp/bt.c index 997083b1..4178d147 100644 --- a/src/libpspp/bt.c +++ b/src/libpspp/bt.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 @@ -61,13 +61,13 @@ #include #endif -#include +#include "libpspp/bt.h" #include #include #include -#include +#include "libpspp/cast.h" static void rebalance_subtree (struct bt *, struct bt_node *, size_t); diff --git a/src/libpspp/bt.h b/src/libpspp/bt.h index 0ee29898..41fc5d44 100644 --- a/src/libpspp/bt.h +++ b/src/libpspp/bt.h @@ -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 @@ -25,7 +25,7 @@ #include #include -#include +#include "libpspp/cast.h" /* Returns the data structure corresponding to the given NODE, assuming that NODE is embedded as the given MEMBER name in diff --git a/src/libpspp/deque.c b/src/libpspp/deque.c index d34d6c62..732f09da 100644 --- a/src/libpspp/deque.c +++ b/src/libpspp/deque.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007, 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 @@ -16,11 +16,12 @@ #include -#include +#include "libpspp/deque.h" + #include -#include "minmax.h" -#include "xalloc.h" +#include "gl/minmax.h" +#include "gl/xalloc.h" /* Initializes DEQUE as an empty deque with an initial capacity of zero. */ diff --git a/src/libpspp/deque.h b/src/libpspp/deque.h index cdb6abd3..15130801 100644 --- a/src/libpspp/deque.h +++ b/src/libpspp/deque.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007, 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 @@ -66,7 +66,7 @@ #include #include -#include +#include "libpspp/assertion.h" /* A deque implemented as a circular buffer. */ struct deque diff --git a/src/libpspp/float-format.c b/src/libpspp/float-format.c index 0450dbea..4ba4c937 100644 --- a/src/libpspp/float-format.c +++ b/src/libpspp/float-format.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 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 @@ -16,18 +16,18 @@ #include -#include +#include "libpspp/float-format.h" +#include #include #include #include #include -#include -#include +#include "libpspp/assertion.h" +#include "libpspp/integer-format.h" -#include "error.h" -#include +#include "gl/error.h" /* Neutral intermediate representation for binary floating-point numbers. */ struct fp diff --git a/src/libpspp/float-format.h b/src/libpspp/float-format.h index b2af548f..9cabf9bf 100644 --- a/src/libpspp/float-format.h +++ b/src/libpspp/float-format.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 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 -#include +#include "libpspp/compiler.h" /* A floating-point format. */ enum float_format diff --git a/src/libpspp/getl.h b/src/libpspp/getl.h index 47dea27e..c7d0967f 100644 --- a/src/libpspp/getl.h +++ b/src/libpspp/getl.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 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 @@ -18,7 +18,7 @@ #define GETL_H 1 #include -#include +#include "libpspp/ll.h" struct string; diff --git a/src/libpspp/hash-functions.c b/src/libpspp/hash-functions.c index af8b4c2c..96ff282c 100644 --- a/src/libpspp/hash-functions.c +++ b/src/libpspp/hash-functions.c @@ -15,7 +15,9 @@ along with this program. If not, see . */ #include -#include + +#include "libpspp/hash-functions.h" + #include #include #include diff --git a/src/libpspp/hash.h b/src/libpspp/hash.h index e586bcc0..3281c0e2 100644 --- a/src/libpspp/hash.h +++ b/src/libpspp/hash.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009 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,7 +19,7 @@ #include #include -#include +#include "libpspp/hash-functions.h" typedef int hsh_compare_func (const void *, const void *, const void *aux); typedef unsigned hsh_hash_func (const void *, const void *aux); diff --git a/src/libpspp/heap.c b/src/libpspp/heap.c index 30abcdc4..ace8e4c1 100644 --- a/src/libpspp/heap.c +++ b/src/libpspp/heap.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007, 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,11 +18,11 @@ #include #endif -#include -#include -#include +#include "libpspp/heap.h" +#include "libpspp/pool.h" +#include "libpspp/assertion.h" -#include "xalloc.h" +#include "gl/xalloc.h" /* A heap. */ struct heap diff --git a/src/libpspp/heap.h b/src/libpspp/heap.h index 3a3c516a..c24c7632 100644 --- a/src/libpspp/heap.h +++ b/src/libpspp/heap.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -70,7 +70,7 @@ #ifndef LIBPSPP_HEAP_H #define LIBPSPP_HEAP_H 1 -#include +#include "libpspp/cast.h" #include #include diff --git a/src/libpspp/hmap.c b/src/libpspp/hmap.c index 9050cc08..4436f8df 100644 --- a/src/libpspp/hmap.c +++ b/src/libpspp/hmap.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2008, 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 @@ -18,11 +18,12 @@ #include #endif -#include +#include "libpspp/hmap.h" + #include #include -#include "xalloc.h" +#include "gl/xalloc.h" static size_t capacity_to_mask (size_t capacity); diff --git a/src/libpspp/hmap.h b/src/libpspp/hmap.h index 095edf10..2776c6c8 100644 --- a/src/libpspp/hmap.h +++ b/src/libpspp/hmap.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2008, 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 @@ -117,7 +117,7 @@ #include #include -#include +#include "libpspp/cast.h" /* Returns the data structure corresponding to the given NODE, assuming that NODE is embedded as the given MEMBER name in diff --git a/src/libpspp/hmapx.h b/src/libpspp/hmapx.h index 2fe7f9f7..34583619 100644 --- a/src/libpspp/hmapx.h +++ b/src/libpspp/hmapx.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2008, 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 @@ -115,7 +115,7 @@ } */ -#include +#include "libpspp/hmap.h" #include /* Hash table node. */ diff --git a/src/libpspp/integer-format.c b/src/libpspp/integer-format.c index 2d8a72ef..c248e0ff 100644 --- a/src/libpspp/integer-format.c +++ b/src/libpspp/integer-format.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006, 2010 Free Software Foundation, Inc. + Copyright (C) 2006, 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 @@ -16,7 +16,7 @@ #include -#include +#include "libpspp/integer-format.h" #include diff --git a/src/libpspp/integer-format.h b/src/libpspp/integer-format.h index 8649bf0c..e888292f 100644 --- a/src/libpspp/integer-format.h +++ b/src/libpspp/integer-format.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 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 @@ -20,7 +20,7 @@ #include #include -#include +#include "libpspp/str.h" /* An integer format. */ enum integer_format diff --git a/src/libpspp/ll.c b/src/libpspp/ll.c index e6533f2c..21f8dd88 100644 --- a/src/libpspp/ll.c +++ b/src/libpspp/ll.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -28,7 +28,8 @@ #include #endif -#include +#include "libpspp/ll.h" + #include /* Returns the number of nodes in LIST (not counting the null diff --git a/src/libpspp/ll.h b/src/libpspp/ll.h index f59736f1..9e6e35f0 100644 --- a/src/libpspp/ll.h +++ b/src/libpspp/ll.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -50,7 +50,7 @@ #include #include #include -#include +#include "libpspp/cast.h" /* Embedded, circular doubly linked list. diff --git a/src/libpspp/llx.c b/src/libpspp/llx.c index 905850bc..3a0cbf60 100644 --- a/src/libpspp/llx.c +++ b/src/libpspp/llx.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -28,8 +28,8 @@ #include #endif -#include -#include "compiler.h" +#include "libpspp/llx.h" +#include "libpspp/compiler.h" #include #include diff --git a/src/libpspp/llx.h b/src/libpspp/llx.h index 2aa18e7b..80a8a838 100644 --- a/src/libpspp/llx.h +++ b/src/libpspp/llx.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 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 @@ -49,7 +49,7 @@ #include #include -#include +#include "libpspp/ll.h" /* External, circular doubly linked list. diff --git a/src/libpspp/message.c b/src/libpspp/message.c index 40949930..c7b56e0a 100644 --- a/src/libpspp/message.c +++ b/src/libpspp/message.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 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 @@ -16,8 +16,8 @@ #include -#include "message.h" -#include "msg-locator.h" +#include "libpspp/message.h" +#include "libpspp/msg-locator.h" #include #include @@ -26,9 +26,9 @@ #include #include -#include -#include -#include +#include "data/settings.h" +#include "libpspp/str.h" +#include "libpspp/version.h" #include "gl/progname.h" #include "gl/xalloc.h" diff --git a/src/libpspp/message.h b/src/libpspp/message.h index fad7816f..7c59847f 100644 --- a/src/libpspp/message.h +++ b/src/libpspp/message.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 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 -#include +#include "libpspp/compiler.h" /* What kind of message is this? */ enum msg_category diff --git a/src/libpspp/model-checker.c b/src/libpspp/model-checker.c index 0e73fec6..e0a0f71a 100644 --- a/src/libpspp/model-checker.c +++ b/src/libpspp/model-checker.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 @@ -16,7 +16,7 @@ #include -#include +#include "libpspp/model-checker.h" #include #include @@ -26,16 +26,16 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "libpspp/argv-parser.h" +#include "libpspp/bit-vector.h" +#include "libpspp/compiler.h" +#include "libpspp/deque.h" +#include "libpspp/misc.h" +#include "libpspp/str.h" -#include "error.h" -#include "minmax.h" -#include "xalloc.h" +#include "gl/error.h" +#include "gl/minmax.h" +#include "gl/xalloc.h" /* Initializes PATH as an empty path. */ void diff --git a/src/libpspp/model-checker.h b/src/libpspp/model-checker.h index a7372f8d..be97d389 100644 --- a/src/libpspp/model-checker.h +++ b/src/libpspp/model-checker.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -298,7 +298,7 @@ #include #include -#include +#include "libpspp/compiler.h" /* An active model checking run. */ struct mc; diff --git a/src/libpspp/msg-locator.c b/src/libpspp/msg-locator.c index fb8082e9..d29f35db 100644 --- a/src/libpspp/msg-locator.c +++ b/src/libpspp/msg-locator.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 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 @@ -15,14 +15,17 @@ along with this program. If not, see . */ #include + +#include "libpspp/msg-locator.h" + #include -#include "msg-locator.h" -#include -#include -#include -#include "getl.h" -#include "xalloc.h" +#include "libpspp/assertion.h" +#include "libpspp/cast.h" +#include "libpspp/message.h" +#include "libpspp/getl.h" + +#include "gl/xalloc.h" /* File locator stack. */ static const struct msg_locator **file_loc; diff --git a/src/libpspp/range-map.c b/src/libpspp/range-map.c index 0d6ce826..2af9405a 100644 --- a/src/libpspp/range-map.c +++ b/src/libpspp/range-map.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007, 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 @@ -16,10 +16,10 @@ #include -#include +#include "libpspp/range-map.h" -#include -#include +#include "libpspp/assertion.h" +#include "libpspp/compiler.h" static struct range_map_node *bt_to_range_map_node (const struct bt_node *); static int compare_range_map_nodes (const struct bt_node *, diff --git a/src/libpspp/range-map.h b/src/libpspp/range-map.h index 024fe937..2d4b5ade 100644 --- a/src/libpspp/range-map.h +++ b/src/libpspp/range-map.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -32,8 +32,8 @@ #include -#include -#include +#include "libpspp/bt.h" +#include "libpspp/cast.h" /* Returns the data structure corresponding to the given NODE, assuming that NODE is embedded as the given MEMBER name in diff --git a/src/libpspp/range-set.c b/src/libpspp/range-set.c index cd17fe02..ed7b3f5e 100644 --- a/src/libpspp/range-set.c +++ b/src/libpspp/range-set.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -23,17 +23,17 @@ #include -#include +#include "libpspp/range-set.h" #include #include -#include -#include -#include +#include "libpspp/assertion.h" +#include "libpspp/compiler.h" +#include "libpspp/pool.h" -#include "minmax.h" -#include "xalloc.h" +#include "gl/minmax.h" +#include "gl/xalloc.h" static int compare_range_set_nodes (const struct bt_node *, const struct bt_node *, diff --git a/src/libpspp/range-set.h b/src/libpspp/range-set.h index ee7dac23..9e665e99 100644 --- a/src/libpspp/range-set.h +++ b/src/libpspp/range-set.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -25,8 +25,8 @@ #define LIBPSPP_RANGE_SET_H #include -#include -#include +#include "libpspp/bt.h" +#include "libpspp/cast.h" /* A set of ranges. */ struct range_set diff --git a/src/libpspp/sparse-array.c b/src/libpspp/sparse-array.c index 5babbc12..65a46122 100644 --- a/src/libpspp/sparse-array.c +++ b/src/libpspp/sparse-array.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 @@ -16,18 +16,18 @@ #include -#include +#include "libpspp/sparse-array.h" #include #include -#include -#include -#include -#include +#include "libpspp/assertion.h" +#include "libpspp/cast.h" +#include "libpspp/misc.h" +#include "libpspp/pool.h" -#include "count-one-bits.h" -#include "minmax.h" +#include "gl/count-one-bits.h" +#include "gl/minmax.h" /* Sparse array data structure. diff --git a/src/libpspp/sparse-xarray.c b/src/libpspp/sparse-xarray.c index 69c2ef28..f839b0f2 100644 --- a/src/libpspp/sparse-xarray.c +++ b/src/libpspp/sparse-xarray.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 @@ -16,22 +16,22 @@ #include -#include +#include "libpspp/sparse-xarray.h" #include #include #include #include -#include -#include -#include -#include -#include +#include "libpspp/assertion.h" +#include "libpspp/ext-array.h" +#include "libpspp/misc.h" +#include "libpspp/range-set.h" +#include "libpspp/sparse-array.h" -#include "md4.h" -#include "minmax.h" -#include "xalloc.h" +#include "gl/md4.h" +#include "gl/minmax.h" +#include "gl/xalloc.h" /* A sparse array of arrays of bytes. */ struct sparse_xarray diff --git a/src/libpspp/string-map.c b/src/libpspp/string-map.c index 48124797..e67ed470 100644 --- a/src/libpspp/string-map.c +++ b/src/libpspp/string-map.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,13 +16,13 @@ #include -#include +#include "libpspp/string-map.h" #include #include -#include -#include +#include "libpspp/hash-functions.h" +#include "libpspp/string-set.h" #include "gl/xalloc.h" diff --git a/src/libpspp/string-map.h b/src/libpspp/string-map.h index f8ffabcf..c29551bb 100644 --- a/src/libpspp/string-map.h +++ b/src/libpspp/string-map.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -23,7 +23,7 @@ key-value pairs. */ #include -#include +#include "libpspp/hmap.h" struct string_set; diff --git a/src/libpspp/string-set.c b/src/libpspp/string-set.c index 3fd370db..d6a80127 100644 --- a/src/libpspp/string-set.c +++ b/src/libpspp/string-set.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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,12 +19,12 @@ #include -#include +#include "libpspp/string-set.h" #include #include -#include +#include "libpspp/hash-functions.h" #include "gl/xalloc.h" diff --git a/src/libpspp/string-set.h b/src/libpspp/string-set.h index a604e151..aad8cdb0 100644 --- a/src/libpspp/string-set.h +++ b/src/libpspp/string-set.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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,7 +22,7 @@ This is a convenient wrapper around a "struct hmap" for storing strings. */ #include -#include +#include "libpspp/hmap.h" /* A node in the string set. */ struct string_set_node diff --git a/src/libpspp/stringi-map.h b/src/libpspp/stringi-map.h index bc01e721..1c4894b4 100644 --- a/src/libpspp/stringi-map.h +++ b/src/libpspp/stringi-map.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2010 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 @@ -23,7 +23,7 @@ key-value pairs. */ #include -#include +#include "libpspp/hmap.h" struct string_set; struct stringi_set; diff --git a/src/libpspp/stringi-set.h b/src/libpspp/stringi-set.h index f438d048..2a000889 100644 --- a/src/libpspp/stringi-set.h +++ b/src/libpspp/stringi-set.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2010 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,7 +22,7 @@ This is a convenient wrapper around a "struct hmap" for storing strings. */ #include -#include +#include "libpspp/hmap.h" /* A node in the string set. */ struct stringi_set_node diff --git a/src/libpspp/taint.c b/src/libpspp/taint.c index 4c1cecb9..c655d60a 100644 --- a/src/libpspp/taint.c +++ b/src/libpspp/taint.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,15 +16,15 @@ #include -#include +#include "libpspp/taint.h" #include -#include -#include -#include +#include "libpspp/array.h" +#include "libpspp/assertion.h" +#include "libpspp/cast.h" -#include "xalloc.h" +#include "gl/xalloc.h" /* This code maintains two invariants: diff --git a/src/libpspp/tower.c b/src/libpspp/tower.c index 91579877..863da820 100644 --- a/src/libpspp/tower.c +++ b/src/libpspp/tower.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,13 +16,13 @@ #include -#include +#include "libpspp/tower.h" #include -#include -#include -#include +#include "libpspp/assertion.h" +#include "libpspp/cast.h" +#include "libpspp/compiler.h" static struct tower_node *abt_to_tower_node (const struct abt_node *); static struct tower_node *first_node (const struct tower *); diff --git a/src/libpspp/tower.h b/src/libpspp/tower.h index 9be8231c..2ec5a0d8 100644 --- a/src/libpspp/tower.h +++ b/src/libpspp/tower.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -50,8 +50,8 @@ #define LIBPSPP_TOWER_H #include -#include -#include +#include "libpspp/abt.h" +#include "libpspp/cast.h" /* Returns the data structure corresponding to the given NODE, assuming that NODE is embedded as the given MEMBER name in diff --git a/src/math/box-whisker.c b/src/math/box-whisker.c index de4124ef..2e454590 100644 --- a/src/math/box-whisker.c +++ b/src/math/box-whisker.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2008, 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 @@ -15,18 +15,22 @@ along with this program. If not, see . */ #include + #include "box-whisker.h" -#include "order-stats.h" -#include "tukey-hinges.h" -#include -#include -#include + #include #include -#include -#include -#include -#include + +#include "data/case.h" +#include "data/val-type.h" +#include "data/variable.h" +#include "libpspp/assertion.h" +#include "libpspp/cast.h" +#include "libpspp/str.h" +#include "math/order-stats.h" +#include "math/tukey-hinges.h" + +#include "gl/xalloc.h" static void destroy (struct statistic *s) diff --git a/src/math/box-whisker.h b/src/math/box-whisker.h index bef091e8..f6856d1e 100644 --- a/src/math/box-whisker.h +++ b/src/math/box-whisker.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2008, 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,9 +18,9 @@ #define __MATH_BOX_WHISKER_H__ #include -#include -#include -#include "order-stats.h" +#include "libpspp/ll.h" +#include "libpspp/str.h" +#include "math/order-stats.h" /* This module calculates the statistics typically displayed by box-plots. However, there's no reason not to use it for other purposes too. diff --git a/src/math/categoricals.c b/src/math/categoricals.c index 25de2cc6..215f4d1f 100644 --- a/src/math/categoricals.c +++ b/src/math/categoricals.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2010 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 @@ -16,19 +16,19 @@ #include -#include +#include "math/categoricals.h" -#include "categoricals.h" +#include -#include -#include -#include -#include -#include -#include -#include +#include "data/case.h" +#include "data/value.h" +#include "data/variable.h" +#include "libpspp/array.h" +#include "libpspp/hmap.h" +#include "libpspp/pool.h" +#include "libpspp/str.h" -#include +#include "gl/xalloc.h" struct value_node { diff --git a/src/math/categoricals.h b/src/math/categoricals.h index 044722ee..97cde65e 100644 --- a/src/math/categoricals.h +++ b/src/math/categoricals.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2010 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 @@ -19,7 +19,7 @@ #define _CATEGORICALS__ #include -#include +#include "data/missing-values.h" struct categoricals; struct variable; diff --git a/src/math/correlation.c b/src/math/correlation.c index 47762747..e7ebd1f5 100644 --- a/src/math/correlation.c +++ b/src/math/correlation.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,13 +16,15 @@ #include -#include "correlation.h" +#include "math/correlation.h" #include #include #include -#include -#include "minmax.h" + +#include "libpspp/misc.h" + +#include "gl/minmax.h" double diff --git a/src/math/covariance.c b/src/math/covariance.c index b0b0b466..446ee662 100644 --- a/src/math/covariance.c +++ b/src/math/covariance.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2010 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 @@ -16,15 +16,18 @@ #include -#include -#include "covariance.h" -#include -#include "moments.h" +#include "math/covariance.h" + #include -#include -#include -#include -#include "categoricals.h" + +#include "data/case.h" +#include "data/variable.h" +#include "libpspp/assertion.h" +#include "libpspp/misc.h" +#include "math/categoricals.h" +#include "math/moments.h" + +#include "gl/xalloc.h" #define n_MOMENTS (MOMENT_VARIANCE + 1) diff --git a/src/math/covariance.h b/src/math/covariance.h index f12e994d..4eb2f3f6 100644 --- a/src/math/covariance.h +++ b/src/math/covariance.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2010 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 @@ -18,10 +18,9 @@ #ifndef COVARIANCE_H #define COVARIANCE_H -#include - -#include #include +#include +#include "data/missing-values.h" struct covariance; struct variable; diff --git a/src/math/extrema.c b/src/math/extrema.c index 617c7ac7..7b82a5c4 100644 --- a/src/math/extrema.c +++ b/src/math/extrema.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008 Free Software Foundation, Inc. + Copyright (C) 2008, 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 @@ -15,14 +15,18 @@ along with this program. If not, see . */ #include -#include "extrema.h" -#include -#include -#include -#include -#include + +#include "math/extrema.h" + #include +#include "data/case.h" +#include "data/val-type.h" +#include "libpspp/compiler.h" +#include "libpspp/ll.h" + +#include "gl/xalloc.h" + struct extrema { size_t capacity; diff --git a/src/math/extrema.h b/src/math/extrema.h index d891c533..5c8fa606 100644 --- a/src/math/extrema.h +++ b/src/math/extrema.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008 Free Software Foundation, Inc. + Copyright (C) 2008, 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,8 @@ #define __EXTREMA_H__ 1 #include -#include -#include +#include "data/case.h" +#include "libpspp/ll.h" struct extremum { diff --git a/src/math/group.c b/src/math/group.c index fabd4db2..6f86f87d 100644 --- a/src/math/group.c +++ b/src/math/group.c @@ -15,16 +15,19 @@ along with this program. If not, see . */ #include + +#include "math/group.h" + #include -#include -#include -#include "group.h" -#include "group-proc.h" -#include -#include -#include - -#include "xalloc.h" + +#include "data/variable.h" +#include "libpspp/compiler.h" +#include "libpspp/hash.h" +#include "libpspp/misc.h" +#include "libpspp/str.h" +#include "math/group-proc.h" + +#include "gl/xalloc.h" void free_group (struct group_statistics *v, void *aux UNUSED) diff --git a/src/math/group.h b/src/math/group.h index 72f3cb5d..1e0b2672 100644 --- a/src/math/group.h +++ b/src/math/group.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 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,7 +18,7 @@ #ifndef GROUP_H #define GROUP_H -#include +#include "data/value.h" /* Statistics for grouped data */ struct group_statistics diff --git a/src/math/histogram.c b/src/math/histogram.c index 0c641b56..1b55d204 100644 --- a/src/math/histogram.c +++ b/src/math/histogram.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2004, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2004, 2008, 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 @@ -15,16 +15,17 @@ along with this program. If not, see . */ #include -#include "histogram.h" -#include -#include -#include +#include "math/histogram.h" #include -#include "chart-geometry.h" #include +#include "libpspp/assertion.h" +#include "libpspp/cast.h" +#include "math/chart-geometry.h" + +#include "gl/xalloc.h" void histogram_add (struct histogram *h, double y, double c) diff --git a/src/math/histogram.h b/src/math/histogram.h index bc4a5ae6..4c0e54fb 100644 --- a/src/math/histogram.h +++ b/src/math/histogram.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2008, 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,7 +19,7 @@ #include -#include "statistic.h" +#include "math/statistic.h" #include diff --git a/src/math/interaction.c b/src/math/interaction.c index 2f8da8cc..87f4836d 100644 --- a/src/math/interaction.c +++ b/src/math/interaction.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2010 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 @@ -30,14 +30,18 @@ */ #include + +#include "math/interaction.h" + #include -#include -#include -#include -#include -#include #include -#include +#include + +#include "data/dictionary.h" +#include "data/value.h" +#include "data/variable.h" + +#include "gl/xalloc.h" struct interaction_variable { diff --git a/src/math/interaction.h b/src/math/interaction.h index 995d0684..13b13690 100644 --- a/src/math/interaction.h +++ b/src/math/interaction.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,7 +16,8 @@ #ifndef INTERACTION_H #define INTERACTION_H -#include + +#include "data/case.h" struct interaction_variable; struct interaction_value; diff --git a/src/math/levene.c b/src/math/levene.c index d93673b8..13fad93e 100644 --- a/src/math/levene.c +++ b/src/math/levene.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2010 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,18 +16,15 @@ #include -#include "levene.h" +#include "math/levene.h" #include -#include - -#include -#include -#include - - -#include +#include "data/case.h" +#include "data/casereader.h" +#include "data/variable.h" +#include "libpspp/hmap.h" +#include "libpspp/misc.h" struct lev { diff --git a/src/math/linreg.c b/src/math/linreg.c index 63d1a0f9..90c62a52 100644 --- a/src/math/linreg.c +++ b/src/math/linreg.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2005, 2010 Free Software Foundation, Inc. + Copyright (C) 2005, 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 @@ -15,17 +15,21 @@ along with this program. If not, see . */ #include + +#include "math/linreg.h" + #include #include #include #include #include #include -#include -#include -#include -#include -#include + +#include "data/value.h" +#include "data/variable.h" +#include "linreg/sweep.h" + +#include "gl/xalloc.h" /* Find the least-squares estimate of b for the linear model: diff --git a/src/math/linreg.h b/src/math/linreg.h index 31bf5651..32373f5e 100644 --- a/src/math/linreg.h +++ b/src/math/linreg.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2005 Free Software Foundation, Inc. Written by Jason H. Stover. + Copyright (C) 2005, 2011 Free Software Foundation, Inc. Written by Jason H. Stover. 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 @@ -16,10 +16,11 @@ #ifndef LINREG_H #define LINREG_H -#include + #include -#include #include +#include +#include enum { diff --git a/src/math/merge.c b/src/math/merge.c index af44855c..5b0704d9 100644 --- a/src/math/merge.c +++ b/src/math/merge.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -19,17 +19,17 @@ performance regression. */ #include -#include +#include "math/merge.h" -#include -#include -#include -#include -#include -#include -#include +#include "data/case.h" +#include "data/casereader.h" +#include "data/casewriter.h" +#include "data/subcase.h" +#include "libpspp/array.h" +#include "libpspp/assertion.h" +#include "libpspp/taint.h" -#include "xalloc.h" +#include "gl/xalloc.h" #define MAX_MERGE_ORDER 7 diff --git a/src/math/moments.c b/src/math/moments.c index 545c9644..e289e8ae 100644 --- a/src/math/moments.c +++ b/src/math/moments.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -15,15 +15,18 @@ along with this program. If not, see . */ #include -#include "moments.h" + +#include "math/moments.h" + #include #include #include -#include -#include -#include -#include "xalloc.h" +#include "data/val-type.h" +#include "data/value.h" +#include "libpspp/misc.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/math/moments.h b/src/math/moments.h index 23457ce6..55c517e5 100644 --- a/src/math/moments.h +++ b/src/math/moments.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 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,7 +18,7 @@ #define HEADER_MOMENTS #include -#include +#include "data/value.h" /* Moments of the mean. Higher-order moments have higher values. */ diff --git a/src/math/np.c b/src/math/np.c index b6318209..ccaa51e2 100644 --- a/src/math/np.c +++ b/src/math/np.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2008, 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 @@ -15,20 +15,21 @@ along with this program. If not, see . */ #include -#include "np.h" + +#include "math/np.h" #include #include #include -#include -#include -#include -#include -#include -#include +#include "data/case.h" +#include "data/casewriter.h" +#include "libpspp/cast.h" +#include "libpspp/compiler.h" +#include "libpspp/misc.h" +#include "math/moments.h" -#include "xalloc.h" +#include "gl/xalloc.h" static void destroy (struct statistic *stat) diff --git a/src/math/order-stats.c b/src/math/order-stats.c index 9f54e873..be9c49a3 100644 --- a/src/math/order-stats.c +++ b/src/math/order-stats.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2008, 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 @@ -15,14 +15,18 @@ along with this program. If not, see . */ #include -#include "order-stats.h" -#include -#include -#include -#include -#include + +#include "math/order-stats.h" + #include +#include "data/casereader.h" +#include "data/val-type.h" +#include "data/variable.h" +#include "libpspp/assertion.h" + +#include "gl/xalloc.h" + #if 0 #include diff --git a/src/math/order-stats.h b/src/math/order-stats.h index 07da284a..f3e470e6 100644 --- a/src/math/order-stats.h +++ b/src/math/order-stats.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2004, 2008 Free Software Foundation, Inc. + Copyright (C) 2004, 2008, 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,8 @@ #define __ORDER_STATS_H__ #include -#include -#include +#include "data/missing-values.h" +#include "math/statistic.h" struct casereader; struct variable; diff --git a/src/math/percentiles.c b/src/math/percentiles.c index c76bb492..ed7b1295 100644 --- a/src/math/percentiles.c +++ b/src/math/percentiles.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2008, 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 @@ -15,22 +15,22 @@ along with this program. If not, see . */ #include -#include "percentiles.h" -#include +#include "math/percentiles.h" + +#include "data/casereader.h" +#include "data/val-type.h" +#include "data/variable.h" +#include "libpspp/assertion.h" +#include "libpspp/cast.h" +#include "math/order-stats.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) #define N_(msgid) msgid -#include -#include -#include -#include -#include -#include - - const char *const ptile_alg_desc[] = { "", N_("HAverage"), diff --git a/src/math/sort.c b/src/math/sort.c index 5b82277c..3491a20b 100644 --- a/src/math/sort.c +++ b/src/math/sort.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2009 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 @@ -16,21 +16,21 @@ #include -#include "sort.h" +#include "math/sort.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/case.h" +#include "data/casereader.h" +#include "data/casewriter-provider.h" +#include "data/casewriter.h" +#include "data/settings.h" +#include "data/subcase.h" +#include "libpspp/array.h" +#include "libpspp/assertion.h" +#include "math/merge.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/math/trimmed-mean.c b/src/math/trimmed-mean.c index d1cc6b70..5e486896 100644 --- a/src/math/trimmed-mean.c +++ b/src/math/trimmed-mean.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2008, 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 @@ -15,15 +15,17 @@ along with this program. If not, see . */ #include -#include "trimmed-mean.h" -#include -#include -#include -#include +#include "math/trimmed-mean.h" + #include -#include +#include "data/val-type.h" +#include "libpspp/assertion.h" +#include "libpspp/cast.h" +#include "math/order-stats.h" + +#include "gl/xalloc.h" static void acc (struct statistic *s, const struct ccase *cx UNUSED, double c, double cc, double y) diff --git a/src/math/ts/innovations.c b/src/math/ts/innovations.c index 3ab2f3ed..ba2120fb 100644 --- a/src/math/ts/innovations.c +++ b/src/math/ts/innovations.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 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 @@ -27,17 +27,18 @@ #include -#include -#include +#include "math/ts/innovations.h" #include #include -#include -#include -#include -#include +#include +#include + +#include "libpspp/compiler.h" +#include "libpspp/misc.h" +#include "math/coefficient.h" -#include "xalloc.h" +#include "gl/xalloc.h" static void get_mean (const gsl_matrix *data, diff --git a/src/math/ts/innovations.h b/src/math/ts/innovations.h index f0e40c59..7693690c 100644 --- a/src/math/ts/innovations.h +++ b/src/math/ts/innovations.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 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 @@ -25,8 +25,9 @@ */ #ifndef INNOVATIONS_H #define INNOVATIONS_H -#include -#include + +#include "math/coefficient.h" +#include "math/design-matrix.h" struct innovations_estimate { diff --git a/src/math/tukey-hinges.c b/src/math/tukey-hinges.c index 22ab4521..3e9ea937 100644 --- a/src/math/tukey-hinges.c +++ b/src/math/tukey-hinges.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2008, 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 @@ -15,14 +15,17 @@ along with this program. If not, see . */ #include -#include "tukey-hinges.h" -#include -#include -#include -#include +#include "math/tukey-hinges.h" + #include +#include "libpspp/assertion.h" +#include "libpspp/cast.h" +#include "math/order-stats.h" + +#include "gl/xalloc.h" + void tukey_hinges_calculate (const struct tukey_hinges *th, double hinge[3]) { diff --git a/src/output/cairo-chart.c b/src/output/cairo-chart.c index a776eab3..3ec00ce9 100644 --- a/src/output/cairo-chart.c +++ b/src/output/cairo-chart.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2004, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2004, 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 @@ -35,9 +35,9 @@ #include "output/cairo.h" #include "output/chart-item.h" -#include "error.h" -#include "xalloc.h" -#include "xvasprintf.h" +#include "gl/error.h" +#include "gl/xalloc.h" +#include "gl/xvasprintf.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/output/cairo-chart.h b/src/output/cairo-chart.h index 041a1691..1a23dd17 100644 --- a/src/output/cairo-chart.h +++ b/src/output/cairo-chart.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 diff --git a/src/output/chart-item-provider.h b/src/output/chart-item-provider.h index 4f13fcfe..dd2fa9f1 100644 --- a/src/output/chart-item-provider.h +++ b/src/output/chart-item-provider.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2004, 2009 Free Software Foundation, Inc. + Copyright (C) 2004, 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 @@ -17,8 +17,8 @@ #ifndef OUTPUT_CHART_ITEM_PROVIDER_H #define OUTPUT_CHART_ITEM_PROVIDER_H 1 -#include -#include +#include "output/chart-item.h" +#include "output/output-item.h" struct chart_item_class { diff --git a/src/output/chart-item.c b/src/output/chart-item.c index 227994dd..e70099d2 100644 --- a/src/output/chart-item.c +++ b/src/output/chart-item.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2004, 2009 Free Software Foundation, Inc. + Copyright (C) 2004, 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 @@ -16,16 +16,16 @@ #include -#include -#include +#include "output/chart-item.h" +#include "output/chart-item-provider.h" #include #include -#include -#include -#include -#include +#include "libpspp/cast.h" +#include "libpspp/compiler.h" +#include "output/driver.h" +#include "output/output-item-provider.h" #include "gl/xalloc.h" diff --git a/src/output/chart-item.h b/src/output/chart-item.h index c005a46c..ac25eb0a 100644 --- a/src/output/chart-item.h +++ b/src/output/chart-item.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -25,7 +25,7 @@ chart_item. */ #include -#include +#include "output/output-item.h" /* A chart item. @@ -45,7 +45,7 @@ void chart_item_set_title (struct chart_item *, const char *); autogenerated by mk-class-boilerplate. */ #include -#include +#include "libpspp/cast.h" extern const struct output_item_class chart_item_class; diff --git a/src/output/charts/boxplot-cairo.c b/src/output/charts/boxplot-cairo.c index ddecbfcc..1660e86b 100644 --- a/src/output/charts/boxplot-cairo.c +++ b/src/output/charts/boxplot-cairo.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,13 +16,13 @@ #include -#include +#include "output/cairo-chart.h" #include -#include -#include -#include +#include "math/box-whisker.h" +#include "math/chart-geometry.h" +#include "output/charts/boxplot.h" /* Draw an OUTLIER on the plot CH * at CENTRELINE diff --git a/src/output/charts/boxplot.c b/src/output/charts/boxplot.c index 7e924800..deabc1fa 100644 --- a/src/output/charts/boxplot.c +++ b/src/output/charts/boxplot.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2004, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2004, 2008, 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 @@ -17,10 +17,10 @@ #include -#include +#include "output/charts/boxplot.h" -#include -#include +#include "math/box-whisker.h" +#include "output/chart-item-provider.h" struct boxplot * boxplot_create (double y_min, double y_max, const char *title) diff --git a/src/output/charts/boxplot.h b/src/output/charts/boxplot.h index bd5a7a32..e18daa84 100644 --- a/src/output/charts/boxplot.h +++ b/src/output/charts/boxplot.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2004, 2009 Free Software Foundation, Inc. + Copyright (C) 2004, 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,7 +18,7 @@ #define OUTPUT_CHARTS_BOXPLOT_H 1 #include -#include +#include "output/chart-item.h" /* Box-whiskers plot. */ struct boxplot @@ -49,7 +49,7 @@ void boxplot_add_box (struct boxplot *, autogenerated by mk-class-boilerplate. */ #include -#include +#include "libpspp/cast.h" extern const struct chart_item_class boxplot_class; diff --git a/src/output/charts/np-plot-cairo.c b/src/output/charts/np-plot-cairo.c index 8c96b73f..334284ba 100644 --- a/src/output/charts/np-plot-cairo.c +++ b/src/output/charts/np-plot-cairo.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,12 +16,12 @@ #include -#include +#include "output/charts/np-plot.h" -#include -#include -#include -#include +#include "data/case.h" +#include "data/casereader.h" +#include "math/np.h" +#include "output/cairo-chart.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/output/charts/np-plot.c b/src/output/charts/np-plot.c index dfc74603..ccccbeff 100644 --- a/src/output/charts/np-plot.c +++ b/src/output/charts/np-plot.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2004, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2004, 2008, 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 @@ -16,14 +16,14 @@ #include -#include +#include "output/charts/np-plot.h" #include -#include -#include -#include -#include +#include "data/casereader.h" +#include "libpspp/cast.h" +#include "math/np.h" +#include "output/chart-item-provider.h" #include "gl/minmax.h" diff --git a/src/output/charts/np-plot.h b/src/output/charts/np-plot.h index 82c81ed8..15c1cb9f 100644 --- a/src/output/charts/np-plot.h +++ b/src/output/charts/np-plot.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2004, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2004, 2008, 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 @@ -17,7 +17,7 @@ #ifndef OUTPUT_CHARTS_NP_PLOT_H #define OUTPUT_CHARTS_NP_PLOT_H 1 -#include +#include "output/chart-item.h" struct np; @@ -50,7 +50,7 @@ struct chart_item *dnp_plot_create (const struct np *, autogenerated by mk-class-boilerplate. */ #include -#include +#include "libpspp/cast.h" extern const struct chart_item_class np_plot_chart_class; diff --git a/src/output/charts/piechart-cairo.c b/src/output/charts/piechart-cairo.c index 3917e4e1..9e55c56f 100644 --- a/src/output/charts/piechart-cairo.c +++ b/src/output/charts/piechart-cairo.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,11 +16,11 @@ #include -#include +#include "output/charts/piechart.h" #include -#include +#include "output/cairo-chart.h" #include "gl/minmax.h" diff --git a/src/output/charts/piechart.c b/src/output/charts/piechart.c index 0b9153d5..aac8bfbf 100644 --- a/src/output/charts/piechart.c +++ b/src/output/charts/piechart.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2004, 2009 Free Software Foundation, Inc. + Copyright (C) 2004, 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 @@ -16,13 +16,13 @@ #include -#include +#include "output/charts/piechart.h" #include -#include -#include -#include +#include "libpspp/cast.h" +#include "libpspp/str.h" +#include "output/chart-item-provider.h" #include "gl/xalloc.h" diff --git a/src/output/charts/piechart.h b/src/output/charts/piechart.h index 312a45ee..b59a7296 100644 --- a/src/output/charts/piechart.h +++ b/src/output/charts/piechart.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2004, 2009 Free Software Foundation, Inc. + Copyright (C) 2004, 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 @@ -17,8 +17,8 @@ #ifndef PIECHART_H #define PIECHART_H -#include -#include +#include "libpspp/str.h" +#include "output/chart-item.h" struct piechart { @@ -40,7 +40,7 @@ struct chart_item *piechart_create (const char *title, autogenerated by mk-class-boilerplate. */ #include -#include +#include "libpspp/cast.h" extern const struct chart_item_class piechart_class; diff --git a/src/output/charts/plot-hist-cairo.c b/src/output/charts/plot-hist-cairo.c index a70fa174..d000a1ac 100644 --- a/src/output/charts/plot-hist-cairo.c +++ b/src/output/charts/plot-hist-cairo.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,12 +16,12 @@ #include -#include +#include "output/charts/plot-hist.h" #include -#include -#include +#include "data/val-type.h" +#include "output/cairo-chart.h" #include "gl/xvasprintf.h" diff --git a/src/output/charts/plot-hist.c b/src/output/charts/plot-hist.c index 5925df6d..5abbbb6c 100644 --- a/src/output/charts/plot-hist.c +++ b/src/output/charts/plot-hist.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2004, 2009 Free Software Foundation, Inc. + Copyright (C) 2004, 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,12 +22,11 @@ #include #include -#include -#include - -#include -#include -#include +#include "libpspp/cast.h" +#include "math/histogram.h" +#include "math/moments.h" +#include "output/chart-item-provider.h" +#include "output/charts/plot-hist.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/output/charts/plot-hist.h b/src/output/charts/plot-hist.h index 237b8b3c..bf3674b0 100644 --- a/src/output/charts/plot-hist.h +++ b/src/output/charts/plot-hist.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2004, 2009 Free Software Foundation, Inc. + Copyright (C) 2004, 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 @@ -46,7 +46,7 @@ struct chart_item *histogram_chart_create (const gsl_histogram *, autogenerated by mk-class-boilerplate. */ #include -#include +#include "libpspp/cast.h" extern const struct chart_item_class histogram_chart_class; diff --git a/src/output/charts/roc-chart-cairo.c b/src/output/charts/roc-chart-cairo.c index b5c22aca..f6da3506 100644 --- a/src/output/charts/roc-chart-cairo.c +++ b/src/output/charts/roc-chart-cairo.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,12 +16,12 @@ #include -#include +#include "output/charts/roc-chart.h" -#include -#include -#include -#include +#include "data/case.h" +#include "data/casereader.h" +#include "language/stats/roc.h" +#include "output/cairo-chart.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/output/charts/roc-chart.c b/src/output/charts/roc-chart.c index 5af8f27f..0285d6f6 100644 --- a/src/output/charts/roc-chart.c +++ b/src/output/charts/roc-chart.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,13 +16,13 @@ #include -#include +#include "output/charts/roc-chart.h" -#include -#include -#include +#include "data/casereader.h" +#include "language/stats/roc.h" +#include "output/chart-item-provider.h" -#include "xalloc.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/output/charts/roc-chart.h b/src/output/charts/roc-chart.h index a995f930..309ac38e 100644 --- a/src/output/charts/roc-chart.h +++ b/src/output/charts/roc-chart.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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,7 +19,7 @@ #include #include -#include +#include "output/chart-item.h" struct roc_chart { @@ -44,7 +44,7 @@ void roc_chart_add_var (struct roc_chart *, const char *var_name, autogenerated by mk-class-boilerplate. */ #include -#include +#include "libpspp/cast.h" extern const struct chart_item_class roc_chart_class; diff --git a/src/output/charts/scree-cairo.c b/src/output/charts/scree-cairo.c index d48a3642..f9765c69 100644 --- a/src/output/charts/scree-cairo.c +++ b/src/output/charts/scree-cairo.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,11 +16,11 @@ #include -#include +#include "output/charts/scree.h" #include -#include +#include "output/cairo-chart.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/output/charts/scree.c b/src/output/charts/scree.c index ffa77568..4de1f5e6 100644 --- a/src/output/charts/scree.c +++ b/src/output/charts/scree.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,9 +16,9 @@ #include -#include +#include "output/charts/scree.h" -#include +#include "output/chart-item-provider.h" #include "gl/xalloc.h" diff --git a/src/output/charts/scree.h b/src/output/charts/scree.h index 43f5b822..5691451d 100644 --- a/src/output/charts/scree.h +++ b/src/output/charts/scree.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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,7 +18,7 @@ #define OUTPUT_CHARTS_SCREE_H 1 #include -#include +#include "output/chart-item.h" /* A scree plot. */ struct scree @@ -38,7 +38,7 @@ struct chart *scree_get_chart (struct scree *scree); autogenerated by mk-class-boilerplate. */ #include -#include +#include "libpspp/cast.h" extern const struct chart_item_class scree_class; diff --git a/src/output/measure.c b/src/output/measure.c index 8de7ed1d..14cd5dab 100644 --- a/src/output/measure.c +++ b/src/output/measure.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -16,17 +16,17 @@ #include -#include +#include "output/measure.h" #include #include #if HAVE_LC_PAPER #include #endif -#include #include -#include +#include "data/file-name.h" +#include "libpspp/str.h" #include "gl/error.h" diff --git a/src/output/message-item.h b/src/output/message-item.h index a97b2270..88450f1a 100644 --- a/src/output/message-item.h +++ b/src/output/message-item.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2010 Free Sonftware Foundation, Inc. + Copyright (C) 2010, 2011 Free Sonftware 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 @@ -29,7 +29,7 @@ the message gets routed properly for the PSPP user interface in use. */ #include -#include +#include "output/output-item.h" /* A message item. */ struct message_item @@ -46,7 +46,7 @@ const struct msg *message_item_get_msg (const struct message_item *); autogenerated by mk-class-boilerplate. */ #include -#include +#include "libpspp/cast.h" extern const struct output_item_class message_item_class; diff --git a/src/output/mk-class-boilerplate b/src/output/mk-class-boilerplate index b2191aae..3541c150 100755 --- a/src/output/mk-class-boilerplate +++ b/src/output/mk-class-boilerplate @@ -10,7 +10,7 @@ while (<>) { autogenerated by mk-class-boilerplate. */ #include -#include +#include "libpspp/cast.h" extern const struct ${super}_class ${class}_class; diff --git a/src/output/output-item-provider.h b/src/output/output-item-provider.h index a810f97c..1273f134 100644 --- a/src/output/output-item-provider.h +++ b/src/output/output-item-provider.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -17,7 +17,7 @@ #ifndef OUTPUT_ITEM_PROVIDER_H #define OUTPUT_ITEM_PROVIDER_H 1 -#include +#include "output/output-item.h" /* Class structure for an output item. diff --git a/src/output/output-item.c b/src/output/output-item.c index e1c889ff..dd4e70c2 100644 --- a/src/output/output-item.c +++ b/src/output/output-item.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,15 +16,15 @@ #include -#include +#include "output/output-item-provider.h" #include #include -#include -#include +#include "libpspp/assertion.h" +#include "libpspp/cast.h" -#include "xalloc.h" +#include "gl/xalloc.h" /* Increases ITEM's reference count, indicating that it has an additional owner. An output item that is shared among multiple owners must not be diff --git a/src/output/output-item.h b/src/output/output-item.h index b45e0087..13a5c34a 100644 --- a/src/output/output-item.h +++ b/src/output/output-item.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -31,8 +31,8 @@ - Messages (see output/message-item.h). */ -#include #include +#include "libpspp/cast.h" /* A single output item. */ struct output_item diff --git a/src/output/render.h b/src/output/render.h index f6035cf0..51b84a30 100644 --- a/src/output/render.h +++ b/src/output/render.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2010 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 @@ -19,7 +19,7 @@ #include #include -#include +#include "output/table-provider.h" struct table; diff --git a/src/output/tab.c b/src/output/tab.c index fd468557..7ce860f1 100644 --- a/src/output/tab.c +++ b/src/output/tab.c @@ -16,31 +16,31 @@ #include -#include +#include "output/tab.h" #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "error.h" -#include "minmax.h" -#include "xalloc.h" +#include "data/data-out.h" +#include "data/dictionary.h" +#include "data/format.h" +#include "data/settings.h" +#include "data/value.h" +#include "libpspp/assertion.h" +#include "libpspp/compiler.h" +#include "libpspp/i18n.h" +#include "libpspp/misc.h" +#include "libpspp/pool.h" +#include "output/driver.h" +#include "output/table-item.h" +#include "output/table-provider.h" +#include "output/text-item.h" + +#include "gl/error.h" +#include "gl/minmax.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/output/tab.h b/src/output/tab.h index db38b6b8..7ac85187 100644 --- a/src/output/tab.h +++ b/src/output/tab.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997, 1998, 1999, 2000, 2009 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 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 @@ -38,8 +38,8 @@ the table code here. */ -#include -#include +#include "libpspp/compiler.h" +#include "output/table.h" /* A table. */ struct tab_table diff --git a/src/output/table-casereader.c b/src/output/table-casereader.c index 4a1452c0..fa7498c8 100644 --- a/src/output/table-casereader.c +++ b/src/output/table-casereader.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,12 +16,12 @@ #include -#include +#include "output/table-provider.h" -#include -#include -#include -#include +#include "data/casereader.h" +#include "data/data-out.h" +#include "data/format.h" +#include "libpspp/i18n.h" #include "gl/xalloc.h" diff --git a/src/output/table-item.c b/src/output/table-item.c index c7c0f91c..664f093a 100644 --- a/src/output/table-item.c +++ b/src/output/table-item.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,15 +16,15 @@ #include -#include +#include "output/table-provider.h" #include -#include -#include -#include -#include -#include +#include "libpspp/assertion.h" +#include "libpspp/cast.h" +#include "output/driver.h" +#include "output/output-item-provider.h" +#include "output/table-item.h" #include "gl/xalloc.h" diff --git a/src/output/table-item.h b/src/output/table-item.h index 01e9899b..dddf846c 100644 --- a/src/output/table-item.h +++ b/src/output/table-item.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -23,8 +23,8 @@ contains a table (see table.h) and some formatting properties (currently just a caption). */ -#include -#include +#include "libpspp/compiler.h" +#include "output/output-item.h" /* A table item. @@ -48,7 +48,7 @@ void table_item_set_caption (struct table_item *, const char *); autogenerated by mk-class-boilerplate. */ #include -#include +#include "libpspp/cast.h" extern const struct output_item_class table_item_class; diff --git a/src/output/table-paste.c b/src/output/table-paste.c index 102b5140..5f6d3f83 100644 --- a/src/output/table-paste.c +++ b/src/output/table-paste.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,9 +16,9 @@ #include -#include -#include -#include +#include "libpspp/assertion.h" +#include "libpspp/tower.h" +#include "output/table-provider.h" #include "gl/minmax.h" #include "gl/xalloc.h" diff --git a/src/output/table-provider.h b/src/output/table-provider.h index 6d1a4156..36a66653 100644 --- a/src/output/table-provider.h +++ b/src/output/table-provider.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997, 1998, 1999, 2000, 2009 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 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 @@ -17,7 +17,7 @@ #ifndef OUTPUT_TABLE_PROVIDER #define OUTPUT_TABLE_PROVIDER 1 -#include +#include "output/table.h" /* A cell in a table. */ struct table_cell diff --git a/src/output/table-select.c b/src/output/table-select.c index 241448e5..dcc6b7de 100644 --- a/src/output/table-select.c +++ b/src/output/table-select.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2010 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 @@ -16,9 +16,9 @@ #include -#include -#include -#include +#include "libpspp/assertion.h" +#include "libpspp/cast.h" +#include "output/table-provider.h" #include "gl/minmax.h" #include "gl/xalloc.h" diff --git a/src/output/table-transpose.c b/src/output/table-transpose.c index 59801942..3dd86202 100644 --- a/src/output/table-transpose.c +++ b/src/output/table-transpose.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,9 +16,9 @@ #include -#include -#include -#include +#include "libpspp/assertion.h" +#include "libpspp/cast.h" +#include "output/table-provider.h" #include "gl/minmax.h" #include "gl/xalloc.h" diff --git a/src/output/table.c b/src/output/table.c index 696931ae..bd51f494 100644 --- a/src/output/table.c +++ b/src/output/table.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,14 +16,14 @@ #include -#include -#include +#include "output/table.h" +#include "output/table-provider.h" #include #include -#include -#include +#include "libpspp/cast.h" +#include "libpspp/compiler.h" #include "gl/xalloc.h" diff --git a/src/output/text-item.c b/src/output/text-item.c index 16588ae5..cb21caa2 100644 --- a/src/output/text-item.c +++ b/src/output/text-item.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 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 @@ -16,18 +16,18 @@ #include -#include +#include "output/text-item.h" #include #include #include -#include -#include -#include +#include "libpspp/cast.h" +#include "output/driver.h" +#include "output/output-item-provider.h" -#include "xalloc.h" -#include "xvasprintf.h" +#include "gl/xalloc.h" +#include "gl/xvasprintf.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/output/text-item.h b/src/output/text-item.h index b62e7dc4..5f1e8a2e 100644 --- a/src/output/text-item.h +++ b/src/output/text-item.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Sonftware Foundation, Inc. + Copyright (C) 2009, 2011 Free Sonftware 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 @@ -25,8 +25,8 @@ A text item is just a text string. */ #include -#include -#include +#include "libpspp/compiler.h" +#include "output/output-item.h" enum text_item_type { @@ -78,7 +78,7 @@ const char *text_item_get_text (const struct text_item *); autogenerated by mk-class-boilerplate. */ #include -#include +#include "libpspp/cast.h" extern const struct output_item_class text_item_class; diff --git a/src/ui/syntax-gen.c b/src/ui/syntax-gen.c index d829d80a..bcec18e5 100644 --- a/src/ui/syntax-gen.c +++ b/src/ui/syntax-gen.c @@ -16,7 +16,7 @@ #include -#include +#include "ui/syntax-gen.h" #include #include diff --git a/src/ui/syntax-gen.h b/src/ui/syntax-gen.h index 244e528b..78ae5ea9 100644 --- a/src/ui/syntax-gen.h +++ b/src/ui/syntax-gen.h @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 2007, 2008, 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 @@ -21,8 +21,8 @@ #include #include -#include -#include +#include "libpspp/compiler.h" +#include "libpspp/str.h" struct fmt_spec; struct substring; diff --git a/src/ui/terminal/read-line.c b/src/ui/terminal/read-line.c index 0fa145c9..544e18d5 100644 --- a/src/ui/terminal/read-line.c +++ b/src/ui/terminal/read-line.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2007, 2009 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 @@ -16,7 +16,7 @@ #include -#include "read-line.h" +#include "ui/terminal/read-line.h" #include #include @@ -26,21 +26,20 @@ #include #endif -#include "msg-ui.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/file-name.h" +#include "data/settings.h" +#include "language/command.h" +#include "language/prompt.h" +#include "libpspp/cast.h" +#include "libpspp/message.h" +#include "libpspp/str.h" +#include "libpspp/version.h" +#include "output/driver.h" +#include "output/journal.h" +#include "ui/terminal/msg-ui.h" +#include "ui/terminal/terminal.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) diff --git a/src/ui/terminal/read-line.h b/src/ui/terminal/read-line.h index 6738411f..0eb67097 100644 --- a/src/ui/terminal/read-line.h +++ b/src/ui/terminal/read-line.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -17,8 +17,8 @@ #ifndef READLN_H #define READLN_H -#include -#include +#include "libpspp/str.h" +#include "libpspp/getl.h" void readln_initialize (void); void readln_uninitialize (void);