[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp/src dataChangeLog datavariable.h language/...
|
From: |
Ben Pfaff |
|
Subject: |
[Pspp-cvs] pspp/src dataChangeLog datavariable.h language/... |
|
Date: |
Tue, 27 Jun 2006 19:09:22 +0000 |
CVSROOT: /cvsroot/pspp
Module name: pspp
Changes by: Ben Pfaff <blp> 06/06/27 19:09:22
Modified files:
src/data : ChangeLog variable.h
src/language/control: repeat.c
src/language/data-io: data-list.c get.c matrix-data.c print.c
src/language/dictionary: 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: parse.c
src/language/lexer: ChangeLog q2c.c variable-parser.c
src/language/stats: aggregate.c autorecode.c correlations.q
crosstabs.q descriptives.c flip.c
sort-criteria.c
src/language/xforms: count.c recode.c select-if.c
Added files:
src/language/lexer: variable-parser.h
Log message:
Move var_set and variable parsing declarations into new header.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/ChangeLog?cvsroot=pspp&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/variable.h?cvsroot=pspp&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/control/repeat.c?cvsroot=pspp&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/data-list.c?cvsroot=pspp&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/get.c?cvsroot=pspp&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/matrix-data.c?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/print.c?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/formats.c?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/missing-values.c?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/modify-variables.c?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/numeric.c?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/rename-variables.c?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/split-file.c?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/sys-file-info.c?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/value-labels.c?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/variable-display.c?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/variable-label.c?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/vector.c?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/weight.c?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/expressions/parse.c?cvsroot=pspp&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/lexer/ChangeLog?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/lexer/q2c.c?cvsroot=pspp&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/lexer/variable-parser.c?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/lexer/variable-parser.h?cvsroot=pspp&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/aggregate.c?cvsroot=pspp&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/autorecode.c?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/correlations.q?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/crosstabs.q?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/descriptives.c?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/flip.c?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/sort-criteria.c?cvsroot=pspp&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/xforms/count.c?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/xforms/recode.c?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/xforms/select-if.c?cvsroot=pspp&r1=1.7&r2=1.8
Patches:
Index: data/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- data/ChangeLog 26 Jun 2006 05:40:29 -0000 1.55
+++ data/ChangeLog 27 Jun 2006 19:09:21 -0000 1.56
@@ -1,3 +1,9 @@
+Tue Jun 27 12:06:49 2006 Ben Pfaff <address@hidden>
+
+ * variable.h: Move var_set and variable parsing declarations to
+ new header, src/language/lexer/variable-parser.h. Modified lots
+ of files to include the new header.
+
Sun Jun 25 22:39:32 2006 Ben Pfaff <address@hidden>
* value-labels.c (value_to_string): When there's no value label,
Index: data/variable.h
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/variable.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- data/variable.h 7 May 2006 02:41:01 -0000 1.11
+++ data/variable.h 27 Jun 2006 19:09:21 -0000 1.12
@@ -126,48 +126,6 @@
int cnt; /* Number of variables. */
};
-struct var_set;
-
-struct dictionary;
-struct var_set *var_set_create_from_dict (const struct dictionary *d);
-struct var_set *var_set_create_from_array (struct variable *const *var,
- size_t);
-
-size_t var_set_get_cnt (const struct var_set *vs);
-struct variable *var_set_get_var (const struct var_set *vs, size_t idx);
-struct variable *var_set_lookup_var (const struct var_set *vs,
- const char *name);
-bool var_set_lookup_var_idx (const struct var_set *vs, const char *name,
- size_t *idx);
-void var_set_destroy (struct var_set *vs);
-
-/* Variable parsers. */
-
-enum
- {
- PV_NONE = 0, /* No options. */
- PV_SINGLE = 0001, /* Restrict to a single name or TO use. */
- PV_DUPLICATE = 0002, /* Don't merge duplicates. */
- PV_APPEND = 0004, /* Append to existing list. */
- PV_NO_DUPLICATE = 0010, /* Error on duplicates. */
- PV_NUMERIC = 0020, /* Vars must be numeric. */
- PV_STRING = 0040, /* Vars must be string. */
- PV_SAME_TYPE = 00100, /* All vars must be the same type. */
- PV_NO_SCRATCH = 00200 /* Disallow scratch variables. */
- };
-
-struct pool;
-struct variable *parse_variable (void);
-struct variable *parse_dict_variable (const struct dictionary *);
-int parse_variables (const struct dictionary *, struct variable ***, size_t *,
- int opts);
-int parse_var_set_vars (const struct var_set *, struct variable ***, size_t *,
- int opts);
-int parse_DATA_LIST_vars (char ***names, size_t *cnt, int opts);
-int parse_mixed_vars (char ***names, size_t *cnt, int opts);
-int parse_mixed_vars_pool (struct pool *,
- char ***names, size_t *cnt, int opts);
-
/* Return a string representing this variable, in the form most
appropriate from a human factors perspective.
Index: language/control/repeat.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/control/repeat.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- language/control/repeat.c 9 Jun 2006 22:51:23 -0000 1.10
+++ language/control/repeat.c 27 Jun 2006 19:09:21 -0000 1.11
@@ -30,6 +30,7 @@
#include <data/settings.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <language/line-buffer.h>
#include <libpspp/alloc.h>
#include <libpspp/message.h>
Index: language/data-io/data-list.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/data-list.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- language/data-io/data-list.c 9 Jun 2006 22:51:24 -0000 1.16
+++ language/data-io/data-list.c 27 Jun 2006 19:09:21 -0000 1.17
@@ -39,6 +39,7 @@
#include <language/data-io/file-handle.h>
#include <language/data-io/inpt-pgm.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
Index: language/data-io/get.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/get.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- language/data-io/get.c 10 May 2006 03:56:04 -0000 1.12
+++ language/data-io/get.c 27 Jun 2006 19:09:21 -0000 1.13
@@ -39,6 +39,7 @@
#include <language/command.h>
#include <language/data-io/file-handle.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
Index: language/data-io/matrix-data.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/matrix-data.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- language/data-io/matrix-data.c 9 Jun 2006 22:51:24 -0000 1.8
+++ language/data-io/matrix-data.c 27 Jun 2006 19:09:21 -0000 1.9
@@ -33,6 +33,7 @@
#include <language/data-io/data-reader.h>
#include <language/data-io/file-handle.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/array.h>
#include <libpspp/compiler.h>
Index: language/data-io/print.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/print.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- language/data-io/print.c 9 Jun 2006 22:51:24 -0000 1.9
+++ language/data-io/print.c 27 Jun 2006 19:09:21 -0000 1.10
@@ -32,6 +32,7 @@
#include <language/data-io/file-handle.h>
#include <language/expressions/public.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
Index: language/dictionary/formats.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/formats.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- language/dictionary/formats.c 5 May 2006 04:53:13 -0000 1.6
+++ language/dictionary/formats.c 27 Jun 2006 19:09:22 -0000 1.7
@@ -27,6 +27,7 @@
#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/misc.h>
#include <libpspp/str.h>
Index: language/dictionary/missing-values.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/missing-values.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- language/dictionary/missing-values.c 5 May 2006 04:53:13 -0000
1.6
+++ language/dictionary/missing-values.c 27 Jun 2006 19:09:22 -0000
1.7
@@ -26,6 +26,7 @@
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <language/lexer/range-parser.h>
#include <libpspp/magic.h>
#include <libpspp/message.h>
Index: language/dictionary/modify-variables.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/modify-variables.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- language/dictionary/modify-variables.c 5 May 2006 04:53:13 -0000
1.5
+++ language/dictionary/modify-variables.c 27 Jun 2006 19:09:22 -0000
1.6
@@ -18,21 +18,24 @@
02110-1301, USA. */
#include <config.h>
+
#include <stdlib.h>
-#include <libpspp/message.h>
-#include <libpspp/array.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/alloc.h>
+#include <libpspp/array.h>
#include <libpspp/bit-vector.h>
-#include <language/command.h>
#include <libpspp/compiler.h>
-#include <data/dictionary.h>
-#include <libpspp/message.h>
#include <libpspp/hash.h>
-#include <language/lexer/lexer.h>
+#include <libpspp/message.h>
+#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
-#include <data/procedure.h>
-#include <data/variable.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/dictionary/numeric.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/numeric.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- language/dictionary/numeric.c 5 May 2006 04:53:13 -0000 1.8
+++ language/dictionary/numeric.c 27 Jun 2006 19:09:22 -0000 1.9
@@ -26,6 +26,7 @@
#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/message.h>
#include <libpspp/str.h>
Index: language/dictionary/rename-variables.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/rename-variables.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- language/dictionary/rename-variables.c 5 May 2006 04:53:13 -0000
1.4
+++ language/dictionary/rename-variables.c 27 Jun 2006 19:09:22 -0000
1.5
@@ -26,6 +26,7 @@
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/hash.h>
#include <libpspp/message.h>
Index: language/dictionary/split-file.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/split-file.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- language/dictionary/split-file.c 6 May 2006 17:46:52 -0000 1.5
+++ language/dictionary/split-file.c 27 Jun 2006 19:09:22 -0000 1.6
@@ -30,6 +30,7 @@
#include <language/command.h>
#include <language/dictionary/split-file.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
Index: language/dictionary/sys-file-info.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/sys-file-info.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- language/dictionary/sys-file-info.c 15 May 2006 05:08:25 -0000 1.8
+++ language/dictionary/sys-file-info.c 27 Jun 2006 19:09:22 -0000 1.9
@@ -31,6 +31,7 @@
#include <language/command.h>
#include <language/data-io/file-handle.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/array.h>
#include <libpspp/hash.h>
Index: language/dictionary/value-labels.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/value-labels.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- language/dictionary/value-labels.c 9 Jun 2006 22:51:24 -0000 1.6
+++ language/dictionary/value-labels.c 27 Jun 2006 19:09:22 -0000 1.7
@@ -27,6 +27,7 @@
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/hash.h>
#include <libpspp/message.h>
Index: language/dictionary/variable-display.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/variable-display.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- language/dictionary/variable-display.c 5 May 2006 04:53:13 -0000
1.6
+++ language/dictionary/variable-display.c 27 Jun 2006 19:09:22 -0000
1.7
@@ -26,6 +26,7 @@
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
Index: language/dictionary/variable-label.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/variable-label.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- language/dictionary/variable-label.c 9 Jun 2006 22:51:24 -0000
1.7
+++ language/dictionary/variable-label.c 27 Jun 2006 19:09:22 -0000
1.8
@@ -26,6 +26,7 @@
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
Index: language/dictionary/vector.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/vector.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- language/dictionary/vector.c 5 May 2006 04:53:13 -0000 1.5
+++ language/dictionary/vector.c 27 Jun 2006 19:09:22 -0000 1.6
@@ -26,6 +26,7 @@
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
Index: language/dictionary/weight.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/weight.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- language/dictionary/weight.c 5 May 2006 04:53:13 -0000 1.4
+++ language/dictionary/weight.c 27 Jun 2006 19:09:22 -0000 1.5
@@ -26,6 +26,7 @@
#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>
Index: language/expressions/parse.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/expressions/parse.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- language/expressions/parse.c 9 Jun 2006 22:51:24 -0000 1.10
+++ language/expressions/parse.c 27 Jun 2006 19:09:22 -0000 1.11
@@ -30,6 +30,7 @@
#include <libpspp/message.h>
#include "helpers.h"
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/misc.h>
#include <libpspp/pool.h>
#include <data/settings.h>
Index: language/lexer/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/lexer/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- language/lexer/ChangeLog 26 Jun 2006 05:42:05 -0000 1.7
+++ language/lexer/ChangeLog 27 Jun 2006 19:09:22 -0000 1.8
@@ -1,3 +1,10 @@
+Tue Jun 27 12:07:34 2006 Ben Pfaff <address@hidden>
+
+ * variable-parser.h: New header. Moved the var_set and variable
+ parsing declarations here.
+
+ * q2c.c (main): Emit include for new variable-parser.h header.
+
Sun Jun 25 22:41:00 2006 Ben Pfaff <address@hidden>
* q2c.c (dump_free): For SBC_DBL_LIST, enclose the output code in
Index: language/lexer/q2c.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/lexer/q2c.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- language/lexer/q2c.c 26 Jun 2006 05:42:05 -0000 1.10
+++ language/lexer/q2c.c 27 Jun 2006 19:09:22 -0000 1.11
@@ -2032,6 +2032,7 @@
dump (0, "#include <libpspp/alloc.h>");
dump (0, "#include <libpspp/message.h>");
dump (0, "#include <language/lexer/lexer.h>");
+ dump (0, "#include <language/lexer/variable-parser.h>");
dump (0, "#include <data/settings.h>");
dump (0, "#include <libpspp/str.h>");
dump (0, "#include <language/lexer/subcommand-list.h>");
Index: language/lexer/variable-parser.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/lexer/variable-parser.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- language/lexer/variable-parser.c 5 May 2006 04:53:13 -0000 1.4
+++ language/lexer/variable-parser.c 27 Jun 2006 19:09:22 -0000 1.5
@@ -19,6 +19,8 @@
#include <config.h>
+#include <language/lexer/variable-parser.h>
+
#include <ctype.h>
#include <stdbool.h>
#include <stdlib.h>
Index: language/stats/aggregate.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/aggregate.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- language/stats/aggregate.c 9 Jun 2006 22:51:24 -0000 1.11
+++ language/stats/aggregate.c 27 Jun 2006 19:09:22 -0000 1.12
@@ -35,6 +35,7 @@
#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/alloc.h>
#include <libpspp/message.h>
Index: language/stats/autorecode.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/autorecode.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- language/stats/autorecode.c 6 May 2006 23:04:05 -0000 1.8
+++ language/stats/autorecode.c 27 Jun 2006 19:09:22 -0000 1.9
@@ -27,6 +27,7 @@
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
Index: language/stats/correlations.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/correlations.q,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- language/stats/correlations.q 5 May 2006 04:53:13 -0000 1.7
+++ language/stats/correlations.q 27 Jun 2006 19:09:22 -0000 1.8
@@ -28,6 +28,7 @@
#include <language/command.h>
#include <language/data-io/file-handle.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
Index: language/stats/crosstabs.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/crosstabs.q,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- language/stats/crosstabs.q 9 Jun 2006 22:51:24 -0000 1.9
+++ language/stats/crosstabs.q 27 Jun 2006 19:09:22 -0000 1.10
@@ -44,6 +44,7 @@
#include <language/command.h>
#include <language/dictionary/split-file.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/array.h>
#include <libpspp/compiler.h>
Index: language/stats/descriptives.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/descriptives.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- language/stats/descriptives.c 6 May 2006 17:46:52 -0000 1.8
+++ language/stats/descriptives.c 27 Jun 2006 19:09:22 -0000 1.9
@@ -34,6 +34,7 @@
#include <language/command.h>
#include <language/dictionary/split-file.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/array.h>
#include <libpspp/compiler.h>
Index: language/stats/flip.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/flip.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- language/stats/flip.c 8 May 2006 00:09:40 -0000 1.9
+++ language/stats/flip.c 27 Jun 2006 19:09:22 -0000 1.10
@@ -38,6 +38,7 @@
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/array.h>
#include <libpspp/message.h>
Index: language/stats/sort-criteria.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/sort-criteria.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- language/stats/sort-criteria.c 15 Mar 2006 03:29:11 -0000 1.2
+++ language/stats/sort-criteria.c 27 Jun 2006 19:09:22 -0000 1.3
@@ -26,6 +26,7 @@
#include <language/command.h>
#include <libpspp/message.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <data/settings.h>
#include <data/variable.h>
#include "sort-criteria.h"
Index: language/xforms/count.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/xforms/count.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- language/xforms/count.c 9 Jun 2006 22:51:24 -0000 1.6
+++ language/xforms/count.c 27 Jun 2006 19:09:22 -0000 1.7
@@ -29,6 +29,7 @@
#include <language/command.h>
#include <language/lexer/lexer.h>
#include <language/lexer/range-parser.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
Index: language/xforms/recode.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/xforms/recode.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- language/xforms/recode.c 6 May 2006 23:04:05 -0000 1.7
+++ language/xforms/recode.c 27 Jun 2006 19:09:22 -0000 1.8
@@ -31,6 +31,7 @@
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <language/lexer/range-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
Index: language/xforms/select-if.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/xforms/select-if.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- language/xforms/select-if.c 6 May 2006 21:13:08 -0000 1.7
+++ language/xforms/select-if.c 27 Jun 2006 19:09:22 -0000 1.8
@@ -28,6 +28,7 @@
#include <language/command.h>
#include <language/expressions/public.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
Index: language/lexer/variable-parser.h
===================================================================
RCS file: language/lexer/variable-parser.h
diff -N language/lexer/variable-parser.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ language/lexer/variable-parser.h 27 Jun 2006 19:09:22 -0000 1.1
@@ -0,0 +1,69 @@
+/* PSPP - computes sample statistics.
+ Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+ Written by Ben Pfaff <address@hidden>.
+
+ This 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 VARIABLE_PARSER_H
+#define VARIABLE_PARSER_H 1
+
+#include <stdbool.h>
+#include <stddef.h>
+
+struct pool;
+struct dictionary;
+struct var_set;
+struct variable;
+
+struct var_set *var_set_create_from_dict (const struct dictionary *d);
+struct var_set *var_set_create_from_array (struct variable *const *var,
+ size_t);
+
+size_t var_set_get_cnt (const struct var_set *vs);
+struct variable *var_set_get_var (const struct var_set *vs, size_t idx);
+struct variable *var_set_lookup_var (const struct var_set *vs,
+ const char *name);
+bool var_set_lookup_var_idx (const struct var_set *vs, const char *name,
+ size_t *idx);
+void var_set_destroy (struct var_set *vs);
+
+/* Variable parsers. */
+
+enum
+ {
+ PV_NONE = 0, /* No options. */
+ PV_SINGLE = 0001, /* Restrict to a single name or TO use. */
+ PV_DUPLICATE = 0002, /* Don't merge duplicates. */
+ PV_APPEND = 0004, /* Append to existing list. */
+ PV_NO_DUPLICATE = 0010, /* Error on duplicates. */
+ PV_NUMERIC = 0020, /* Vars must be numeric. */
+ PV_STRING = 0040, /* Vars must be string. */
+ PV_SAME_TYPE = 00100, /* All vars must be the same type. */
+ PV_NO_SCRATCH = 00200 /* Disallow scratch variables. */
+ };
+
+struct variable *parse_variable (void);
+struct variable *parse_dict_variable (const struct dictionary *);
+int parse_variables (const struct dictionary *, struct variable ***, size_t *,
+ int opts);
+int parse_var_set_vars (const struct var_set *, struct variable ***, size_t *,
+ int opts);
+int parse_DATA_LIST_vars (char ***names, size_t *cnt, int opts);
+int parse_mixed_vars (char ***names, size_t *cnt, int opts);
+int parse_mixed_vars_pool (struct pool *,
+ char ***names, size_t *cnt, int opts);
+
+#endif /* variable-parser.h */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp/src dataChangeLog datavariable.h language/...,
Ben Pfaff <=