X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Frename-variables.c;h=33d8f6887f61d64267b4a2d5587c79a822a12d2b;hb=5d612c43713291cae1aa473ee3d31786ef6f5b99;hp=c68474398ba677ac673960d5640b686cb6a51d79;hpb=f5c108becd49d78f4898cab11352291f5689d24e;p=pspp
diff --git a/src/language/dictionary/rename-variables.c b/src/language/dictionary/rename-variables.c
index c68474398b..33d8f6887f 100644
--- a/src/language/dictionary/rename-variables.c
+++ b/src/language/dictionary/rename-variables.c
@@ -1,35 +1,33 @@
-/* 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, 2015, 2016 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
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include "data/dataset.h"
+#include "data/dictionary.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+
+#include "gl/xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -39,61 +37,56 @@
int
cmd_rename_variables (struct lexer *lexer, struct dataset *ds)
{
- struct variable **rename_vars = NULL;
- char **rename_new_names = NULL;
- size_t rename_cnt = 0;
+ struct variable **vars_to_be_renamed = NULL;
+ size_t n_vars_to_be_renamed = 0;
+
+ char **new_names = NULL;
+ size_t n_new_names = 0;
+
char *err_name;
int status = CMD_CASCADING_FAILURE;
if (proc_make_temporary_transformations_permanent (ds))
- msg (SE, _("RENAME VARS may not be used after TEMPORARY. "
- "Temporary transformations will be made permanent."));
+ msg (SE, _("%s may not be used after %s. "
+ "Temporary transformations will be made permanent."), "RENAME VARS", "TEMPORARY");
do
{
- size_t prev_nv_1 = rename_cnt;
- size_t prev_nv_2 = rename_cnt;
+ int opts = PV_APPEND | PV_NO_DUPLICATE;
- if (!lex_match (lexer, '('))
+ if (!lex_match (lexer, T_LPAREN))
+ opts |= PV_SINGLE;
+ if (!parse_variables (lexer, dataset_dict (ds),
+ &vars_to_be_renamed, &n_vars_to_be_renamed, opts))
{
- msg (SE, _("`(' expected."));
goto lossage;
}
- if (!parse_variables (lexer, dataset_dict (ds), &rename_vars, &rename_cnt,
- PV_APPEND | PV_NO_DUPLICATE))
- goto lossage;
- if (!lex_match (lexer, '='))
+ if (!lex_force_match (lexer, T_EQUALS))
{
- msg (SE, _("`=' expected between lists of new and old variable names."));
goto lossage;
}
- if (!parse_DATA_LIST_vars (lexer, &rename_new_names, &prev_nv_1, PV_APPEND))
- goto lossage;
- if (prev_nv_1 != rename_cnt)
+ if (!parse_DATA_LIST_vars (lexer, dataset_dict (ds),
+ &new_names, &n_new_names, opts))
{
- size_t i;
-
- msg (SE, _("Differing number of variables in old name list "
- "(%d) and in new name list (%d)."),
- (int) (rename_cnt - prev_nv_2),
- (int) (prev_nv_1 - prev_nv_2));
- for (i = 0; i < prev_nv_1; i++)
- free (rename_new_names[i]);
- free (rename_new_names);
- rename_new_names = NULL;
goto lossage;
}
- if (!lex_match (lexer, ')'))
+ if (n_new_names != n_vars_to_be_renamed)
+ {
+ msg (SE, _("Differing number of variables in old name list "
+ "(%zu) and in new name list (%zu)."),
+ n_vars_to_be_renamed, n_new_names);
+ goto lossage;
+ }
+ if (!(opts & PV_SINGLE) && !lex_force_match (lexer, T_RPAREN))
{
- msg (SE, _("`)' expected after variable names."));
goto lossage;
}
}
- while (lex_token (lexer) != '.');
+ while (lex_token (lexer) != T_ENDCMD);
if (!dict_rename_vars (dataset_dict (ds),
- rename_vars, rename_new_names, rename_cnt,
+ vars_to_be_renamed, new_names, n_new_names,
&err_name))
{
msg (SE, _("Renaming would duplicate variable name %s."), err_name);
@@ -103,13 +96,13 @@ cmd_rename_variables (struct lexer *lexer, struct dataset *ds)
status = CMD_SUCCESS;
lossage:
- free (rename_vars);
- if (rename_new_names != NULL)
+ free (vars_to_be_renamed);
+ if (new_names != NULL)
{
size_t i;
- for (i = 0; i < rename_cnt; i++)
- free (rename_new_names[i]);
- free (rename_new_names);
+ for (i = 0; i < n_new_names; ++i)
+ free (new_names[i]);
+ free (new_names);
}
return status;
}