projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow RANK grouping variables to be strings. Fixes bug #18533.
[pspp]
/
src
/
language
/
dictionary
/
modify-variables.c
diff --git
a/src/language/dictionary/modify-variables.c
b/src/language/dictionary/modify-variables.c
index 3bbf844f565ef465acada22596541f1fd6c21eed..c74cd529afe2b31f0fab2872365f1b006b2ff568 100644
(file)
--- a/
src/language/dictionary/modify-variables.c
+++ b/
src/language/dictionary/modify-variables.c
@@
-1,6
+1,5
@@
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@
-54,7
+53,7
@@
struct ordering
static struct ordering forward_positional_ordering = {1, 1};
static int compare_variables_given_ordering (const void *, const void *,
static struct ordering forward_positional_ordering = {1, 1};
static int compare_variables_given_ordering (const void *, const void *,
- void *ordering);
+
const
void *ordering);
/* Explains how to modify the variables in a dictionary. */
struct var_modification
/* Explains how to modify the variables in a dictionary. */
struct var_modification
@@
-78,7
+77,7
@@
static bool rearrange_dict (struct dictionary *d,
/* Performs MODIFY VARS command. */
int
/* Performs MODIFY VARS command. */
int
-cmd_modify_vars (
void
)
+cmd_modify_vars (
struct lexer *lexer, struct dataset *ds
)
{
/* Bits indicated whether we've already encountered a subcommand of
this type. */
{
/* Bits indicated whether we've already encountered a subcommand of
this type. */
@@
-92,7
+91,7
@@
cmd_modify_vars (void)
size_t i;
size_t i;
- if (proc_make_temporary_transformations_permanent (
current_dataset
))
+ if (proc_make_temporary_transformations_permanent (
ds
))
msg (SE, _("MODIFY VARS may not be used after TEMPORARY. "
"Temporary transformations will be made permanent."));
msg (SE, _("MODIFY VARS may not be used after TEMPORARY. "
"Temporary transformations will be made permanent."));
@@
-105,10
+104,10
@@
cmd_modify_vars (void)
vm.drop_cnt = 0;
/* Parse each subcommand. */
vm.drop_cnt = 0;
/* Parse each subcommand. */
- lex_match ('/');
+ lex_match (
lexer,
'/');
for (;;)
{
for (;;)
{
- if (lex_match_id ("REORDER"))
+ if (lex_match_id (
lexer,
"REORDER"))
{
struct variable **v = NULL;
size_t nv = 0;
{
struct variable **v = NULL;
size_t nv = 0;
@@
-120,21
+119,21
@@
cmd_modify_vars (void)
}
already_encountered |= 1;
}
already_encountered |= 1;
- lex_match ('=');
+ lex_match (
lexer,
'=');
do
{
struct ordering ordering;
size_t prev_nv = nv;
ordering.forward = ordering.positional = 1;
do
{
struct ordering ordering;
size_t prev_nv = nv;
ordering.forward = ordering.positional = 1;
- if (lex_match_id ("FORWARD"));
- else if (lex_match_id ("BACKWARD"))
+ if (lex_match_id (
lexer,
"FORWARD"));
+ else if (lex_match_id (
lexer,
"BACKWARD"))
ordering.forward = 0;
ordering.forward = 0;
- if (lex_match_id ("POSITIONAL"));
- else if (lex_match_id ("ALPHA"))
+ if (lex_match_id (
lexer,
"POSITIONAL"));
+ else if (lex_match_id (
lexer,
"ALPHA"))
ordering.positional = 0;
ordering.positional = 0;
- if (lex_match (
T_ALL) || token == '/' || token
== '.')
+ if (lex_match (
lexer, T_ALL) || lex_token (lexer) == '/' || lex_token (lexer)
== '.')
{
if (prev_nv != 0)
{
{
if (prev_nv != 0)
{
@@
-142,23
+141,23
@@
cmd_modify_vars (void)
"of variables."));
goto done;
}
"of variables."));
goto done;
}
- dict_get_vars (dataset_dict (
current_dataset
), &v, &nv, 1u << DC_SYSTEM);
+ dict_get_vars (dataset_dict (
ds
), &v, &nv, 1u << DC_SYSTEM);
}
else
{
}
else
{
- if (!lex_match ('('))
+ if (!lex_match (
lexer,
'('))
{
msg (SE, _("`(' expected on REORDER subcommand."));
free (v);
goto done;
}
{
msg (SE, _("`(' expected on REORDER subcommand."));
free (v);
goto done;
}
- if (!parse_variables (
dataset_dict (current_dataset
), &v, &nv,
+ if (!parse_variables (
lexer, dataset_dict (ds
), &v, &nv,
PV_APPEND | PV_NO_DUPLICATE))
{
free (v);
goto done;
}
PV_APPEND | PV_NO_DUPLICATE))
{
free (v);
goto done;
}
- if (!lex_match (')'))
+ if (!lex_match (
lexer,
')'))
{
msg (SE, _("`)' expected following variable names on "
"REORDER subcommand."));
{
msg (SE, _("`)' expected following variable names on "
"REORDER subcommand."));
@@
-169,12
+168,12
@@
cmd_modify_vars (void)
sort (&v[prev_nv], nv - prev_nv, sizeof *v,
compare_variables_given_ordering, &ordering);
}
sort (&v[prev_nv], nv - prev_nv, sizeof *v,
compare_variables_given_ordering, &ordering);
}
- while (
token != '/' && token
!= '.');
+ while (
lex_token (lexer) != '/' && lex_token (lexer)
!= '.');
vm.reorder_vars = v;
vm.reorder_cnt = nv;
}
vm.reorder_vars = v;
vm.reorder_cnt = nv;
}
- else if (lex_match_id ("RENAME"))
+ else if (lex_match_id (
lexer,
"RENAME"))
{
if (already_encountered & 2)
{
{
if (already_encountered & 2)
{
@@
-183,27
+182,29
@@
cmd_modify_vars (void)
}
already_encountered |= 2;
}
already_encountered |= 2;
- lex_match ('=');
+ lex_match (
lexer,
'=');
do
{
size_t prev_nv_1 = vm.rename_cnt;
size_t prev_nv_2 = vm.rename_cnt;
do
{
size_t prev_nv_1 = vm.rename_cnt;
size_t prev_nv_2 = vm.rename_cnt;
- if (!lex_match ('('))
+ if (!lex_match (
lexer,
'('))
{
msg (SE, _("`(' expected on RENAME subcommand."));
goto done;
}
{
msg (SE, _("`(' expected on RENAME subcommand."));
goto done;
}
- if (!parse_variables (dataset_dict (current_dataset), &vm.rename_vars, &vm.rename_cnt,
+ if (!parse_variables (lexer, dataset_dict (ds),
+ &vm.rename_vars, &vm.rename_cnt,
PV_APPEND | PV_NO_DUPLICATE))
goto done;
PV_APPEND | PV_NO_DUPLICATE))
goto done;
- if (!lex_match ('='))
+ if (!lex_match (
lexer,
'='))
{
msg (SE, _("`=' expected between lists of new and old variable "
"names on RENAME subcommand."));
goto done;
}
{
msg (SE, _("`=' expected between lists of new and old variable "
"names on RENAME subcommand."));
goto done;
}
- if (!parse_DATA_LIST_vars (&vm.new_names, &prev_nv_1, PV_APPEND))
+ if (!parse_DATA_LIST_vars (lexer, &vm.new_names,
+ &prev_nv_1, PV_APPEND))
goto done;
if (prev_nv_1 != vm.rename_cnt)
{
goto done;
if (prev_nv_1 != vm.rename_cnt)
{
@@
-216,16
+217,16
@@
cmd_modify_vars (void)
vm.new_names = NULL;
goto done;
}
vm.new_names = NULL;
goto done;
}
- if (!lex_match (')'))
+ if (!lex_match (
lexer,
')'))
{
msg (SE, _("`)' expected after variable lists on RENAME "
"subcommand."));
goto done;
}
}
{
msg (SE, _("`)' expected after variable lists on RENAME "
"subcommand."));
goto done;
}
}
- while (
token != '.' && token
!= '/');
+ while (
lex_token (lexer) != '.' && lex_token (lexer)
!= '/');
}
}
- else if (lex_match_id ("KEEP"))
+ else if (lex_match_id (
lexer,
"KEEP"))
{
struct variable **keep_vars, **all_vars, **drop_vars;
size_t keep_cnt, all_cnt, drop_cnt;
{
struct variable **keep_vars, **all_vars, **drop_vars;
size_t keep_cnt, all_cnt, drop_cnt;
@@
-238,8
+239,8
@@
cmd_modify_vars (void)
}
already_encountered |= 4;
}
already_encountered |= 4;
- lex_match ('=');
- if (!parse_variables (
dataset_dict (current_dataset
), &keep_vars, &keep_cnt, PV_NONE))
+ lex_match (
lexer,
'=');
+ if (!parse_variables (
lexer, dataset_dict (ds
), &keep_vars, &keep_cnt, PV_NONE))
goto done;
/* Transform the list of variables to keep into a list of
goto done;
/* Transform the list of variables to keep into a list of
@@
-248,7
+249,7
@@
cmd_modify_vars (void)
sort (keep_vars, keep_cnt, sizeof *keep_vars,
compare_variables_given_ordering, &forward_positional_ordering);
sort (keep_vars, keep_cnt, sizeof *keep_vars,
compare_variables_given_ordering, &forward_positional_ordering);
- dict_get_vars (dataset_dict (
current_dataset
), &all_vars, &all_cnt, 0);
+ dict_get_vars (dataset_dict (
ds
), &all_vars, &all_cnt, 0);
assert (all_cnt >= keep_cnt);
drop_cnt = all_cnt - keep_cnt;
assert (all_cnt >= keep_cnt);
drop_cnt = all_cnt - keep_cnt;
@@
-268,7
+269,7
@@
cmd_modify_vars (void)
vm.drop_vars = drop_vars;
vm.drop_cnt = drop_cnt;
}
vm.drop_vars = drop_vars;
vm.drop_cnt = drop_cnt;
}
- else if (lex_match_id ("DROP"))
+ else if (lex_match_id (
lexer,
"DROP"))
{
struct variable **drop_vars;
size_t drop_cnt;
{
struct variable **drop_vars;
size_t drop_cnt;
@@
-282,15
+283,15
@@
cmd_modify_vars (void)
}
already_encountered |= 4;
}
already_encountered |= 4;
- lex_match ('=');
- if (!parse_variables (
dataset_dict (current_dataset
), &drop_vars, &drop_cnt, PV_NONE))
+ lex_match (
lexer,
'=');
+ if (!parse_variables (
lexer, dataset_dict (ds
), &drop_vars, &drop_cnt, PV_NONE))
goto done;
vm.drop_vars = drop_vars;
vm.drop_cnt = drop_cnt;
}
goto done;
vm.drop_vars = drop_vars;
vm.drop_cnt = drop_cnt;
}
- else if (lex_match_id ("MAP"))
+ else if (lex_match_id (
lexer,
"MAP"))
{
{
- struct dictionary *temp = dict_clone (dataset_dict (
current_dataset
));
+ struct dictionary *temp = dict_clone (dataset_dict (
ds
));
int success = rearrange_dict (temp, &vm);
if (success)
{
int success = rearrange_dict (temp, &vm);
if (success)
{
@@
-300,31
+301,31
@@
cmd_modify_vars (void)
}
else
{
}
else
{
- if (
token
== T_ID)
- msg (SE, _("Unrecognized subcommand name `%s'."),
tokid
);
+ if (
lex_token (lexer)
== T_ID)
+ msg (SE, _("Unrecognized subcommand name `%s'."),
lex_tokid (lexer)
);
else
msg (SE, _("Subcommand name expected."));
goto done;
}
else
msg (SE, _("Subcommand name expected."));
goto done;
}
- if (
token
== '.')
+ if (
lex_token (lexer)
== '.')
break;
break;
- if (
token
!= '/')
+ if (
lex_token (lexer)
!= '/')
{
msg (SE, _("`/' or `.' expected."));
goto done;
}
{
msg (SE, _("`/' or `.' expected."));
goto done;
}
- lex_get ();
+ lex_get (
lexer
);
}
if (already_encountered & (1 | 4))
{
/* Read the data. */
}
if (already_encountered & (1 | 4))
{
/* Read the data. */
- if (!procedure (
current_dataset
,NULL, NULL))
+ if (!procedure (
ds
,NULL, NULL))
goto done;
}
goto done;
}
- if (!rearrange_dict (dataset_dict (
current_dataset
), &vm))
+ if (!rearrange_dict (dataset_dict (
ds
), &vm))
goto done;
ret_code = CMD_SUCCESS;
goto done;
ret_code = CMD_SUCCESS;
@@
-343,7
+344,7
@@
done:
ORDERING, returning a strcmp()-type result. */
static int
compare_variables_given_ordering (const void *a_, const void *b_,
ORDERING, returning a strcmp()-type result. */
static int
compare_variables_given_ordering (const void *a_, const void *b_,
- void *ordering_)
+
const
void *ordering_)
{
struct variable *const *pa = a_;
struct variable *const *pb = b_;
{
struct variable *const *pa = a_;
struct variable *const *pb = b_;
@@
-352,10
+353,14
@@
compare_variables_given_ordering (const void *a_, const void *b_,
const struct ordering *ordering = ordering_;
int result;
const struct ordering *ordering = ordering_;
int result;
- if (ordering->positional)
- result = a->index < b->index ? -1 : a->index > b->index;
+ if (ordering->positional)
+ {
+ size_t a_index = var_get_dict_index (a);
+ size_t b_index = var_get_dict_index (b);
+ result = a_index < b_index ? -1 : a_index > b_index;
+ }
else
else
- result = strcasecmp (
a->name, b->name
);
+ result = strcasecmp (
var_get_name (a), var_get_name (b)
);
if (!ordering->forward)
result = -result;
return result;
if (!ordering->forward)
result = -result;
return result;
@@
-372,7
+377,7
@@
struct var_renaming
var_renaming structures A and B. */
static int
compare_var_renaming_by_new_name (const void *a_, const void *b_,
var_renaming structures A and B. */
static int
compare_var_renaming_by_new_name (const void *a_, const void *b_,
-
void *foo
UNUSED)
+
const void *aux
UNUSED)
{
const struct var_renaming *a = a_;
const struct var_renaming *b = b_;
{
const struct var_renaming *a = a_;
const struct var_renaming *b = b_;
@@
-428,7
+433,7
@@
validate_var_modification (const struct dictionary *d,
for (i = 0; i < keep_cnt; i++)
{
var_renaming[i].var = keep_vars[i];
for (i = 0; i < keep_cnt; i++)
{
var_renaming[i].var = keep_vars[i];
- strcpy (var_renaming[i].new_name,
keep_vars[i]->name
);
+ strcpy (var_renaming[i].new_name,
var_get_name (keep_vars[i])
);
}
/* Rename variables in var_renaming array. */
}
/* Rename variables in var_renaming array. */
@@
-491,7
+496,7
@@
rearrange_dict (struct dictionary *d, const struct var_modification *vm)
still exist, but we can still look them up by name. */
rename_old_names = xnmalloc (vm->rename_cnt, sizeof *rename_old_names);
for (i = 0; i < vm->rename_cnt; i++)
still exist, but we can still look them up by name. */
rename_old_names = xnmalloc (vm->rename_cnt, sizeof *rename_old_names);
for (i = 0; i < vm->rename_cnt; i++)
- rename_old_names[i] = xstrdup (v
m->rename_vars[i]->name
);
+ rename_old_names[i] = xstrdup (v
ar_get_name (vm->rename_vars[i])
);
/* Reorder and delete variables. */
dict_reorder_vars (d, vm->reorder_vars, vm->reorder_cnt);
/* Reorder and delete variables. */
dict_reorder_vars (d, vm->reorder_vars, vm->reorder_cnt);