X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fstats%2Fnpar.q;fp=src%2Flanguage%2Fstats%2Fnpar.q;h=4caa112aefe8895555add598c773518078f5415d;hb=3c52a21736b3777ced3e47148fa2fc8f9eff59c8;hp=34e03677dc9bc145568a910c05a1ea83a063d4e5;hpb=9b9dfe7713224261faec0d42c15e3dd76ec0282f;p=pspp-builds.git diff --git a/src/language/stats/npar.q b/src/language/stats/npar.q index 34e03677..4caa112a 100644 --- a/src/language/stats/npar.q +++ b/src/language/stats/npar.q @@ -356,27 +356,24 @@ npar_custom_binomial (struct lexer *lexer, struct dataset *ds, { lex_force_num (lexer); btp->category1 = lex_number (lexer); - lex_get (lexer); - if ( ! lex_force_match (lexer, ',')) return 2; - if ( ! lex_force_num (lexer) ) return 2; - btp->category2 = lex_number (lexer); - lex_get (lexer); + lex_get (lexer); + if ( lex_match (lexer, ',')) + { + if ( ! lex_force_num (lexer) ) return 2; + btp->category2 = lex_number (lexer); + lex_get (lexer); + } + else + { + btp->cutpoint = btp->category1; + } + lex_force_match (lexer, ')'); } } else return 2; } - else - { - if ( lex_match (lexer, '(') ) - { - lex_force_num (lexer); - btp->cutpoint = lex_number (lexer); - lex_get (lexer); - lex_force_match (lexer, ')'); - } - } specs->n_tests++; specs->test = pool_realloc (specs->pool,