X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Frename-variables.c;h=c1d31996bacfa453b289cfeaa73b1488ceab2bf5;hb=9ade26c8349b4434008c46cf09bc7473ec743972;hp=79ab997cfd27ed5f7bf12dab050336c9f2475bd0;hpb=691c25e36fd1ee722dd35419d6110e3876b99f9c;p=pspp-builds.git diff --git a/src/language/dictionary/rename-variables.c b/src/language/dictionary/rename-variables.c index 79ab997c..c1d31996 100644 --- a/src/language/dictionary/rename-variables.c +++ b/src/language/dictionary/rename-variables.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2010 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 @@ -18,16 +18,16 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "data/dictionary.h" +#include "data/procedure.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 "xalloc.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -66,7 +66,8 @@ cmd_rename_variables (struct lexer *lexer, struct dataset *ds) 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, + if (!parse_DATA_LIST_vars (lexer, dataset_dict (ds), + &rename_new_names, &prev_nv_1, PV_APPEND | PV_NO_DUPLICATE)) goto lossage; if (prev_nv_1 != rename_cnt)