X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fnpar.c;h=fbcdeae058e1dd1c47abc8cdcab01c905496598b;hb=c81095f27220e7896eb5b42df87d648538cfa5b9;hp=e277d36acccd887eee8687b925943634e0484a9e;hpb=28fc20c5b4c0d1a8b5f069026155c8e80f0ecbb3;p=pspp

diff --git a/src/language/stats/npar.c b/src/language/stats/npar.c
index e277d36acc..fbcdeae058 100644
--- a/src/language/stats/npar.c
+++ b/src/language/stats/npar.c
@@ -830,11 +830,11 @@ npar_chisquare (struct lexer *lexer, struct dataset *ds,
     {
       cstp->ranged = true;
       if ( ! lex_force_num (lexer)) return 0;
-      cstp->lo = lex_integer (lexer);
+      cstp->lo = lex_number (lexer);
       lex_get (lexer);
       lex_force_match (lexer, T_COMMA);
       if (! lex_force_num (lexer) ) return 0;
-      cstp->hi = lex_integer (lexer);
+      cstp->hi = lex_number (lexer);
       if ( cstp->lo >= cstp->hi )
 	{
 	  msg (ME,
@@ -945,7 +945,8 @@ npar_binomial (struct lexer *lexer, struct dataset *ds,
 	{
 	  if (lex_match (lexer, T_LPAREN))
 	    {
-	      lex_force_num (lexer);
+	      if (! lex_force_num (lexer))
+		return 2;
 	      btp->category1 = lex_number (lexer);
       	      lex_get (lexer);
 	      if ( lex_match (lexer, T_COMMA))
@@ -1080,7 +1081,7 @@ parse_two_sample_related_test (struct lexer *lexer,
   if (!parse_variables_const_pool (lexer, pool,
 				   dict,
 				   &vlist1, &n_vlist1,
-				   PV_NUMERIC | PV_NO_SCRATCH | PV_NO_DUPLICATE) )
+				   PV_NUMERIC | PV_NO_SCRATCH | PV_DUPLICATE) )
     return false;
 
   if ( lex_match (lexer, T_WITH))
@@ -1088,7 +1089,7 @@ parse_two_sample_related_test (struct lexer *lexer,
       with = true;
       if ( !parse_variables_const_pool (lexer, pool, dict,
 					&vlist2, &n_vlist2,
-					PV_NUMERIC | PV_NO_SCRATCH | PV_NO_DUPLICATE) )
+					PV_NUMERIC | PV_NO_SCRATCH | PV_DUPLICATE) )
 	return false;
 
       paired = (lex_match (lexer, T_LPAREN) &&
@@ -1101,9 +1102,12 @@ parse_two_sample_related_test (struct lexer *lexer,
       if (paired)
 	{
 	  if ( n_vlist1 != n_vlist2)
-	    msg (SE, _("PAIRED was specified but the number of variables "
+            {
+	      msg (SE, _("PAIRED was specified but the number of variables "
 		       "preceding WITH (%zu) did not match the number "
 		       "following (%zu)."), n_vlist1, n_vlist2);
+              return false;
+            }
 
 	  test_parameters->n_pairs = n_vlist1 ;
 	}