X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Ft-test-parser.c;h=660997e95c25ffa4b7af3c452a7771f8a4f7f80a;hb=1ce269be245e84fce66e071f195a28ac93ad8c54;hp=3ce1d028f9221eba42bca6119f8ffcb64c269ea3;hpb=da1bf03a84fa10f04e8c5438f22b523f0480dd7d;p=pspp

diff --git a/src/language/stats/t-test-parser.c b/src/language/stats/t-test-parser.c
index 3ce1d028f9..660997e95c 100644
--- 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.
-   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
@@ -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;
-	      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;
@@ -120,8 +121,8 @@ cmd_t_test (struct lexer *lexer, struct dataset *ds)
 
 	  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;
 	    }
 	}
@@ -132,7 +133,7 @@ cmd_t_test (struct lexer *lexer, struct dataset *ds)
 
 	  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;
 	    }
 
@@ -228,7 +229,7 @@ cmd_t_test (struct lexer *lexer, struct dataset *ds)
 	{
 	  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;
 	    }
 
@@ -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);
-	  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);