X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Ft-test-parser.c;h=9a0043aa45761db7771a25a96a2f7db02b046e39;hb=c84078d8498785e9a52945cc63fb663cd48027af;hp=089d0dd8a691db2d76c636afe91969ca95c16ce2;hpb=90a008db8b2f6e5bec903e584eb68e9bb20c061e;p=pspp

diff --git a/src/language/stats/t-test-parser.c b/src/language/stats/t-test-parser.c
index 089d0dd8a6..9a0043aa45 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
@@ -44,9 +44,9 @@ cmd_t_test (struct lexer *lexer, struct dataset *ds)
 
   /* Variables pertaining to the paired mode */
   const struct variable **v1 = NULL;
-  size_t n_v1;
+  size_t n_v1 = 0;
   const struct variable **v2 = NULL;
-  size_t n_v2;
+  size_t n_v2 = 0;
 	  
   size_t n_pairs = 0;
   vp *pairs = NULL;
@@ -80,7 +80,8 @@ cmd_t_test (struct lexer *lexer, struct dataset *ds)
 	  mode_count++;
 	  tt.mode = MODE_SINGLE;
 	  lex_match (lexer, T_EQUALS);
-	  lex_force_num (lexer);
+	  if (!lex_force_num (lexer))
+	    goto parse_failed;
 	  testval = lex_number (lexer);
 	  lex_get (lexer);
 	}
@@ -100,14 +101,16 @@ 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;
 		}
 
-	      lex_force_match (lexer, T_RPAREN);
+	      if (! lex_force_match (lexer, T_RPAREN))
+		goto parse_failed;
 	    }
 	  else
 	    {
@@ -120,8 +123,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 +135,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 +231,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,13 +275,15 @@ 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);
+		if (!lex_force_num (lexer))
+		  goto parse_failed;
 		tt.confidence = lex_number (lexer);
 		lex_get (lexer);
-		lex_force_match (lexer, T_RPAREN);
+		if (! lex_force_match (lexer, T_RPAREN))
+		  goto parse_failed;
 	      }
 	}
       else 
@@ -297,7 +302,7 @@ cmd_t_test (struct lexer *lexer, struct dataset *ds)
 
   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;
     }
 
@@ -362,12 +367,17 @@ cmd_t_test (struct lexer *lexer, struct dataset *ds)
   free (pairs);
   free (v1);
   free (v2);
-
   free (tt.vars);
 
   return ok ? CMD_SUCCESS : CMD_FAILURE;
 
  parse_failed:
+
+  free (pairs);
+  free (v1);
+  free (v2);
+  free (tt.vars);
+
   return CMD_FAILURE;
 }