X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fmodify-variables.c;h=aae81222c5d8d475ccc7873a857933b457f35515;hb=23e4750c9a2fbc89126fe7be83ee7a3c1914cc07;hp=0dbded8279920d6e127e7914443d07615d129e57;hpb=f5c108becd49d78f4898cab11352291f5689d24e;p=pspp-builds.git
diff --git a/src/language/dictionary/modify-variables.c b/src/language/dictionary/modify-variables.c
index 0dbded82..aae81222 100644
--- a/src/language/dictionary/modify-variables.c
+++ b/src/language/dictionary/modify-variables.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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 3 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.
+ 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. */
+ along with this program. If not, see . */
#include
@@ -26,17 +24,16 @@
#include
#include
#include
-#include
#include
#include
#include
#include
-#include
-#include
#include
#include
#include
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -103,7 +100,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
vm.drop_cnt = 0;
/* Parse each subcommand. */
- lex_match (lexer, '/');
+ lex_match (lexer, T_SLASH);
for (;;)
{
if (lex_match_id (lexer, "REORDER"))
@@ -113,12 +110,12 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
if (already_encountered & 1)
{
- msg (SE, _("REORDER subcommand may be given at most once."));
+ msg (SE, _("%s subcommand may be given at most once."), "REORDER");
goto done;
}
already_encountered |= 1;
- lex_match (lexer, '=');
+ lex_match (lexer, T_EQUALS);
do
{
struct ordering ordering;
@@ -132,7 +129,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
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)
{
@@ -140,13 +137,13 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
"of variables."));
goto done;
}
- dict_get_vars_mutable (dataset_dict (ds), &v, &nv, 1u << DC_SYSTEM);
+ dict_get_vars_mutable (dataset_dict (ds), &v, &nv, DC_SYSTEM);
}
else
{
- if (!lex_match (lexer, '('))
+ if (!lex_match (lexer, T_LPAREN))
{
- msg (SE, _("`(' expected on REORDER subcommand."));
+ msg (SE, _("`(' expected on %s subcommand."), "REORDER");
free (v);
goto done;
}
@@ -156,7 +153,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
free (v);
goto done;
}
- if (!lex_match (lexer, ')'))
+ if (!lex_match (lexer, T_RPAREN))
{
msg (SE, _("`)' expected following variable names on "
"REORDER subcommand."));
@@ -167,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);
}
- 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;
@@ -176,27 +174,27 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
{
if (already_encountered & 2)
{
- msg (SE, _("RENAME subcommand may be given at most once."));
+ msg (SE, _("%s subcommand may be given at most once."), "RENAME");
goto done;
}
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;
- if (!lex_match (lexer, '('))
+ if (!lex_match (lexer, T_LPAREN))
{
- msg (SE, _("`(' expected on RENAME subcommand."));
+ msg (SE, _("`(' expected on %s subcommand."), "RENAME");
goto done;
}
if (!parse_variables (lexer, dataset_dict (ds),
&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."));
@@ -208,23 +206,23 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
if (prev_nv_1 != vm.rename_cnt)
{
msg (SE, _("Differing number of variables in old name list "
- "(%d) and in new name list (%d)."),
- (int) (vm.rename_cnt - prev_nv_2),
- (int) (prev_nv_1 - prev_nv_2));
+ "(%zu) and in new name list (%zu)."),
+ vm.rename_cnt - prev_nv_2, prev_nv_1 - prev_nv_2);
for (i = 0; i < prev_nv_1; i++)
free (vm.new_names[i]);
free (vm.new_names);
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;
}
}
- 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"))
{
@@ -233,13 +231,13 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
if (already_encountered & 4)
{
- msg (SE, _("KEEP subcommand may be given at most once. It may not"
- "be given in conjunction with the DROP subcommand."));
+ msg (SE, _("KEEP subcommand may be given at most once. It may "
+ "not be given in conjunction with the DROP subcommand."));
goto done;
}
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;
@@ -283,7 +281,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
}
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;
@@ -302,15 +300,15 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
else
{
if (lex_token (lexer) == T_ID)
- msg (SE, _("Unrecognized subcommand name `%s'."), lex_tokid (lexer));
+ msg (SE, _("Unrecognized subcommand name `%s'."), lex_tokcstr (lexer));
else
msg (SE, _("Subcommand name expected."));
goto done;
}
- if (lex_token (lexer) == '.')
+ if (lex_token (lexer) == T_ENDCMD)
break;
- if (lex_token (lexer) != '/')
+ if (lex_token (lexer) != T_SLASH)
{
msg (SE, _("`/' or `.' expected."));
goto done;
@@ -370,7 +368,7 @@ compare_variables_given_ordering (const void *a_, const void *b_,
struct var_renaming
{
struct variable *var;
- char new_name[LONG_NAME_LEN + 1];
+ const char *new_name;
};
/* A algo_compare_func that compares new_name members in struct
@@ -433,7 +431,7 @@ validate_var_modification (const struct dictionary *d,
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. */
@@ -451,7 +449,7 @@ validate_var_modification (const struct dictionary *d,
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