projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
format: Create a new "struct fmt_affix" for prefix and suffix strings.
[pspp]
/
src
/
language
/
dictionary
/
modify-variables.c
diff --git
a/src/language/dictionary/modify-variables.c
b/src/language/dictionary/modify-variables.c
index 64204b78ec374cd0ef3477e0157b9a3883e994bf..aae81222c5d8d475ccc7873a857933b457f35515 100644
(file)
--- a/
src/language/dictionary/modify-variables.c
+++ b/
src/language/dictionary/modify-variables.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000
, 2010, 2011
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
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
@@
-28,7
+28,6
@@
#include <libpspp/array.h>
#include <libpspp/bit-vector.h>
#include <libpspp/compiler.h>
#include <libpspp/array.h>
#include <libpspp/bit-vector.h>
#include <libpspp/compiler.h>
-#include <libpspp/hash.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
@@
-101,7
+100,7
@@
cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
vm.drop_cnt = 0;
/* Parse each subcommand. */
vm.drop_cnt = 0;
/* Parse each subcommand. */
- lex_match (lexer,
'/'
);
+ lex_match (lexer,
T_SLASH
);
for (;;)
{
if (lex_match_id (lexer, "REORDER"))
for (;;)
{
if (lex_match_id (lexer, "REORDER"))
@@
-116,7
+115,7
@@
cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
}
already_encountered |= 1;
}
already_encountered |= 1;
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
do
{
struct ordering ordering;
do
{
struct ordering ordering;
@@
-130,7
+129,7
@@
cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
else if (lex_match_id (lexer, "ALPHA"))
ordering.positional = 0;
else if (lex_match_id (lexer, "ALPHA"))
ordering.positional = 0;
- if (lex_match (lexer, T_ALL) || lex_token (lexer) ==
'/' || lex_token (lexer) == '.'
)
+ if (lex_match (lexer, T_ALL) || lex_token (lexer) ==
T_SLASH || lex_token (lexer) == T_ENDCMD
)
{
if (prev_nv != 0)
{
{
if (prev_nv != 0)
{
@@
-142,7
+141,7
@@
cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
}
else
{
}
else
{
- if (!lex_match (lexer,
'('
))
+ if (!lex_match (lexer,
T_LPAREN
))
{
msg (SE, _("`(' expected on %s subcommand."), "REORDER");
free (v);
{
msg (SE, _("`(' expected on %s subcommand."), "REORDER");
free (v);
@@
-154,7
+153,7
@@
cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
free (v);
goto done;
}
free (v);
goto done;
}
- if (!lex_match (lexer,
')'
))
+ if (!lex_match (lexer,
T_RPAREN
))
{
msg (SE, _("`)' expected following variable names on "
"REORDER subcommand."));
{
msg (SE, _("`)' expected following variable names on "
"REORDER subcommand."));
@@
-165,7
+164,8
@@
cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
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 (lex_token (lexer) != '/' && lex_token (lexer) != '.');
+ while (lex_token (lexer) != T_SLASH
+ && lex_token (lexer) != T_ENDCMD);
vm.reorder_vars = v;
vm.reorder_cnt = nv;
vm.reorder_vars = v;
vm.reorder_cnt = nv;
@@
-179,13
+179,13
@@
cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
}
already_encountered |= 2;
}
already_encountered |= 2;
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
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 (lexer,
'('
))
+ if (!lex_match (lexer,
T_LPAREN
))
{
msg (SE, _("`(' expected on %s subcommand."), "RENAME");
goto done;
{
msg (SE, _("`(' expected on %s subcommand."), "RENAME");
goto done;
@@
-194,7
+194,7
@@
cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
&vm.rename_vars, &vm.rename_cnt,
PV_APPEND | PV_NO_DUPLICATE))
goto done;
&vm.rename_vars, &vm.rename_cnt,
PV_APPEND | PV_NO_DUPLICATE))
goto done;
- if (!lex_match (lexer,
'='
))
+ if (!lex_match (lexer,
T_EQUALS
))
{
msg (SE, _("`=' expected between lists of new and old variable "
"names on RENAME subcommand."));
{
msg (SE, _("`=' expected between lists of new and old variable "
"names on RENAME subcommand."));
@@
-214,14
+214,15
@@
cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
vm.new_names = NULL;
goto done;
}
vm.new_names = NULL;
goto done;
}
- if (!lex_match (lexer,
')'
))
+ if (!lex_match (lexer,
T_RPAREN
))
{
msg (SE, _("`)' expected after variable lists on RENAME "
"subcommand."));
goto done;
}
}
{
msg (SE, _("`)' expected after variable lists on RENAME "
"subcommand."));
goto done;
}
}
- while (lex_token (lexer) != '.' && lex_token (lexer) != '/');
+ while (lex_token (lexer) != T_ENDCMD
+ && lex_token (lexer) != T_SLASH);
}
else if (lex_match_id (lexer, "KEEP"))
{
}
else if (lex_match_id (lexer, "KEEP"))
{
@@
-236,7
+237,7
@@
cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
}
already_encountered |= 4;
}
already_encountered |= 4;
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
if (!parse_variables (lexer, dataset_dict (ds), &keep_vars, &keep_cnt, PV_NONE))
goto done;
if (!parse_variables (lexer, dataset_dict (ds), &keep_vars, &keep_cnt, PV_NONE))
goto done;
@@
-280,7
+281,7
@@
cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
}
already_encountered |= 4;
}
already_encountered |= 4;
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
if (!parse_variables (lexer, dataset_dict (ds), &drop_vars, &drop_cnt, PV_NONE))
goto done;
vm.drop_vars = drop_vars;
if (!parse_variables (lexer, dataset_dict (ds), &drop_vars, &drop_cnt, PV_NONE))
goto done;
vm.drop_vars = drop_vars;
@@
-299,15
+300,15
@@
cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
else
{
if (lex_token (lexer) == T_ID)
else
{
if (lex_token (lexer) == T_ID)
- msg (SE, _("Unrecognized subcommand name `%s'."), lex_tok
id
(lexer));
+ msg (SE, _("Unrecognized subcommand name `%s'."), lex_tok
cstr
(lexer));
else
msg (SE, _("Subcommand name expected."));
goto done;
}
else
msg (SE, _("Subcommand name expected."));
goto done;
}
- if (lex_token (lexer) ==
'.'
)
+ if (lex_token (lexer) ==
T_ENDCMD
)
break;
break;
- if (lex_token (lexer) !=
'/'
)
+ if (lex_token (lexer) !=
T_SLASH
)
{
msg (SE, _("`/' or `.' expected."));
goto done;
{
msg (SE, _("`/' or `.' expected."));
goto done;
@@
-367,7
+368,7
@@
compare_variables_given_ordering (const void *a_, const void *b_,
struct var_renaming
{
struct variable *var;
struct var_renaming
{
struct variable *var;
- c
har new_name[VAR_NAME_LEN + 1]
;
+ c
onst char *new_name
;
};
/* A algo_compare_func that compares new_name members in struct
};
/* A algo_compare_func that compares new_name members in struct
@@
-430,7
+431,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, var_get_name (keep_vars[i])
);
+
var_renaming[i].new_name = var_get_name (keep_vars[i]
);
}
/* Rename variables in var_renaming array. */
}
/* Rename variables in var_renaming array. */
@@
-448,7
+449,7
@@
validate_var_modification (const struct dictionary *d,
continue;
vr = var_renaming + (kv - keep_vars);
continue;
vr = var_renaming + (kv - keep_vars);
-
strcpy (vr->new_name, vm->new_names[i])
;
+
vr->new_name = vm->new_names[i]
;
}
/* Sort var_renaming array by new names and check for
}
/* Sort var_renaming array by new names and check for