X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvariable-label.c;h=4735047c1e6d20b7f28f2f01d37340cb8af209e8;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=e8abe70dc91fd0c12d1000c5a615e2ce59195604;hpb=9f087e7aa4cdff1d5d46d5e188c0017a9d2d0029;p=pspp-builds.git diff --git a/src/language/dictionary/variable-label.c b/src/language/dictionary/variable-label.c index e8abe70d..4735047c 100644 --- a/src/language/dictionary/variable-label.c +++ b/src/language/dictionary/variable-label.c @@ -1,5 +1,5 @@ /* 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 @@ -19,15 +19,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#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) @@ -46,14 +46,13 @@ cmd_variable_labels (struct lexer *lexer, struct dataset *ds) if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE)) return CMD_FAILURE; - if (lex_token (lexer) != T_STRING) + if (!lex_force_string (lexer)) { - msg (SE, _("String expected for variable label.")); free (v); return CMD_FAILURE; } - ds_init_string (&label, lex_tokstr (lexer) ); + ds_init_substring (&label, lex_tokss (lexer)); if (ds_length (&label) > 255) { msg (SW, _("Truncating variable label to 255 characters.")); @@ -64,11 +63,11 @@ cmd_variable_labels (struct lexer *lexer, struct dataset *ds) ds_destroy (&label); lex_get (lexer); - while (lex_token (lexer) == '/') + while (lex_token (lexer) == T_SLASH) lex_get (lexer); free (v); } - while (lex_token (lexer) != '.'); + while (lex_token (lexer) != T_ENDCMD); return CMD_SUCCESS; }