/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2010 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
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."));
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;
}