/* PSPP - a program for statistical analysis.
- Copyright (C) 2011 Free Software Foundation, Inc.
+ Copyright (C) 2011, 2015 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
value_init (&gval0, var_get_width (gvar));
parse_value (lexer, &gval0, gvar);
cut = true;
- if (lex_match (lexer, T_COMMA))
+ if (lex_token (lexer) != T_RPAREN)
{
+ lex_match (lexer, T_COMMA);
value_init (&gval1, var_get_width (gvar));
parse_value (lexer, &gval1, gvar);
cut = false;
if ( cut == true && var_is_alpha (gvar))
{
- msg (SE, _("When applying GROUPS to a string variable, two "
- "values must be specified."));
+ msg (SE, _("When applying %s to a string variable, two "
+ "values must be specified."), "GROUPS");
goto parse_failed;
}
}
if (tt.n_vars > 0)
{
- msg (SE, _("VARIABLES subcommand may not be used with PAIRS."));
+ msg (SE, _("%s subcommand may not be used with %s."), "VARIABLES", "PAIRS");
goto parse_failed;
}
{
if ( tt.mode == MODE_PAIRED)
{
- msg (SE, _("VARIABLES subcommand may not be used with PAIRS."));
+ msg (SE, _("%s subcommand may not be used with %s."), "VARIABLES", "PAIRS");
goto parse_failed;
}
else if (lex_match_id (lexer, "CRITERIA"))
{
lex_match (lexer, T_EQUALS);
- if ( lex_force_match_id (lexer, "CIN"))
+ if ( lex_match_id (lexer, "CIN") || lex_force_match_id (lexer, "CI"))
if ( lex_force_match (lexer, T_LPAREN))
{
lex_force_num (lexer);
if (tt.n_vars == 0 && tt.mode != MODE_PAIRED)
{
- msg (SE, _("One or more VARIABLES must be specified."));
+ lex_sbc_missing ("VARIABLES");
goto parse_failed;
}