[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp/src ChangeLog automake.mk data/ChangeLog d...
|
From: |
Ben Pfaff |
|
Subject: |
[Pspp-cvs] pspp/src ChangeLog automake.mk data/ChangeLog d... |
|
Date: |
Fri, 05 May 2006 04:53:13 +0000 |
CVSROOT: /cvsroot/pspp
Module name: pspp
Branch:
Changes by: Ben Pfaff <address@hidden> 06/05/05 04:53:13
Modified files:
src : ChangeLog automake.mk
src/data : ChangeLog automake.mk transformations.c
src/language : command.c
src/language/control: do-if.c loop.c repeat.c temporary.c
src/language/data-io: data-list.c data-reader.c get.c inpt-pgm.c
list.q matrix-data.c print.c
src/language/dictionary: apply-dictionary.c formats.c
missing-values.c modify-variables.c
numeric.c rename-variables.c
split-file.c sys-file-info.c
value-labels.c variable-display.c
variable-label.c vector.c weight.c
src/language/expressions: helpers.h parse.c
src/language/lexer: variable-parser.c
src/language/stats: aggregate.c autorecode.c correlations.q
crosstabs.q descriptives.c examine.q flip.c
frequencies.q means.q oneway.q rank.q
regression.q sort-cases.c t-test.q
src/language/utilities: set.q title.c
src/language/xforms: compute.c count.c recode.c sample.c
select-if.c
src/math : levene.c sort.c
src/ui/terminal: ChangeLog automake.mk main.c
Added files:
src/data : procedure.c procedure.h
Removed files:
src : procedure.c procedure.h
Log message:
Continue reforming procedure execution. In this phase, move
procedure.c and procedure.h from src to src/data. Update makefiles
and #includes accordingly.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ChangeLog.diff?tr1=1.284&tr2=1.285&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/automake.mk.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/ChangeLog.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/automake.mk.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/procedure.c?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/procedure.h?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/transformations.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/command.c.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/control/do-if.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/control/loop.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/control/repeat.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/control/temporary.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/data-list.c.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/data-reader.c.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/get.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/inpt-pgm.c.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/list.q.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/matrix-data.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/print.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/apply-dictionary.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/formats.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/missing-values.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/modify-variables.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/numeric.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/rename-variables.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/split-file.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/sys-file-info.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/value-labels.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/variable-display.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/variable-label.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/vector.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/weight.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/expressions/helpers.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/expressions/parse.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/lexer/variable-parser.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/aggregate.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/autorecode.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/correlations.q.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/crosstabs.q.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/descriptives.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/examine.q.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/flip.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/frequencies.q.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/means.q.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/oneway.q.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/rank.q.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/regression.q.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/sort-cases.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/t-test.q.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/utilities/set.q.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/utilities/title.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/xforms/compute.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/xforms/count.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/xforms/recode.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/xforms/sample.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/xforms/select-if.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/levene.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/sort.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/terminal/ChangeLog.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/terminal/automake.mk.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/terminal/main.c.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
Patches:
Index: pspp/src/ChangeLog
diff -u pspp/src/ChangeLog:1.284 pspp/src/ChangeLog:1.285
--- pspp/src/ChangeLog:1.284 Thu May 4 06:19:02 2006
+++ pspp/src/ChangeLog Fri May 5 04:53:12 2006
@@ -1,3 +1,15 @@
+Thu May 4 21:47:48 2006 Ben Pfaff <address@hidden>
+
+ Continue reforming procedure execution. In this phase, move
+ procedure.c and procedure.h from src to src/data. Update
+ makefiles and #includes accordingly.
+
+ * automake.mk: Remove special rule for src/procedure.o.
+
+ * procedure.c: Moved to src/data.
+
+ * procedure.h: Moved to src/data.
+
Wed May 3 22:24:34 2006 Ben Pfaff <address@hidden>
Continue reforming procedure execution. In this phase, get rid of
Index: pspp/src/automake.mk
diff -u pspp/src/automake.mk:1.4 pspp/src/automake.mk:1.5
--- pspp/src/automake.mk:1.4 Thu Apr 27 01:31:59 2006
+++ pspp/src/automake.mk Fri May 5 04:53:12 2006
@@ -14,12 +14,3 @@
endif
AM_CPPFLAGS += -DPKGDATADIR=\"$(pkgdatadir)\"
-
-src/procedure.o: AM_CPPFLAGS += \
- -I$(top_srcdir)/src/language \
- -I$(top_srcdir)/src/language/control \
- -I$(top_srcdir)/src/output \
- -I$(top_srcdir)/src/data \
- -I$(top_srcdir)/src/libpspp
-
-
Index: pspp/src/data/ChangeLog
diff -u pspp/src/data/ChangeLog:1.29 pspp/src/data/ChangeLog:1.30
--- pspp/src/data/ChangeLog:1.29 Thu May 4 06:19:02 2006
+++ pspp/src/data/ChangeLog Fri May 5 04:53:12 2006
@@ -1,3 +1,13 @@
+Thu May 4 21:50:11 2006 Ben Pfaff <address@hidden>
+
+ Continue reforming procedure execution. In this phase, move
+ procedure.c and procedure.h from src to src/data. Update
+ makefiles and #includes accordingly.
+
+ * procedure.c: Moved here from src/.
+
+ * procedure.h: Moved here from src/.
+
Wed May 3 22:42:12 2006 Ben Pfaff <address@hidden>
Continue reforming procedure execution. In this phase, get rid of
Index: pspp/src/data/automake.mk
diff -u pspp/src/data/automake.mk:1.5 pspp/src/data/automake.mk:1.6
--- pspp/src/data/automake.mk:1.5 Thu May 4 06:19:02 2006
+++ pspp/src/data/automake.mk Fri May 5 04:53:12 2006
@@ -38,6 +38,8 @@
src/data/missing-values.h \
src/data/make-file.c \
src/data/make-file.h \
+ src/data/procedure.c \
+ src/data/procedure.h \
src/data/por-file-reader.c \
src/data/por-file-reader.h \
src/data/por-file-writer.c \
Index: pspp/src/data/transformations.c
diff -u pspp/src/data/transformations.c:1.1 pspp/src/data/transformations.c:1.2
--- pspp/src/data/transformations.c:1.1 Thu May 4 06:19:02 2006
+++ pspp/src/data/transformations.c Fri May 5 04:53:12 2006
@@ -25,7 +25,6 @@
#include <stdlib.h>
#include <libpspp/str.h>
-#include <procedure.h>
#include "xalloc.h"
Index: pspp/src/language/command.c
diff -u pspp/src/language/command.c:1.8 pspp/src/language/command.c:1.9
--- pspp/src/language/command.c:1.8 Tue May 2 01:29:06 2006
+++ pspp/src/language/command.c Fri May 5 04:53:12 2006
@@ -28,6 +28,7 @@
#include <unistd.h>
#include <data/dictionary.h>
+#include <data/procedure.h>
#include <data/settings.h>
#include <data/variable.h>
#include <language/lexer/lexer.h>
@@ -38,7 +39,6 @@
#include <libpspp/str.h>
#include <output/manager.h>
#include <output/table.h>
-#include <procedure.h>
#if HAVE_SYS_WAIT_H
#include <sys/wait.h>
Index: pspp/src/language/control/do-if.c
diff -u pspp/src/language/control/do-if.c:1.4
pspp/src/language/control/do-if.c:1.5
--- pspp/src/language/control/do-if.c:1.4 Thu May 4 06:19:02 2006
+++ pspp/src/language/control/do-if.c Fri May 5 04:53:12 2006
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include "control-stack.h"
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/transformations.h>
#include <data/variable.h>
#include <language/command.h>
Index: pspp/src/language/control/loop.c
diff -u pspp/src/language/control/loop.c:1.5
pspp/src/language/control/loop.c:1.6
--- pspp/src/language/control/loop.c:1.5 Thu May 4 06:19:02 2006
+++ pspp/src/language/control/loop.c Fri May 5 04:53:12 2006
@@ -22,7 +22,7 @@
#include "control-stack.h"
#include <data/case.h>
#include <data/dictionary.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/settings.h>
#include <data/transformations.h>
#include <data/variable.h>
Index: pspp/src/language/control/repeat.c
diff -u pspp/src/language/control/repeat.c:1.6
pspp/src/language/control/repeat.c:1.7
--- pspp/src/language/control/repeat.c:1.6 Thu May 4 06:19:02 2006
+++ pspp/src/language/control/repeat.c Fri May 5 04:53:12 2006
@@ -26,7 +26,7 @@
#include <stdlib.h>
#include <data/dictionary.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/settings.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
Index: pspp/src/language/control/temporary.c
diff -u pspp/src/language/control/temporary.c:1.3
pspp/src/language/control/temporary.c:1.4
--- pspp/src/language/control/temporary.c:1.3 Thu May 4 06:19:02 2006
+++ pspp/src/language/control/temporary.c Fri May 5 04:53:12 2006
@@ -24,7 +24,7 @@
#include "control-stack.h"
#include <data/dictionary.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/transformations.h>
#include <data/value-labels.h>
#include <data/variable.h>
Index: pspp/src/language/data-io/data-list.c
diff -u pspp/src/language/data-io/data-list.c:1.14
pspp/src/language/data-io/data-list.c:1.15
--- pspp/src/language/data-io/data-list.c:1.14 Thu May 4 06:19:02 2006
+++ pspp/src/language/data-io/data-list.c Fri May 5 04:53:12 2006
@@ -30,6 +30,7 @@
#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>
@@ -45,7 +46,6 @@
#include <libpspp/misc.h>
#include <libpspp/str.h>
#include <output/table.h>
-#include <procedure.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: pspp/src/language/data-io/data-reader.c
diff -u pspp/src/language/data-io/data-reader.c:1.8
pspp/src/language/data-io/data-reader.c:1.9
--- pspp/src/language/data-io/data-reader.c:1.8 Tue Apr 25 00:41:12 2006
+++ pspp/src/language/data-io/data-reader.c Fri May 5 04:53:12 2006
@@ -18,21 +18,24 @@
02110-1301, USA. */
#include <config.h>
+
#include <language/data-io/data-reader.h>
+
#include <ctype.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
-#include <language/command.h>
-#include <libpspp/message.h>
-#include <language/data-io/file-handle.h>
+
#include <data/file-handle-def.h>
#include <data/file-name.h>
-#include <language/line-buffer.h>
+#include <data/procedure.h>
+#include <language/command.h>
+#include <language/data-io/file-handle.h>
#include <language/lexer/lexer.h>
+#include <language/line-buffer.h>
+#include <libpspp/alloc.h>
+#include <libpspp/message.h>
#include <libpspp/str.h>
-#include <procedure.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: pspp/src/language/data-io/get.c
diff -u pspp/src/language/data-io/get.c:1.7 pspp/src/language/data-io/get.c:1.8
--- pspp/src/language/data-io/get.c:1.7 Thu May 4 06:19:02 2006
+++ pspp/src/language/data-io/get.c Fri May 5 04:53:12 2006
@@ -28,6 +28,7 @@
#include <data/case.h>
#include <data/dictionary.h>
#include <data/por-file-writer.h>
+#include <data/procedure.h>
#include <data/settings.h>
#include <data/storage-stream.h>
#include <data/sys-file-writer.h>
@@ -44,7 +45,6 @@
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
-#include <procedure.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: pspp/src/language/data-io/inpt-pgm.c
diff -u pspp/src/language/data-io/inpt-pgm.c:1.9
pspp/src/language/data-io/inpt-pgm.c:1.10
--- pspp/src/language/data-io/inpt-pgm.c:1.9 Thu May 4 06:19:02 2006
+++ pspp/src/language/data-io/inpt-pgm.c Fri May 5 04:53:12 2006
@@ -28,6 +28,7 @@
#include <data/case.h>
#include <data/case-source.h>
#include <data/dictionary.h>
+#include <data/procedure.h>
#include <data/transformations.h>
#include <data/variable.h>
#include <language/command.h>
@@ -41,7 +42,6 @@
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
-#include <procedure.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: pspp/src/language/data-io/list.q
diff -u pspp/src/language/data-io/list.q:1.7
pspp/src/language/data-io/list.q:1.8
--- pspp/src/language/data-io/list.q:1.7 Tue May 2 03:51:43 2006
+++ pspp/src/language/data-io/list.q Fri May 5 04:53:12 2006
@@ -18,27 +18,29 @@
02110-1301, USA. */
#include <config.h>
-#include <libpspp/message.h>
+
#include <stdio.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
+
+#include "intprops.h"
+#include "size_max.h"
#include <data/case.h>
-#include <language/command.h>
-#include <libpspp/compiler.h>
#include <data/dictionary.h>
-#include "intprops.h"
+#include <data/format.h>
+#include <data/procedure.h>
+#include <data/variable.h>
+#include <language/command.h>
#include <language/lexer/lexer.h>
-#include <libpspp/message.h>
+#include <libpspp/alloc.h>
+#include <libpspp/compiler.h>
#include <libpspp/magic.h>
+#include <libpspp/message.h>
+#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <output/htmlP.h>
-#include <output/output.h>
-#include "size_max.h"
#include <output/manager.h>
+#include <output/output.h>
#include <output/table.h>
-#include <data/variable.h>
-#include <procedure.h>
-#include <data/format.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: pspp/src/language/data-io/matrix-data.c
diff -u pspp/src/language/data-io/matrix-data.c:1.6
pspp/src/language/data-io/matrix-data.c:1.7
--- pspp/src/language/data-io/matrix-data.c:1.6 Thu May 4 06:19:02 2006
+++ pspp/src/language/data-io/matrix-data.c Fri May 5 04:53:12 2006
@@ -27,6 +27,7 @@
#include <data/case.h>
#include <data/data-in.h>
#include <data/dictionary.h>
+#include <data/procedure.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/data-io/data-reader.h>
@@ -40,7 +41,6 @@
#include <libpspp/misc.h>
#include <libpspp/pool.h>
#include <libpspp/str.h>
-#include <procedure.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: pspp/src/language/data-io/print.c
diff -u pspp/src/language/data-io/print.c:1.6
pspp/src/language/data-io/print.c:1.7
--- pspp/src/language/data-io/print.c:1.6 Thu May 4 06:19:02 2006
+++ pspp/src/language/data-io/print.c Fri May 5 04:53:12 2006
@@ -24,7 +24,7 @@
#include <stdlib.h>
#include <data/case.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/transformations.h>
#include <data/variable.h>
#include <language/command.h>
Index: pspp/src/language/dictionary/apply-dictionary.c
diff -u pspp/src/language/dictionary/apply-dictionary.c:1.5
pspp/src/language/dictionary/apply-dictionary.c:1.6
--- pspp/src/language/dictionary/apply-dictionary.c:1.5 Thu May 4 06:19:02 2006
+++ pspp/src/language/dictionary/apply-dictionary.c Fri May 5 04:53:13 2006
@@ -24,7 +24,7 @@
#include <data/any-reader.h>
#include <data/dictionary.h>
#include <data/file-handle-def.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/value-labels.h>
#include <data/variable.h>
#include <language/command.h>
Index: pspp/src/language/dictionary/formats.c
diff -u pspp/src/language/dictionary/formats.c:1.5
pspp/src/language/dictionary/formats.c:1.6
--- pspp/src/language/dictionary/formats.c:1.5 Thu May 4 06:19:02 2006
+++ pspp/src/language/dictionary/formats.c Fri May 5 04:53:13 2006
@@ -23,7 +23,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
Index: pspp/src/language/dictionary/missing-values.c
diff -u pspp/src/language/dictionary/missing-values.c:1.5
pspp/src/language/dictionary/missing-values.c:1.6
--- pspp/src/language/dictionary/missing-values.c:1.5 Thu May 4 06:19:02 2006
+++ pspp/src/language/dictionary/missing-values.c Fri May 5 04:53:13 2006
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <data/data-in.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
Index: pspp/src/language/dictionary/modify-variables.c
diff -u pspp/src/language/dictionary/modify-variables.c:1.4
pspp/src/language/dictionary/modify-variables.c:1.5
--- pspp/src/language/dictionary/modify-variables.c:1.4 Thu May 4 06:19:02 2006
+++ pspp/src/language/dictionary/modify-variables.c Fri May 5 04:53:13 2006
@@ -31,8 +31,8 @@
#include <language/lexer/lexer.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
+#include <data/procedure.h>
#include <data/variable.h>
-#include <procedure.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: pspp/src/language/dictionary/numeric.c
diff -u pspp/src/language/dictionary/numeric.c:1.7
pspp/src/language/dictionary/numeric.c:1.8
--- pspp/src/language/dictionary/numeric.c:1.7 Thu May 4 06:19:02 2006
+++ pspp/src/language/dictionary/numeric.c Fri May 5 04:53:13 2006
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <data/dictionary.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
Index: pspp/src/language/dictionary/rename-variables.c
diff -u pspp/src/language/dictionary/rename-variables.c:1.3
pspp/src/language/dictionary/rename-variables.c:1.4
--- pspp/src/language/dictionary/rename-variables.c:1.3 Thu May 4 06:19:02 2006
+++ pspp/src/language/dictionary/rename-variables.c Fri May 5 04:53:13 2006
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <data/dictionary.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
Index: pspp/src/language/dictionary/split-file.c
diff -u pspp/src/language/dictionary/split-file.c:1.3
pspp/src/language/dictionary/split-file.c:1.4
--- pspp/src/language/dictionary/split-file.c:1.3 Thu May 4 06:19:02 2006
+++ pspp/src/language/dictionary/split-file.c Fri May 5 04:53:13 2006
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <data/dictionary.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
Index: pspp/src/language/dictionary/sys-file-info.c
diff -u pspp/src/language/dictionary/sys-file-info.c:1.6
pspp/src/language/dictionary/sys-file-info.c:1.7
--- pspp/src/language/dictionary/sys-file-info.c:1.6 Thu May 4 06:19:02 2006
+++ pspp/src/language/dictionary/sys-file-info.c Fri May 5 04:53:13 2006
@@ -24,7 +24,7 @@
#include <data/dictionary.h>
#include <data/file-handle-def.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/sys-file-reader.h>
#include <data/value-labels.h>
#include <data/variable.h>
Index: pspp/src/language/dictionary/value-labels.c
diff -u pspp/src/language/dictionary/value-labels.c:1.4
pspp/src/language/dictionary/value-labels.c:1.5
--- pspp/src/language/dictionary/value-labels.c:1.4 Thu May 4 06:19:02 2006
+++ pspp/src/language/dictionary/value-labels.c Fri May 5 04:53:13 2006
@@ -22,7 +22,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/value-labels.h>
#include <data/variable.h>
#include <language/command.h>
Index: pspp/src/language/dictionary/variable-display.c
diff -u pspp/src/language/dictionary/variable-display.c:1.5
pspp/src/language/dictionary/variable-display.c:1.6
--- pspp/src/language/dictionary/variable-display.c:1.5 Thu May 4 06:19:02 2006
+++ pspp/src/language/dictionary/variable-display.c Fri May 5 04:53:13 2006
@@ -22,7 +22,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
Index: pspp/src/language/dictionary/variable-label.c
diff -u pspp/src/language/dictionary/variable-label.c:1.5
pspp/src/language/dictionary/variable-label.c:1.6
--- pspp/src/language/dictionary/variable-label.c:1.5 Thu May 4 06:19:02 2006
+++ pspp/src/language/dictionary/variable-label.c Fri May 5 04:53:13 2006
@@ -22,7 +22,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
Index: pspp/src/language/dictionary/vector.c
diff -u pspp/src/language/dictionary/vector.c:1.4
pspp/src/language/dictionary/vector.c:1.5
--- pspp/src/language/dictionary/vector.c:1.4 Thu May 4 06:19:02 2006
+++ pspp/src/language/dictionary/vector.c Fri May 5 04:53:13 2006
@@ -21,7 +21,7 @@
#include <stdlib.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/dictionary.h>
#include <data/variable.h>
#include <language/command.h>
Index: pspp/src/language/dictionary/weight.c
diff -u pspp/src/language/dictionary/weight.c:1.3
pspp/src/language/dictionary/weight.c:1.4
--- pspp/src/language/dictionary/weight.c:1.3 Thu May 4 06:19:02 2006
+++ pspp/src/language/dictionary/weight.c Fri May 5 04:53:13 2006
@@ -21,7 +21,7 @@
#include <stdio.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/dictionary.h>
#include <data/variable.h>
#include <language/command.h>
Index: pspp/src/language/expressions/helpers.h
diff -u pspp/src/language/expressions/helpers.h:1.3
pspp/src/language/expressions/helpers.h:1.4
--- pspp/src/language/expressions/helpers.h:1.3 Wed Mar 15 03:29:10 2006
+++ pspp/src/language/expressions/helpers.h Fri May 5 04:53:13 2006
@@ -9,21 +9,22 @@
#include <limits.h>
#include <math.h>
#include <stdbool.h>
+
+#include <data/calendar.h>
#include <data/case.h>
-#include <libpspp/compiler.h>
#include <data/data-in.h>
#include <data/dictionary.h>
-#include <libpspp/message.h>
-#include <data/calendar.h>
+#include <data/procedure.h>
+#include <data/settings.h>
+#include <data/value.h>
+#include <data/variable.h>
#include <gsl-extras/gsl-extras.h>
+#include <libpspp/compiler.h>
+#include <libpspp/message.h>
#include <libpspp/misc.h>
+#include <libpspp/str.h>
#include <math/moments.h>
#include <math/random.h>
-#include <data/settings.h>
-#include <libpspp/str.h>
-#include <data/value.h>
-#include <data/variable.h>
-#include <procedure.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: pspp/src/language/expressions/parse.c
diff -u pspp/src/language/expressions/parse.c:1.7
pspp/src/language/expressions/parse.c:1.8
--- pspp/src/language/expressions/parse.c:1.7 Thu May 4 06:19:02 2006
+++ pspp/src/language/expressions/parse.c Fri May 5 04:53:13 2006
@@ -35,7 +35,6 @@
#include <data/settings.h>
#include <libpspp/str.h>
#include <data/variable.h>
-#include <procedure.h>
/* Declarations. */
Index: pspp/src/language/lexer/variable-parser.c
diff -u pspp/src/language/lexer/variable-parser.c:1.3
pspp/src/language/lexer/variable-parser.c:1.4
--- pspp/src/language/lexer/variable-parser.c:1.3 Thu May 4 06:19:02 2006
+++ pspp/src/language/lexer/variable-parser.c Fri May 5 04:53:13 2006
@@ -25,7 +25,7 @@
#include "lexer.h"
#include <data/dictionary.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/variable.h>
#include <libpspp/alloc.h>
#include <libpspp/bit-vector.h>
Index: pspp/src/language/stats/aggregate.c
diff -u pspp/src/language/stats/aggregate.c:1.6
pspp/src/language/stats/aggregate.c:1.7
--- pspp/src/language/stats/aggregate.c:1.6 Thu May 4 06:19:02 2006
+++ pspp/src/language/stats/aggregate.c Fri May 5 04:53:13 2006
@@ -27,7 +27,7 @@
#include <data/casefile.h>
#include <data/dictionary.h>
#include <data/file-handle-def.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/settings.h>
#include <data/storage-stream.h>
#include <data/sys-file-writer.h>
@@ -44,7 +44,6 @@
#include <libpspp/str.h>
#include <math/moments.h>
#include <math/sort.h>
-#include <procedure.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: pspp/src/language/stats/autorecode.c
diff -u pspp/src/language/stats/autorecode.c:1.5
pspp/src/language/stats/autorecode.c:1.6
--- pspp/src/language/stats/autorecode.c:1.5 Thu May 4 06:19:02 2006
+++ pspp/src/language/stats/autorecode.c Fri May 5 04:53:13 2006
@@ -22,6 +22,7 @@
#include <data/case.h>
#include <data/dictionary.h>
+#include <data/procedure.h>
#include <data/transformations.h>
#include <data/variable.h>
#include <language/command.h>
@@ -33,7 +34,6 @@
#include <libpspp/message.h>
#include <libpspp/pool.h>
#include <libpspp/str.h>
-#include <procedure.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: pspp/src/language/stats/correlations.q
diff -u pspp/src/language/stats/correlations.q:1.6
pspp/src/language/stats/correlations.q:1.7
--- pspp/src/language/stats/correlations.q:1.6 Thu May 4 06:19:02 2006
+++ pspp/src/language/stats/correlations.q Fri May 5 04:53:13 2006
@@ -23,7 +23,7 @@
#include <data/dictionary.h>
#include <data/file-handle-def.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/data-io/file-handle.h>
Index: pspp/src/language/stats/crosstabs.q
diff -u pspp/src/language/stats/crosstabs.q:1.6
pspp/src/language/stats/crosstabs.q:1.7
--- pspp/src/language/stats/crosstabs.q:1.6 Sun Apr 16 04:46:41 2006
+++ pspp/src/language/stats/crosstabs.q Fri May 5 04:53:13 2006
@@ -30,29 +30,31 @@
*/
#include <config.h>
-#include <libpspp/message.h>
+
#include <ctype.h>
+#include <gsl/gsl_cdf.h>
#include <stdlib.h>
#include <stdio.h>
-#include <gsl/gsl_cdf.h>
-#include <libpspp/array.h>
-#include <libpspp/alloc.h>
+
#include <data/case.h>
#include <data/dictionary.h>
-#include <libpspp/hash.h>
-#include <libpspp/pool.h>
+#include <data/procedure.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
#include <language/command.h>
-#include <libpspp/compiler.h>
#include <language/lexer/lexer.h>
-#include <libpspp/message.h>
+#include <libpspp/alloc.h>
+#include <libpspp/array.h>
+#include <libpspp/compiler.h>
+#include <libpspp/hash.h>
#include <libpspp/magic.h>
+#include <libpspp/message.h>
+#include <libpspp/message.h>
#include <libpspp/misc.h>
-#include <output/output.h>
+#include <libpspp/pool.h>
#include <libpspp/str.h>
+#include <output/output.h>
#include <output/table.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-#include <procedure.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: pspp/src/language/stats/descriptives.c
diff -u pspp/src/language/stats/descriptives.c:1.6
pspp/src/language/stats/descriptives.c:1.7
--- pspp/src/language/stats/descriptives.c:1.6 Thu May 4 06:19:02 2006
+++ pspp/src/language/stats/descriptives.c Fri May 5 04:53:13 2006
@@ -28,6 +28,7 @@
#include <data/case.h>
#include <data/casefile.h>
#include <data/dictionary.h>
+#include <data/procedure.h>
#include <data/transformations.h>
#include <data/variable.h>
#include <language/command.h>
@@ -40,7 +41,6 @@
#include <math/moments.h>
#include <output/manager.h>
#include <output/table.h>
-#include <procedure.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: pspp/src/language/stats/examine.q
diff -u pspp/src/language/stats/examine.q:1.5
pspp/src/language/stats/examine.q:1.6
--- pspp/src/language/stats/examine.q:1.5 Sun Apr 16 01:05:15 2006
+++ pspp/src/language/stats/examine.q Fri May 5 04:53:13 2006
@@ -19,33 +19,35 @@
02110-1301, USA. */
#include <config.h>
+
#include <gsl/gsl_cdf.h>
#include <libpspp/message.h>
+#include <math.h>
#include <stdio.h>
#include <stdlib.h>
-#include <math.h>
-#include <libpspp/alloc.h>
-#include <libpspp/str.h>
+
#include <data/case.h>
+#include <data/casefile.h>
#include <data/dictionary.h>
+#include <data/procedure.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
#include <language/command.h>
-#include <libpspp/compiler.h>
#include <language/lexer/lexer.h>
-#include <libpspp/message.h>
+#include <libpspp/alloc.h>
+#include <libpspp/compiler.h>
+#include <libpspp/hash.h>
#include <libpspp/magic.h>
+#include <libpspp/message.h>
#include <libpspp/misc.h>
-#include <output/table.h>
-#include <output/manager.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-#include <procedure.h>
-#include <libpspp/hash.h>
-#include <data/casefile.h>
+#include <libpspp/str.h>
#include <math/factor-stats.h>
#include <math/moments.h>
#include <math/percentiles.h>
#include <output/charts/box-whisker.h>
#include <output/charts/cartesian.h>
+#include <output/manager.h>
+#include <output/table.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: pspp/src/language/stats/flip.c
diff -u pspp/src/language/stats/flip.c:1.7 pspp/src/language/stats/flip.c:1.8
--- pspp/src/language/stats/flip.c:1.7 Thu May 4 06:19:02 2006
+++ pspp/src/language/stats/flip.c Fri May 5 04:53:13 2006
@@ -32,7 +32,7 @@
#include <data/case-source.h>
#include <data/case.h>
#include <data/dictionary.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/settings.h>
#include <data/value.h>
#include <data/variable.h>
@@ -45,7 +45,6 @@
#include <libpspp/misc.h>
#include <libpspp/pool.h>
#include <libpspp/str.h>
-#include <procedure.h>
#include "intprops.h"
Index: pspp/src/language/stats/frequencies.q
diff -u pspp/src/language/stats/frequencies.q:1.6
pspp/src/language/stats/frequencies.q:1.7
--- pspp/src/language/stats/frequencies.q:1.6 Sun Apr 16 04:46:41 2006
+++ pspp/src/language/stats/frequencies.q Fri May 5 04:53:13 2006
@@ -24,37 +24,38 @@
*/
#include <config.h>
-#include <libpspp/message.h>
+
#include <math.h>
#include <stdlib.h>
#include <gsl/gsl_histogram.h>
-#include <libpspp/alloc.h>
-#include <libpspp/bit-vector.h>
#include <data/case.h>
-#include <libpspp/compiler.h>
#include <data/dictionary.h>
-#include <libpspp/hash.h>
-#include <libpspp/pool.h>
+#include <data/procedure.h>
+#include <data/settings.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
-#include <math/moments.h>
-#include <libpspp/message.h>
+#include <libpspp/alloc.h>
#include <libpspp/array.h>
+#include <libpspp/bit-vector.h>
+#include <libpspp/compiler.h>
+#include <libpspp/hash.h>
#include <libpspp/magic.h>
+#include <libpspp/message.h>
+#include <libpspp/message.h>
#include <libpspp/misc.h>
-#include <output/output.h>
-#include <output/manager.h>
+#include <libpspp/pool.h>
#include <libpspp/str.h>
-#include <output/table.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-#include <procedure.h>
-#include <data/settings.h>
-#include <output/charts/piechart.h>
+#include <math/histogram.h>
+#include <math/moments.h>
#include <output/chart.h>
+#include <output/charts/piechart.h>
#include <output/charts/plot-hist.h>
-#include <math/histogram.h>
+#include <output/manager.h>
+#include <output/output.h>
+#include <output/table.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: pspp/src/language/stats/means.q
diff -u pspp/src/language/stats/means.q:1.4 pspp/src/language/stats/means.q:1.5
--- pspp/src/language/stats/means.q:1.4 Thu May 4 06:19:02 2006
+++ pspp/src/language/stats/means.q Fri May 5 04:53:13 2006
@@ -23,7 +23,7 @@
#include <stdio.h>
#include <data/dictionary.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
Index: pspp/src/language/stats/oneway.q
diff -u pspp/src/language/stats/oneway.q:1.5
pspp/src/language/stats/oneway.q:1.6
--- pspp/src/language/stats/oneway.q:1.5 Tue Apr 4 12:43:22 2006
+++ pspp/src/language/stats/oneway.q Fri May 5 04:53:13 2006
@@ -19,32 +19,33 @@
02110-1301, USA. */
#include <config.h>
+
#include <gsl/gsl_cdf.h>
-#include <libpspp/message.h>
+#include <math.h>
#include <stdio.h>
#include <stdlib.h>
-#include <math.h>
-#include <libpspp/alloc.h>
-#include <libpspp/str.h>
+
#include <data/case.h>
+#include <data/casefile.h>
#include <data/dictionary.h>
+#include <data/procedure.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
#include <language/command.h>
-#include <libpspp/compiler.h>
#include <language/lexer/lexer.h>
-#include <libpspp/message.h>
+#include <libpspp/alloc.h>
+#include <libpspp/compiler.h>
+#include <libpspp/hash.h>
#include <libpspp/magic.h>
+#include <libpspp/message.h>
+#include <libpspp/message.h>
#include <libpspp/misc.h>
-#include <output/table.h>
-#include <output/manager.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-#include <procedure.h>
-#include <libpspp/hash.h>
-#include <data/casefile.h>
+#include <libpspp/str.h>
#include <math/group-proc.h>
#include <math/group.h>
#include <math/levene.h>
-
+#include <output/manager.h>
+#include <output/table.h>
#include "sort-criteria.h"
#include "gettext.h"
Index: pspp/src/language/stats/rank.q
diff -u pspp/src/language/stats/rank.q:1.7 pspp/src/language/stats/rank.q:1.8
--- pspp/src/language/stats/rank.q:1.7 Thu May 4 06:19:02 2006
+++ pspp/src/language/stats/rank.q Fri May 5 04:53:13 2006
@@ -21,8 +21,9 @@
#include <config.h>
#include "sort-criteria.h"
+
#include <data/dictionary.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/stats/sort-criteria.h>
Index: pspp/src/language/stats/regression.q
diff -u pspp/src/language/stats/regression.q:1.21
pspp/src/language/stats/regression.q:1.22
--- pspp/src/language/stats/regression.q:1.21 Thu May 4 06:19:02 2006
+++ pspp/src/language/stats/regression.q Fri May 5 04:53:13 2006
@@ -32,6 +32,7 @@
#include <data/category.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>
@@ -45,7 +46,6 @@
#include <math/linreg/coefficient.h>
#include <math/linreg/linreg.h>
#include <output/table.h>
-#include <procedure.h>
#include "gettext.h"
Index: pspp/src/language/stats/sort-cases.c
diff -u pspp/src/language/stats/sort-cases.c:1.3
pspp/src/language/stats/sort-cases.c:1.4
--- pspp/src/language/stats/sort-cases.c:1.3 Thu May 4 06:19:02 2006
+++ pspp/src/language/stats/sort-cases.c Fri May 5 04:53:13 2006
@@ -24,7 +24,7 @@
#include <limits.h>
#include "sort-criteria.h"
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/settings.h>
#include <data/variable.h>
#include <language/command.h>
Index: pspp/src/language/stats/t-test.q
diff -u pspp/src/language/stats/t-test.q:1.4
pspp/src/language/stats/t-test.q:1.5
--- pspp/src/language/stats/t-test.q:1.4 Mon Apr 3 20:07:54 2006
+++ pspp/src/language/stats/t-test.q Fri May 5 04:53:13 2006
@@ -20,31 +20,34 @@
02110-1301, USA. */
#include <config.h>
+
#include <gsl/gsl_cdf.h>
-#include <libpspp/message.h>
+#include <math.h>
#include <stdio.h>
#include <stdlib.h>
-#include <math.h>
-#include <libpspp/alloc.h>
+
#include <data/case.h>
#include <data/casefile.h>
+#include <data/dictionary.h>
+#include <data/procedure.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
#include <language/command.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
-#include <data/dictionary.h>
-#include <libpspp/message.h>
-#include <math/group-proc.h>
#include <libpspp/hash.h>
-#include <math/levene.h>
-#include <language/lexer/lexer.h>
#include <libpspp/magic.h>
+#include <libpspp/message.h>
+#include <libpspp/message.h>
#include <libpspp/misc.h>
-#include "size_max.h"
-#include <output/manager.h>
#include <libpspp/str.h>
+#include <math/group-proc.h>
+#include <math/levene.h>
+#include <output/manager.h>
#include <output/table.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-#include <procedure.h>
+
+#include "size_max.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: pspp/src/language/utilities/set.q
diff -u pspp/src/language/utilities/set.q:1.7
pspp/src/language/utilities/set.q:1.8
--- pspp/src/language/utilities/set.q:1.7 Thu May 4 06:19:02 2006
+++ pspp/src/language/utilities/set.q Fri May 5 04:53:13 2006
@@ -26,7 +26,7 @@
#include <data/dictionary.h>
#include <data/format.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/settings.h>
#include <data/variable.h>
#include <language/command.h>
Index: pspp/src/language/utilities/title.c
diff -u pspp/src/language/utilities/title.c:1.3
pspp/src/language/utilities/title.c:1.4
--- pspp/src/language/utilities/title.c:1.3 Sun Apr 16 04:46:41 2006
+++ pspp/src/language/utilities/title.c Fri May 5 04:53:13 2006
@@ -18,18 +18,20 @@
02110-1301, USA. */
#include <config.h>
+
#include <ctype.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
-#include <language/command.h>
+
#include <data/dictionary.h>
-#include <libpspp/message.h>
+#include <data/procedure.h>
+#include <data/variable.h>
+#include <language/command.h>
#include <language/lexer/lexer.h>
-#include <output/output.h>
+#include <libpspp/alloc.h>
+#include <libpspp/message.h>
#include <libpspp/start-date.h>
-#include <data/variable.h>
#include <libpspp/version.h>
-#include <procedure.h>
+#include <output/output.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: pspp/src/language/xforms/compute.c
diff -u pspp/src/language/xforms/compute.c:1.4
pspp/src/language/xforms/compute.c:1.5
--- pspp/src/language/xforms/compute.c:1.4 Thu May 4 06:19:02 2006
+++ pspp/src/language/xforms/compute.c Fri May 5 04:53:13 2006
@@ -23,7 +23,7 @@
#include <data/case.h>
#include <data/dictionary.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/transformations.h>
#include <data/variable.h>
#include <language/command.h>
Index: pspp/src/language/xforms/count.c
diff -u pspp/src/language/xforms/count.c:1.4
pspp/src/language/xforms/count.c:1.5
--- pspp/src/language/xforms/count.c:1.4 Thu May 4 06:19:02 2006
+++ pspp/src/language/xforms/count.c Fri May 5 04:53:13 2006
@@ -23,7 +23,7 @@
#include <data/case.h>
#include <data/dictionary.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/transformations.h>
#include <data/variable.h>
#include <language/command.h>
Index: pspp/src/language/xforms/recode.c
diff -u pspp/src/language/xforms/recode.c:1.5
pspp/src/language/xforms/recode.c:1.6
--- pspp/src/language/xforms/recode.c:1.5 Thu May 4 06:19:02 2006
+++ pspp/src/language/xforms/recode.c Fri May 5 04:53:13 2006
@@ -26,7 +26,7 @@
#include <data/case.h>
#include <data/data-in.h>
#include <data/dictionary.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/transformations.h>
#include <data/variable.h>
#include <language/command.h>
Index: pspp/src/language/xforms/sample.c
diff -u pspp/src/language/xforms/sample.c:1.5
pspp/src/language/xforms/sample.c:1.6
--- pspp/src/language/xforms/sample.c:1.5 Thu May 4 06:19:02 2006
+++ pspp/src/language/xforms/sample.c Fri May 5 04:53:13 2006
@@ -24,6 +24,7 @@
#include <stdio.h>
#include <math.h>
+#include <data/procedure.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
@@ -32,7 +33,6 @@
#include <libpspp/message.h>
#include <libpspp/str.h>
#include <math/random.h>
-#include <procedure.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: pspp/src/language/xforms/select-if.c
diff -u pspp/src/language/xforms/select-if.c:1.4
pspp/src/language/xforms/select-if.c:1.5
--- pspp/src/language/xforms/select-if.c:1.4 Thu May 4 06:19:02 2006
+++ pspp/src/language/xforms/select-if.c Fri May 5 04:53:13 2006
@@ -23,7 +23,7 @@
#include <data/dictionary.h>
#include <data/transformations.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/expressions/public.h>
Index: pspp/src/math/levene.c
diff -u pspp/src/math/levene.c:1.2 pspp/src/math/levene.c:1.3
--- pspp/src/math/levene.c:1.2 Wed Mar 15 03:29:11 2006
+++ pspp/src/math/levene.c Fri May 5 04:53:13 2006
@@ -29,7 +29,7 @@
#include <libpspp/hash.h>
#include <libpspp/str.h>
#include <data/variable.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <libpspp/alloc.h>
#include <libpspp/misc.h>
#include "group.h"
Index: pspp/src/math/sort.c
diff -u pspp/src/math/sort.c:1.7 pspp/src/math/sort.c:1.8
--- pspp/src/math/sort.c:1.7 Thu May 4 06:19:02 2006
+++ pspp/src/math/sort.c Fri May 5 04:53:13 2006
@@ -30,6 +30,7 @@
#include <data/case-source.h>
#include <data/case.h>
#include <data/casefile.h>
+#include <data/procedure.h>
#include <data/settings.h>
#include <data/variable.h>
#include <data/storage-stream.h>
@@ -40,7 +41,6 @@
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
-#include <procedure.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: pspp/src/ui/terminal/ChangeLog
diff -u pspp/src/ui/terminal/ChangeLog:1.9 pspp/src/ui/terminal/ChangeLog:1.10
--- pspp/src/ui/terminal/ChangeLog:1.9 Thu May 4 06:19:02 2006
+++ pspp/src/ui/terminal/ChangeLog Fri May 5 04:53:13 2006
@@ -1,3 +1,14 @@
+Thu May 4 21:50:59 2006 Ben Pfaff <address@hidden>
+
+ Continue reforming procedure execution. In this phase, move
+ procedure.c and procedure.h from src to src/data. Update
+ makefiles and #includes accordingly.
+
+ * automake.mk: (src_ui_terminal_pspp_SOURCES) Remove
+ src/procedure.c and src/procedure.h.
+ (src_ui_terminal_pspp_LDADD) Move libexpressions.a later in list
+ to make the link work.
+
Wed May 3 23:09:37 2006 Ben Pfaff <address@hidden>
Continue reforming procedure execution. In this phase, get rid of
Index: pspp/src/ui/terminal/automake.mk
diff -u pspp/src/ui/terminal/automake.mk:1.7
pspp/src/ui/terminal/automake.mk:1.8
--- pspp/src/ui/terminal/automake.mk:1.7 Wed Apr 26 20:54:08 2006
+++ pspp/src/ui/terminal/automake.mk Fri May 5 04:53:13 2006
@@ -14,17 +14,15 @@
bin_PROGRAMS += src/ui/terminal/pspp
-src_ui_terminal_pspp_SOURCES = \
- src/procedure.c \
- src/procedure.h
+src_ui_terminal_pspp_SOURCES =
src_ui_terminal_pspp_LDADD = \
$(top_builddir)/src/ui/terminal/libui.a \
- $(top_builddir)/src/language/expressions/libexpressions.a \
$(top_builddir)/src/language/liblanguage.a \
$(top_builddir)/src/language/tests/libtests.a \
$(top_builddir)/src/language/utilities/libutilities.a \
$(top_builddir)/src/language/control/libcontrol.a \
+ $(top_builddir)/src/language/expressions/libexpressions.a \
$(top_builddir)/src/language/stats/libstats.a \
$(top_builddir)/src/language/xforms/libxforms.a \
$(top_builddir)/src/language/dictionary/libcmddict.a \
Index: pspp/src/ui/terminal/main.c
diff -u pspp/src/ui/terminal/main.c:1.11 pspp/src/ui/terminal/main.c:1.12
--- pspp/src/ui/terminal/main.c:1.11 Thu May 4 06:19:02 2006
+++ pspp/src/ui/terminal/main.c Fri May 5 04:53:13 2006
@@ -25,12 +25,12 @@
#include "command-line.h"
#include "msg-ui.h"
#include "progname.h"
-#include "procedure.h"
#include "read-line.h"
#include <data/dictionary.h>
#include <data/file-handle-def.h>
#include <data/file-name.h>
+#include <data/procedure.h>
#include <data/settings.h>
#include <data/variable.h>
#include <gsl/gsl_errno.h>
@@ -42,7 +42,6 @@
#include <libpspp/version.h>
#include <math/random.h>
#include <output/output.h>
-#include <procedure.h>
#if HAVE_FPU_CONTROL_H
#include <fpu_control.h>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp/src ChangeLog automake.mk data/ChangeLog d...,
Ben Pfaff <=