projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename Dataset dialog: Add spacing and help button
[pspp]
/
src
/
language
/
stats
/
t-test-parser.c
diff --git
a/src/language/stats/t-test-parser.c
b/src/language/stats/t-test-parser.c
index 089d0dd8a691db2d76c636afe91969ca95c16ce2..660997e95c25ffa4b7af3c452a7771f8a4f7f80a 100644
(file)
--- a/
src/language/stats/t-test-parser.c
+++ b/
src/language/stats/t-test-parser.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* 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
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
@@
-100,8
+100,9
@@
cmd_t_test (struct lexer *lexer, struct dataset *ds)
value_init (&gval0, var_get_width (gvar));
parse_value (lexer, &gval0, gvar);
cut = true;
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;
value_init (&gval1, var_get_width (gvar));
parse_value (lexer, &gval1, gvar);
cut = false;
@@
-120,8
+121,8
@@
cmd_t_test (struct lexer *lexer, struct dataset *ds)
if ( cut == true && var_is_alpha (gvar))
{
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;
}
}
goto parse_failed;
}
}
@@
-132,7
+133,7
@@
cmd_t_test (struct lexer *lexer, struct dataset *ds)
if (tt.n_vars > 0)
{
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;
}
goto parse_failed;
}
@@
-228,7
+229,7
@@
cmd_t_test (struct lexer *lexer, struct dataset *ds)
{
if ( tt.mode == MODE_PAIRED)
{
{
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;
}
goto parse_failed;
}
@@
-272,7
+273,7
@@
cmd_t_test (struct lexer *lexer, struct dataset *ds)
else if (lex_match_id (lexer, "CRITERIA"))
{
lex_match (lexer, T_EQUALS);
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 ( lex_force_match (lexer, T_LPAREN))
{
lex_force_num (lexer);
@@
-297,7
+298,7
@@
cmd_t_test (struct lexer *lexer, struct dataset *ds)
if (tt.n_vars == 0 && tt.mode != MODE_PAIRED)
{
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;
}
goto parse_failed;
}