[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp po/de.po src/data/case-ordering.c src/data...
|
From: |
John Darrington |
|
Subject: |
[Pspp-cvs] pspp po/de.po src/data/case-ordering.c src/data... |
|
Date: |
Fri, 08 Jun 2007 01:30:29 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 07/06/08 01:30:29
Modified files:
po : de.po
src/data : case-ordering.c case-ordering.h casegrouper.c
casegrouper.h casereader-filter.c casereader.h
src/language/data-io: get.c
src/language/stats: npar-summary.c npar.h npar.q rank.q
regression.q sort-criteria.c
Log message:
Fixed constness issues.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/po/de.po?cvsroot=pspp&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/case-ordering.c?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/case-ordering.h?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/casegrouper.c?cvsroot=pspp&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/casegrouper.h?cvsroot=pspp&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/casereader-filter.c?cvsroot=pspp&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/casereader.h?cvsroot=pspp&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/get.c?cvsroot=pspp&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/npar-summary.c?cvsroot=pspp&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/npar.h?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/npar.q?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/rank.q?cvsroot=pspp&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/regression.q?cvsroot=pspp&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/sort-criteria.c?cvsroot=pspp&r1=1.9&r2=1.10
Patches:
Index: po/de.po
===================================================================
RCS file: /sources/pspp/pspp/po/de.po,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- po/de.po 3 May 2007 10:15:26 -0000 1.50
+++ po/de.po 8 Jun 2007 01:30:27 -0000 1.51
@@ -3262,6 +3262,10 @@
msgid "Dependent variable must be numeric."
msgstr ""
+#: src/language/stats/regression.q:1320
+msgid "No valid data found. This command was skipped."
+msgstr ""
+
#: src/language/stats/sort-cases.c:63
msgid "Buffer limit must be at least 2."
msgstr ""
Index: src/data/case-ordering.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/case-ordering.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/data/case-ordering.c 7 Jun 2007 05:38:56 -0000 1.1
+++ src/data/case-ordering.c 8 Jun 2007 01:30:27 -0000 1.2
@@ -32,7 +32,7 @@
/* One key used for sorting. */
struct sort_key
{
- struct variable *var; /* Variable. */
+ const struct variable *var; /* Variable. */
enum sort_direction dir; /* Sort direction. */
};
@@ -118,7 +118,7 @@
bool
case_ordering_add_var (struct case_ordering *co,
- struct variable *var, enum sort_direction dir)
+ const struct variable *var, enum sort_direction dir)
{
struct sort_key *key;
size_t i;
@@ -140,7 +140,7 @@
return co->key_cnt;
}
-struct variable *
+const struct variable *
case_ordering_get_var (const struct case_ordering *co, size_t idx)
{
assert (idx < co->key_cnt);
@@ -156,7 +156,7 @@
void
case_ordering_get_vars (const struct case_ordering *co,
- struct variable ***vars, size_t *var_cnt)
+ const struct variable ***vars, size_t *var_cnt)
{
size_t i;
Index: src/data/case-ordering.h
===================================================================
RCS file: /sources/pspp/pspp/src/data/case-ordering.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/data/case-ordering.h 7 Jun 2007 05:38:56 -0000 1.1
+++ src/data/case-ordering.h 8 Jun 2007 01:30:27 -0000 1.2
@@ -40,12 +40,12 @@
const struct case_ordering *);
bool case_ordering_add_var (struct case_ordering *,
- struct variable *, enum sort_direction);
+ const struct variable *, enum sort_direction);
size_t case_ordering_get_var_cnt (const struct case_ordering *);
-struct variable *case_ordering_get_var (const struct case_ordering *, size_t);
+const struct variable *case_ordering_get_var (const struct case_ordering *,
size_t);
enum sort_direction case_ordering_get_direction (const struct case_ordering *,
size_t);
void case_ordering_get_vars (const struct case_ordering *,
- struct variable ***, size_t *);
+ const struct variable ***, size_t *);
#endif /* data/case-ordering.h */
Index: src/data/casegrouper.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/casegrouper.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/data/casegrouper.c 7 Jun 2007 05:42:01 -0000 1.2
+++ src/data/casegrouper.c 8 Jun 2007 01:30:27 -0000 1.3
@@ -129,7 +129,7 @@
struct casegrouper_vars
{
- struct variable **vars;
+ const struct variable **vars;
size_t var_cnt;
};
@@ -151,7 +151,7 @@
struct casegrouper *
casegrouper_create_vars (struct casereader *reader,
- struct variable *const *vars,
+ const struct variable *const *vars,
size_t var_cnt)
{
if (var_cnt > 0)
@@ -181,7 +181,7 @@
casegrouper_create_case_ordering (struct casereader *reader,
const struct case_ordering *co)
{
- struct variable **vars;
+ const struct variable **vars;
size_t var_cnt;
struct casegrouper *grouper;
Index: src/data/casegrouper.h
===================================================================
RCS file: /sources/pspp/pspp/src/data/casegrouper.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/data/casegrouper.h 7 Jun 2007 05:42:00 -0000 1.2
+++ src/data/casegrouper.h 8 Jun 2007 01:30:27 -0000 1.3
@@ -36,7 +36,7 @@
void (*destroy) (void *aux),
void *aux);
struct casegrouper *casegrouper_create_vars (struct casereader *,
- struct variable *const *vars,
+ const struct variable *const
*vars,
size_t var_cnt);
struct casegrouper *casegrouper_create_splits (struct casereader *,
const struct dictionary *);
Index: src/data/casereader-filter.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/casereader-filter.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/data/casereader-filter.c 7 Jun 2007 05:36:24 -0000 1.2
+++ src/data/casereader-filter.c 8 Jun 2007 01:30:27 -0000 1.3
@@ -205,7 +205,7 @@
struct casereader *
casereader_create_filter_missing (struct casereader *reader,
- struct variable **vars, size_t var_cnt,
+ const struct variable **vars, size_t var_cnt,
enum mv_class class,
struct casewriter *exclude)
{
Index: src/data/casereader.h
===================================================================
RCS file: /sources/pspp/pspp/src/data/casereader.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/data/casereader.h 7 Jun 2007 05:36:25 -0000 1.2
+++ src/data/casereader.h 8 Jun 2007 01:30:28 -0000 1.3
@@ -97,7 +97,7 @@
struct casewriter *exclude);
struct casereader *
casereader_create_filter_missing (struct casereader *,
- struct variable **vars, size_t var_cnt,
+ const struct variable **vars, size_t var_cnt,
enum mv_class,
struct casewriter *exclude);
Index: src/language/data-io/get.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/data-io/get.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- src/language/data-io/get.c 7 Jun 2007 06:45:15 -0000 1.33
+++ src/language/data-io/get.c 8 Jun 2007 01:30:28 -0000 1.34
@@ -660,7 +660,7 @@
enum mtf_type type;
int sequence;
- struct variable **by; /* List of BY variables for this file. */
+ const struct variable **by; /* List of BY variables for this file. */
struct mtf_variable *vars; /* Variables to copy to output. */
size_t var_cnt; /* Number of other variables. */
@@ -701,7 +701,7 @@
struct ccase buffered_case; /* Case ready for output except that we don't
know the value for the LAST variable yet. */
struct ccase prev_BY_case; /* Case with values of last set of BY vars. */
- struct variable **prev_BY; /* Last set of BY variables. */
+ const struct variable **prev_BY; /* Last set of BY variables. */
};
static void mtf_free (struct mtf_proc *);
Index: src/language/stats/npar-summary.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/stats/npar-summary.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/language/stats/npar-summary.c 7 Jun 2007 06:42:04 -0000 1.3
+++ src/language/stats/npar-summary.c 8 Jun 2007 01:30:28 -0000 1.4
@@ -53,7 +53,7 @@
pass = casereader_clone (input);
pass = casereader_create_filter_missing (pass,
- (struct variable **) &v, 1,
+ &v, 1,
filter, NULL);
pass = casereader_create_filter_weight (pass, dict, NULL, NULL);
while (casereader_read(pass, &c))
Index: src/language/stats/npar.h
===================================================================
RCS file: /sources/pspp/pspp/src/language/stats/npar.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/language/stats/npar.h 7 Jun 2007 06:42:04 -0000 1.4
+++ src/language/stats/npar.h 8 Jun 2007 01:30:28 -0000 1.5
@@ -25,7 +25,7 @@
#include <stddef.h>
#include <data/missing-values.h>
-typedef struct variable *variable_pair[2];
+typedef const struct variable *variable_pair[2];
struct hsh_table;
struct const_hsh_table;
Index: src/language/stats/npar.q
===================================================================
RCS file: /sources/pspp/pspp/src/language/stats/npar.q,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/language/stats/npar.q 7 Jun 2007 06:42:04 -0000 1.5
+++ src/language/stats/npar.q 8 Jun 2007 01:30:28 -0000 1.6
@@ -73,7 +73,7 @@
struct npar_test **test;
size_t n_tests;
- const struct variable *const* vv; /* Compendium of all variables
+ const struct variable ** vv; /* Compendium of all variables
(those mentioned on ANY subcommand */
int n_vars; /* Number of variables in vv */
@@ -153,7 +153,7 @@
test->insert_variables (test, var_hash);
}
- npar_specs.vv = (const struct variable *const *) const_hsh_data (var_hash);
+ npar_specs.vv = (const struct variable **) const_hsh_data (var_hash);
npar_specs.n_vars = const_hsh_count (var_hash);
if ( cmd.sbc_statistics )
@@ -188,7 +188,7 @@
input = proc_open (ds);
if ( cmd.miss == NPAR_LISTWISE )
input = casereader_create_filter_missing (input,
- (struct variable **)
npar_specs.vv,
+ npar_specs.vv,
npar_specs.n_vars,
npar_specs.filter, NULL);
Index: src/language/stats/rank.q
===================================================================
RCS file: /sources/pspp/pspp/src/language/stats/rank.q,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- src/language/stats/rank.q 7 Jun 2007 06:42:04 -0000 1.29
+++ src/language/stats/rank.q 8 Jun 2007 01:30:29 -0000 1.30
@@ -172,7 +172,7 @@
const struct rank_spec *rs,
int n_rank_specs,
int idx,
- struct variable *rank_var);
+ const struct variable *rank_var);
static const char *
fraction_name(void)
@@ -467,7 +467,7 @@
const struct rank_spec *rs,
int n_rank_specs,
int dest_idx,
- struct variable *rank_var)
+ const struct variable *rank_var)
{
struct casereader *pass1, *pass2, *pass2_1;
struct casegrouper *tie_grouper;
Index: src/language/stats/regression.q
===================================================================
RCS file: /sources/pspp/pspp/src/language/stats/regression.q,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- src/language/stats/regression.q 7 Jun 2007 06:42:04 -0000 1.53
+++ src/language/stats/regression.q 8 Jun 2007 01:30:29 -0000 1.54
@@ -1014,7 +1014,7 @@
/* Identify the explanatory variables in v_variables. Returns
the number of independent variables. */
static int
-identify_indep_vars (struct variable **indep_vars, struct variable *depvar)
+identify_indep_vars (const struct variable **indep_vars, const struct variable
*depvar)
{
int n_indep_vars = 0;
int i;
@@ -1030,7 +1030,7 @@
Returns number of valid cases. */
static int
prepare_categories (struct casereader *input,
- struct variable **vars, size_t n_vars,
+ const struct variable **vars, size_t n_vars,
struct moments_var *mom)
{
int n_data;
@@ -1156,7 +1156,7 @@
for (k = 0; k < cmd->n_dependent; k++)
{
- struct variable *dep_var;
+ const struct variable *dep_var;
struct casereader *reader;
casenumber row;
struct ccase c;
@@ -1204,7 +1204,7 @@
{
for (i = 0; i < n_indep; ++i)
{
- struct variable *v = indep_vars[i];
+ const struct variable *v = indep_vars[i];
const union value *val = case_data (&c, v);
if (var_is_alpha (v))
design_matrix_set_categorical (X, row, v, val);
Index: src/language/stats/sort-criteria.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/stats/sort-criteria.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/language/stats/sort-criteria.c 7 Jun 2007 06:42:04 -0000 1.9
+++ src/language/stats/sort-criteria.c 8 Jun 2007 01:30:29 -0000 1.10
@@ -42,7 +42,7 @@
bool *saw_direction)
{
struct case_ordering *ordering = case_ordering_create (dict);
- struct variable **vars = NULL;
+ const struct variable **vars = NULL;
size_t var_cnt = 0;
if (saw_direction != NULL)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp po/de.po src/data/case-ordering.c src/data...,
John Darrington <=