From 49239dc60d3bfe5a29b6f08b176783dd72804d91 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Tue, 21 Dec 2010 00:12:09 -0800
Subject: [PATCH] NPAR TESTS: Fix two test failures.
Tests "NPAR TESTS CHISQUARE with DESCRIPTIVES" and "NPAR TESTS CHISQUARE,
listwise missing" were failing because of some unexpected behavior of
lex_put_back(). This fixes the problem by avoiding lex_put_back()
entirely.
---
src/language/stats/npar.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/language/stats/npar.c b/src/language/stats/npar.c
index 73db1ad0b3..3f2bae298e 100644
--- a/src/language/stats/npar.c
+++ b/src/language/stats/npar.c
@@ -235,6 +235,8 @@ parse_npar_tests (struct lexer *lexer, struct dataset *ds, struct cmd_npar_tests
case 2:
lex_error (lexer, NULL);
goto lossage;
+ case 3:
+ continue;
default:
NOT_REACHED ();
}
@@ -720,7 +722,7 @@ npar_chisquare (struct lexer *lexer, struct dataset *ds,
struct chisquare_test *cstp = pool_alloc (specs->pool, sizeof (*cstp));
struct one_sample_test *tp = &cstp->parent;
struct npar_test *nt = &tp->parent;
-
+ int retval = 1;
nt->execute = chisquare_execute;
nt->insert_variables = one_sample_insert_variables;
@@ -794,7 +796,7 @@ npar_chisquare (struct lexer *lexer, struct dataset *ds,
}
}
else
- lex_put_back (lexer, T_SLASH);
+ retval = 3;
}
if ( cstp->ranged && cstp->n_expected > 0 &&
@@ -815,7 +817,7 @@ npar_chisquare (struct lexer *lexer, struct dataset *ds,
specs->test[specs->n_tests - 1] = nt;
- return 1;
+ return retval;
}
--
2.30.2