[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp/src language/stats/flip.c language/data-io... [simpler-p
|
From: |
Ben Pfaff |
|
Subject: |
[Pspp-cvs] pspp/src language/stats/flip.c language/data-io... [simpler-proc] |
|
Date: |
Mon, 07 May 2007 05:16:08 +0000 |
CVSROOT: /cvsroot/pspp
Module name: pspp
Branch: simpler-proc
Changes by: Ben Pfaff <blp> 07/05/07 05:16:08
Modified files:
src/language/stats: flip.c
src/language/data-io: inpt-pgm.c data-list.c
src/data : sys-file-reader.c procedure.c por-file-reader.c
casewriter.c casereader.c
casereader-translator.c casereader-filter.c
buffered-reader.c automake.mk
Added files:
src/data : casereader-provider.h
Removed files:
src/data : casereader-private.h
Log message:
Rename casereader-private.h as more accurate name
casereader-provider.h.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/flip.c?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.22.2.2&r2=1.22.2.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/inpt-pgm.c?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.23.2.2&r2=1.23.2.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/data-list.c?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.30.2.2&r2=1.30.2.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/sys-file-reader.c?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.32.2.3&r2=1.32.2.4
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/procedure.c?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.25.2.4&r2=1.25.2.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/por-file-reader.c?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.17.2.2&r2=1.17.2.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/casewriter.c?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.1.2.5&r2=1.1.2.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/casereader.c?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.1.2.7&r2=1.1.2.8
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/casereader-translator.c?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/casereader-filter.c?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/buffered-reader.c?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/automake.mk?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.15.2.4&r2=1.15.2.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/casereader-provider.h?cvsroot=pspp&only_with_tag=simpler-proc&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/casereader-private.h?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.1.2.3&r2=0
Patches:
Index: language/stats/flip.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/flip.c,v
retrieving revision 1.22.2.2
retrieving revision 1.22.2.3
diff -u -b -r1.22.2.2 -r1.22.2.3
--- language/stats/flip.c 4 May 2007 03:48:48 -0000 1.22.2.2
+++ language/stats/flip.c 7 May 2007 05:16:07 -0000 1.22.2.3
@@ -29,7 +29,7 @@
#include <data/case.h>
#include <data/casereader.h>
-#include <data/casereader-private.h>
+#include <data/casereader-provider.h>
#include <data/dictionary.h>
#include <data/procedure.h>
#include <data/settings.h>
Index: language/data-io/inpt-pgm.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/inpt-pgm.c,v
retrieving revision 1.23.2.2
retrieving revision 1.23.2.3
diff -u -b -r1.23.2.2 -r1.23.2.3
--- language/data-io/inpt-pgm.c 4 May 2007 03:48:47 -0000 1.23.2.2
+++ language/data-io/inpt-pgm.c 7 May 2007 05:16:08 -0000 1.23.2.3
@@ -25,7 +25,7 @@
#include <data/case.h>
#include <data/caseinit.h>
-#include <data/casereader-private.h>
+#include <data/casereader-provider.h>
#include <data/dictionary.h>
#include <data/procedure.h>
#include <data/transformations.h>
Index: language/data-io/data-list.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/data-list.c,v
retrieving revision 1.30.2.2
retrieving revision 1.30.2.3
diff -u -b -r1.30.2.2 -r1.30.2.3
--- language/data-io/data-list.c 4 May 2007 03:48:47 -0000 1.30.2.2
+++ language/data-io/data-list.c 7 May 2007 05:16:08 -0000 1.30.2.3
@@ -26,7 +26,7 @@
#include <data/case.h>
#include <data/data-in.h>
#include <data/casereader.h>
-#include <data/casereader-private.h>
+#include <data/casereader-provider.h>
#include <data/dictionary.h>
#include <data/format.h>
#include <data/procedure.h>
Index: data/sys-file-reader.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/sys-file-reader.c,v
retrieving revision 1.32.2.3
retrieving revision 1.32.2.4
diff -u -b -r1.32.2.3 -r1.32.2.4
--- data/sys-file-reader.c 7 May 2007 04:38:39 -0000 1.32.2.3
+++ data/sys-file-reader.c 7 May 2007 05:16:08 -0000 1.32.2.4
@@ -39,7 +39,7 @@
#include <libpspp/array.h>
#include <data/case.h>
-#include <data/casereader-private.h>
+#include <data/casereader-provider.h>
#include <data/casereader.h>
#include <data/dictionary.h>
#include <data/file-handle-def.h>
Index: data/procedure.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/procedure.c,v
retrieving revision 1.25.2.4
retrieving revision 1.25.2.5
diff -u -b -r1.25.2.4 -r1.25.2.5
--- data/procedure.c 4 May 2007 03:51:09 -0000 1.25.2.4
+++ data/procedure.c 7 May 2007 05:16:08 -0000 1.25.2.5
@@ -26,7 +26,7 @@
#include <data/case.h>
#include <data/caseinit.h>
#include <data/casereader.h>
-#include <data/casereader-private.h>
+#include <data/casereader-provider.h>
#include <data/casewriter.h>
#include <data/dictionary.h>
#include <data/file-handle-def.h>
Index: data/por-file-reader.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/por-file-reader.c,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -u -b -r1.17.2.2 -r1.17.2.3
--- data/por-file-reader.c 4 May 2007 03:48:47 -0000 1.17.2.2
+++ data/por-file-reader.c 7 May 2007 05:16:08 -0000 1.17.2.3
@@ -30,7 +30,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <data/casereader-private.h>
+#include <data/casereader-provider.h>
#include <data/casereader.h>
#include <data/dictionary.h>
#include <data/file-handle-def.h>
Index: data/casewriter.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/Attic/casewriter.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -b -r1.1.2.5 -r1.1.2.6
--- data/casewriter.c 7 May 2007 04:38:39 -0000 1.1.2.5
+++ data/casewriter.c 7 May 2007 05:16:08 -0000 1.1.2.6
@@ -26,7 +26,7 @@
#include <data/buffered-reader.h>
#include <data/casereader.h>
-#include <data/casereader-private.h>
+#include <data/casereader-provider.h>
#include <data/casewindow.h>
#include <data/settings.h>
#include <libpspp/compiler.h>
Index: data/casereader.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/Attic/casereader.c,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -b -r1.1.2.7 -r1.1.2.8
--- data/casereader.c 7 May 2007 04:38:39 -0000 1.1.2.7
+++ data/casereader.c 7 May 2007 05:16:08 -0000 1.1.2.8
@@ -19,7 +19,7 @@
#include <config.h>
#include <data/casereader.h>
-#include <data/casereader-private.h>
+#include <data/casereader-provider.h>
#include <stdlib.h>
Index: data/casereader-translator.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/Attic/casereader-translator.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- data/casereader-translator.c 6 May 2007 22:48:27 -0000 1.1.2.1
+++ data/casereader-translator.c 7 May 2007 05:16:08 -0000 1.1.2.2
@@ -22,7 +22,7 @@
#include <stdlib.h>
-#include <data/casereader-private.h>
+#include <data/casereader-provider.h>
#include <libpspp/taint.h>
#include "xalloc.h"
Index: data/casereader-filter.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/Attic/casereader-filter.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- data/casereader-filter.c 6 May 2007 22:48:27 -0000 1.1.2.1
+++ data/casereader-filter.c 7 May 2007 05:16:08 -0000 1.1.2.2
@@ -22,7 +22,7 @@
#include <stdlib.h>
-#include <data/casereader-private.h>
+#include <data/casereader-provider.h>
#include <data/casewriter.h>
#include <data/variable.h>
#include <data/dictionary.h>
Index: data/buffered-reader.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/Attic/buffered-reader.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- data/buffered-reader.c 4 May 2007 03:48:47 -0000 1.1.2.2
+++ data/buffered-reader.c 7 May 2007 05:16:08 -0000 1.1.2.3
@@ -22,7 +22,7 @@
#include <stdlib.h>
-#include <data/casereader-private.h>
+#include <data/casereader-provider.h>
#include <libpspp/compiler.h>
#include <libpspp/heap.h>
Index: data/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/automake.mk,v
retrieving revision 1.15.2.4
retrieving revision 1.15.2.5
diff -u -b -r1.15.2.4 -r1.15.2.5
--- data/automake.mk 7 May 2007 04:38:39 -0000 1.15.2.4
+++ data/automake.mk 7 May 2007 05:16:08 -0000 1.15.2.5
@@ -21,7 +21,7 @@
src/data/casereader-filter.c \
src/data/casereader-translator.c \
src/data/casereader.h \
- src/data/casereader-private.h \
+ src/data/casereader-provider.h \
src/data/case-tmpfile.c \
src/data/case-tmpfile.h \
src/data/casewindow.c \
Index: data/casereader-provider.h
===================================================================
RCS file: data/casereader-provider.h
diff -N data/casereader-provider.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ data/casereader-provider.h 7 May 2007 05:16:08 -0000 1.1.2.1
@@ -0,0 +1,93 @@
+/* PSPP - computes sample statistics.
+ Copyright (C) 2007 Free Software Foundation, Inc.
+
+ This 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 2 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, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA. */
+
+#ifndef DATA_CASEREADER_PROVIDER_H
+#define DATA_CASEREADER_PROVIDER_H 1
+
+#include <data/casereader.h>
+
+/* Casereader class. */
+struct casereader_class
+ {
+ /* Mandatory.
+
+ Reads the next case from READER into case C, which the
+ casereader must create and which the client is responsible
+ for destroying. If successful, returns true and advances
+ READER to the next case, so that the next call to this
+ function will read the next case. The case just read will
+ never be read again by a call to this function for READER.
+
+ At end of file or upon an I/O error, returns false. After
+ false is returned once, this function will not be called
+ again for the given READER.
+
+ If an I/O error occurs, this function should call
+ casereader_force_error on READER. */
+ bool (*read) (struct casereader *reader, void *aux, struct ccase *c);
+
+ /* Mandatory.
+
+ Destroys READER.
+
+ If an I/O error is detected during destruction, this
+ function should call casereader_force_error on READER. */
+ void (*destroy) (struct casereader *reader, void *aux);
+
+ /* Optional: if convenient and efficiently implementable,
+ supply this function as an optimization for use by
+ casereader_clone.
+
+ Creates and returns a clone of READER. The clone must
+ read the same case data in the same sequence as READER,
+ starting from the same position. The only allowable
+ exception to this rule is that I/O errors may force the
+ clone or the original casereader to stop reading after
+ differing numbers of cases.
+
+ The clone should have a clone of READER's taint object,
+ accomplished by passing casereader_get_taint (READER) to
+ casereader_create. */
+ struct casereader *(*clone) (struct casereader *reader, void *aux);
+
+ /* Optional: if convenient and efficiently implementable,
+ supply as an optimization for use by casereader_peek.
+
+ Reads the case at 0-based offset IDX from the beginning of
+ READER into case C, which the casereader must create and
+ which the client is responsible for destroying.
+
+ At end of file or upon an I/O error, returns false. If
+ this function returns false, then it will never be called
+ again for an equal or greater value of IDX, and the "read"
+ member function will never be called to advance as far as
+ IDX cases further into the casereader. That is, returning
+ false indicates that the casereader has fewer than IDX
+ cases left.
+
+ If an I/O error occurs, this function should call
+ casereader_force_error on READER. */
+ bool (*peek) (struct casereader *reader, void *aux, casenumber idx,
+ struct ccase *c);
+ };
+
+struct casereader *casereader_create (const struct taint *,
+ size_t value_cnt, casenumber case_cnt,
+ const struct casereader_class *, void *);
+
+#endif /* data/casereader-provider.h */
Index: data/casereader-private.h
===================================================================
RCS file: data/casereader-private.h
diff -N data/casereader-private.h
--- data/casereader-private.h 7 May 2007 04:38:39 -0000 1.1.2.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,96 +0,0 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 2007 Free Software Foundation, Inc.
-
- This 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 2 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, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
-
-#ifndef DATA_CASEREADER_PRIVATE_H
-#define DATA_CASEREADER_PRIVATE_H 1
-
-#include <data/casereader.h>
-
-/* This header file should really be renamed: it's not really
- private. */
-
-/* Casereader class. */
-struct casereader_class
- {
- /* Mandatory.
-
- Reads the next case from READER into case C, which the
- casereader must create and which the client is responsible
- for destroying. If successful, returns true and advances
- READER to the next case, so that the next call to this
- function will read the next case. The case just read will
- never be read again by a call to this function for READER.
-
- At end of file or upon an I/O error, returns false. After
- false is returned once, this function will not be called
- again for the given READER.
-
- If an I/O error occurs, this function should call
- casereader_force_error on READER. */
- bool (*read) (struct casereader *reader, void *aux, struct ccase *c);
-
- /* Mandatory.
-
- Destroys READER.
-
- If an I/O error is detected during destruction, this
- function should call casereader_force_error on READER. */
- void (*destroy) (struct casereader *reader, void *aux);
-
- /* Optional: if convenient and efficiently implementable,
- supply this function as an optimization for use by
- casereader_clone.
-
- Creates and returns a clone of READER. The clone must
- read the same case data in the same sequence as READER,
- starting from the same position. The only allowable
- exception to this rule is that I/O errors may force the
- clone or the original casereader to stop reading after
- differing numbers of cases.
-
- The clone should have a clone of READER's taint object,
- accomplished by passing casereader_get_taint (READER) to
- casereader_create. */
- struct casereader *(*clone) (struct casereader *reader, void *aux);
-
- /* Optional: if convenient and efficiently implementable,
- supply as an optimization for use by casereader_peek.
-
- Reads the case at 0-based offset IDX from the beginning of
- READER into case C, which the casereader must create and
- which the client is responsible for destroying.
-
- At end of file or upon an I/O error, returns false. If
- this function returns false, then it will never be called
- again for an equal or greater value of IDX, and the "read"
- member function will never be called to advance as far as
- IDX cases further into the casereader. That is, returning
- false indicates that the casereader has fewer than IDX
- cases left.
-
- If an I/O error occurs, this function should call
- casereader_force_error on READER. */
- bool (*peek) (struct casereader *reader, void *aux, casenumber idx,
- struct ccase *c);
- };
-
-struct casereader *casereader_create (const struct taint *,
- size_t value_cnt, casenumber case_cnt,
- const struct casereader_class *, void *);
-
-#endif /* data/casereader-private.h */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp/src language/stats/flip.c language/data-io... [simpler-proc],
Ben Pfaff <=