X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fstats%2Fnpar.c;h=fbcdeae058e1dd1c47abc8cdcab01c905496598b;hb=f00116ec886367a8ad9eec72563cc2bdac7fe67c;hp=af41b104731665e4adb4202d609de00fa8f77a7d;hpb=12d4a074ba62c675df7b31a23fd7eacc3aff6485;p=pspp diff --git a/src/language/stats/npar.c b/src/language/stats/npar.c index af41b10473..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))