projects
/
pspp-builds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
433da76
)
Fixed constness issues.
author
John Darrington
<john@darrington.wattle.id.au>
Fri, 8 Jun 2007 01:30:27 +0000
(
01:30
+0000)
committer
John Darrington
<john@darrington.wattle.id.au>
Fri, 8 Jun 2007 01:30:27 +0000
(
01:30
+0000)
14 files changed:
po/de.po
patch
|
blob
|
history
src/data/case-ordering.c
patch
|
blob
|
history
src/data/case-ordering.h
patch
|
blob
|
history
src/data/casegrouper.c
patch
|
blob
|
history
src/data/casegrouper.h
patch
|
blob
|
history
src/data/casereader-filter.c
patch
|
blob
|
history
src/data/casereader.h
patch
|
blob
|
history
src/language/data-io/get.c
patch
|
blob
|
history
src/language/stats/npar-summary.c
patch
|
blob
|
history
src/language/stats/npar.h
patch
|
blob
|
history
src/language/stats/npar.q
patch
|
blob
|
history
src/language/stats/rank.q
patch
|
blob
|
history
src/language/stats/regression.q
patch
|
blob
|
history
src/language/stats/sort-criteria.c
patch
|
blob
|
history
diff --git
a/po/de.po
b/po/de.po
index 5ce521accd14d716e3915367ed5f6843cc1cc9b3..322959d9d9295566a7601602d5a89009c6385db4 100644
(file)
--- a/
po/de.po
+++ b/
po/de.po
@@
-3262,6
+3262,10
@@
msgstr ""
msgid "Dependent variable must be numeric."
msgstr ""
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 ""
#: src/language/stats/sort-cases.c:63
msgid "Buffer limit must be at least 2."
msgstr ""
diff --git
a/src/data/case-ordering.c
b/src/data/case-ordering.c
index 54f1c7f200b162f7b8ed5b4c89e9c0c5056aade8..aeb87b763511dda02c09b8a89bde334a47c607cb 100644
(file)
--- a/
src/data/case-ordering.c
+++ b/
src/data/case-ordering.c
@@
-32,7
+32,7
@@
/* One key used for sorting. */
struct sort_key
{
/* One key used for sorting. */
struct sort_key
{
- struct variable *var; /* Variable. */
+
const
struct variable *var; /* Variable. */
enum sort_direction dir; /* Sort direction. */
};
enum sort_direction dir; /* Sort direction. */
};
@@
-118,7
+118,7
@@
case_ordering_compare_cases (const struct ccase *a, const struct ccase *b,
bool
case_ordering_add_var (struct case_ordering *co,
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;
{
struct sort_key *key;
size_t i;
@@
-140,7
+140,7
@@
case_ordering_get_var_cnt (const struct case_ordering *co)
return co->key_cnt;
}
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);
case_ordering_get_var (const struct case_ordering *co, size_t idx)
{
assert (idx < co->key_cnt);
@@
-156,7
+156,7
@@
case_ordering_get_direction (const struct case_ordering *co, size_t idx)
void
case_ordering_get_vars (const struct case_ordering *co,
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;
{
size_t i;
diff --git
a/src/data/case-ordering.h
b/src/data/case-ordering.h
index f1b6c30f7b7352638596a175c011850760328005..f537829d9cc80ae0c22c6c4b6011118c8bc91bb0 100644
(file)
--- a/
src/data/case-ordering.h
+++ b/
src/data/case-ordering.h
@@
-40,12
+40,12
@@
int case_ordering_compare_cases (const struct ccase *, const struct ccase *,
const struct case_ordering *);
bool case_ordering_add_var (struct case_ordering *,
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 *);
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 *,
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 */
#endif /* data/case-ordering.h */
diff --git
a/src/data/casegrouper.c
b/src/data/casegrouper.c
index 07b0614e6baa33570953ff378abfd4e8254f72b5..eee08700adbae4e2304d30b44d478fafe8c01263 100644
(file)
--- a/
src/data/casegrouper.c
+++ b/
src/data/casegrouper.c
@@
-129,7
+129,7
@@
casegrouper_destroy (struct casegrouper *grouper)
struct casegrouper_vars
{
struct casegrouper_vars
{
- struct variable **vars;
+
const
struct variable **vars;
size_t var_cnt;
};
size_t var_cnt;
};
@@
-151,7
+151,7
@@
casegrouper_vars_destroy (void *cv_)
struct casegrouper *
casegrouper_create_vars (struct casereader *reader,
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)
size_t var_cnt)
{
if (var_cnt > 0)
@@
-181,7
+181,7
@@
struct casegrouper *
casegrouper_create_case_ordering (struct casereader *reader,
const struct case_ordering *co)
{
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;
size_t var_cnt;
struct casegrouper *grouper;
diff --git
a/src/data/casegrouper.h
b/src/data/casegrouper.h
index e0a0e487d059f956bbfb1085c4dac12077b132b8..3d9c6a89dc41fc1805ecf0623e8590972655dd8e 100644
(file)
--- a/
src/data/casegrouper.h
+++ b/
src/data/casegrouper.h
@@
-36,7
+36,7
@@
casegrouper_create_func (struct casereader *,
void (*destroy) (void *aux),
void *aux);
struct casegrouper *casegrouper_create_vars (struct casereader *,
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 *);
size_t var_cnt);
struct casegrouper *casegrouper_create_splits (struct casereader *,
const struct dictionary *);
diff --git
a/src/data/casereader-filter.c
b/src/data/casereader-filter.c
index 88d798e3927d054ad38125f02963fa314716d67a..d06bdc86c3101a3f30d4145d0b22deaa2b7b53af 100644
(file)
--- a/
src/data/casereader-filter.c
+++ b/
src/data/casereader-filter.c
@@
-205,7
+205,7
@@
casereader_filter_missing_destroy (void *cfm_)
struct casereader *
casereader_create_filter_missing (struct casereader *reader,
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)
{
enum mv_class class,
struct casewriter *exclude)
{
diff --git
a/src/data/casereader.h
b/src/data/casereader.h
index bd066a90ed0ffe5e27d23aeeca5d5cafb89a968d..8e05663248b15435ae866cd625c5c08d5b5f7449 100644
(file)
--- a/
src/data/casereader.h
+++ b/
src/data/casereader.h
@@
-97,7
+97,7
@@
casereader_create_filter_weight (struct casereader *,
struct casewriter *exclude);
struct casereader *
casereader_create_filter_missing (struct casereader *,
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);
enum mv_class,
struct casewriter *exclude);
diff --git
a/src/language/data-io/get.c
b/src/language/data-io/get.c
index 950afeb47e6fb285e63fe7285de4807829d9b915..47bcf50f1e503ce04213f969bb9e536c658c4a98 100644
(file)
--- a/
src/language/data-io/get.c
+++ b/
src/language/data-io/get.c
@@
-660,7
+660,7
@@
struct mtf_file
enum mtf_type type;
int sequence;
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. */
struct mtf_variable *vars; /* Variables to copy to output. */
size_t var_cnt; /* Number of other variables. */
@@
-701,7
+701,7
@@
struct mtf_proc
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 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 *);
};
static void mtf_free (struct mtf_proc *);
diff --git
a/src/language/stats/npar-summary.c
b/src/language/stats/npar-summary.c
index 74532231019078f41ddfcd983a6326ecc4de000b..efb47458cef3424b0da52de43647effed2172874 100644
(file)
--- a/
src/language/stats/npar-summary.c
+++ b/
src/language/stats/npar-summary.c
@@
-53,7
+53,7
@@
npar_summary_calc_descriptives (struct descriptives *desc,
pass = casereader_clone (input);
pass = casereader_create_filter_missing (pass,
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))
filter, NULL);
pass = casereader_create_filter_weight (pass, dict, NULL, NULL);
while (casereader_read(pass, &c))
diff --git
a/src/language/stats/npar.h
b/src/language/stats/npar.h
index 80446c3a56af41e6f392e6738c2c9fe43ca0b7b3..cdbc1f1c343c2370a252c1902316895e17127ca1 100644
(file)
--- a/
src/language/stats/npar.h
+++ b/
src/language/stats/npar.h
@@
-25,7
+25,7
@@
#include <stddef.h>
#include <data/missing-values.h>
#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;
struct hsh_table;
struct const_hsh_table;
diff --git
a/src/language/stats/npar.q
b/src/language/stats/npar.q
index 74e8364f1b14bd7ae33a0b97507bbe4fb9129d75..e22c839657afc344ee7db1b94407bfda70313f4f 100644
(file)
--- a/
src/language/stats/npar.q
+++ b/
src/language/stats/npar.q
@@
-73,7
+73,7
@@
struct npar_specs
struct npar_test **test;
size_t n_tests;
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 */
(those mentioned on ANY subcommand */
int n_vars; /* Number of variables in vv */
@@
-153,7
+153,7
@@
cmd_npar_tests (struct lexer *lexer, struct dataset *ds)
test->insert_variables (test, var_hash);
}
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 )
npar_specs.n_vars = const_hsh_count (var_hash);
if ( cmd.sbc_statistics )
@@
-188,7
+188,7
@@
cmd_npar_tests (struct lexer *lexer, struct dataset *ds)
input = proc_open (ds);
if ( cmd.miss == NPAR_LISTWISE )
input = casereader_create_filter_missing (input,
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);
npar_specs.n_vars,
npar_specs.filter, NULL);
diff --git
a/src/language/stats/rank.q
b/src/language/stats/rank.q
index c42f896a8c2c97031cd8e4640dc6a66dbfa3da16..df2150d3b1cc2d120140675834d0fe7d6916ab82 100644
(file)
--- a/
src/language/stats/rank.q
+++ b/
src/language/stats/rank.q
@@
-172,7
+172,7
@@
static void rank_sorted_file (struct casereader *,
const struct rank_spec *rs,
int n_rank_specs,
int idx,
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)
static const char *
fraction_name(void)
@@
-467,7
+467,7
@@
rank_sorted_file (struct casereader *input,
const struct rank_spec *rs,
int n_rank_specs,
int dest_idx,
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;
{
struct casereader *pass1, *pass2, *pass2_1;
struct casegrouper *tie_grouper;
diff --git
a/src/language/stats/regression.q
b/src/language/stats/regression.q
index 690b6809aacda290c88d4175c177113d60c6396f..1f2ac2a6bac15051def19c85dc6b7e1af180dcde 100644
(file)
--- a/
src/language/stats/regression.q
+++ b/
src/language/stats/regression.q
@@
-1014,7
+1014,7
@@
regression_custom_variables (struct lexer *lexer, struct dataset *ds,
/* Identify the explanatory variables in v_variables. Returns
the number of independent variables. */
static int
/* 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;
{
int n_indep_vars = 0;
int i;
@@
-1030,7
+1030,7
@@
identify_indep_vars (struct variable **indep_vars, struct variable *depvar)
Returns number of valid cases. */
static int
prepare_categories (struct casereader *input,
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;
struct moments_var *mom)
{
int n_data;
@@
-1156,7
+1156,7
@@
run_regression (struct casereader *input, struct cmd_regression *cmd,
for (k = 0; k < cmd->n_dependent; k++)
{
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;
struct casereader *reader;
casenumber row;
struct ccase c;
@@
-1204,7
+1204,7
@@
run_regression (struct casereader *input, struct cmd_regression *cmd,
{
for (i = 0; i < n_indep; ++i)
{
{
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);
const union value *val = case_data (&c, v);
if (var_is_alpha (v))
design_matrix_set_categorical (X, row, v, val);
diff --git
a/src/language/stats/sort-criteria.c
b/src/language/stats/sort-criteria.c
index bd1983dd4a305ec1c4b02ccf6a7711184f3316ea..c22f1b0f7b33b42312805da24834202fd7c2cb6f 100644
(file)
--- a/
src/language/stats/sort-criteria.c
+++ b/
src/language/stats/sort-criteria.c
@@
-42,7
+42,7
@@
parse_case_ordering (struct lexer *lexer, const struct dictionary *dict,
bool *saw_direction)
{
struct case_ordering *ordering = case_ordering_create (dict);
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)
size_t var_cnt = 0;
if (saw_direction != NULL)