Fixed some bugs related to empty parentheses

[pspp] / src / language / stats / npar.c

diff --git a/src/language/stats/npar.c b/src/language/stats/npar.c
index af41b104731665e4adb4202d609de00fa8f77a7d..5d8d8742f9c51935a32966c17b7722e3acb59344 100644 (file)
--- a/src/language/stats/npar.c
+++ b/src/language/stats/npar.c
@@ -534,7 +534,7 @@ npar_execute (struct casereader *input,
       const struct npar_test *test = specs->test[t];
       if ( NULL == test->execute )
        {
-         msg (SW, _("NPAR subcommand not currently implemented."));
+         msg (SW, _("%s subcommand not currently implemented."), "NPAR");
          continue;
        }
       test->execute (ds, casereader_clone (input), specs->filter, test, specs->exact, specs->timer);
@@ -688,7 +688,7 @@ npar_runs (struct lexer *lexer, struct dataset *ds,
        }
       else
        {
-         lex_error (lexer, _("Expecting MEAN, MEDIAN, MODE or number"));
+         lex_error (lexer, _("Expecting %s, %s, %s or a number."), "MEAN", "MEDIAN", "MODE");
          return 0;
        }
                  
@@ -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))
@@ -1273,9 +1274,8 @@ npar_median (struct lexer *lexer,
 
   mt->median = SYSMIS;
 
-  if ( lex_match (lexer, T_LPAREN))
+  if ( lex_match (lexer, T_LPAREN) && lex_force_num (lexer))
     {
-      lex_force_num (lexer);
       mt->median = lex_number (lexer);
       lex_get (lexer);
       lex_force_match (lexer, T_RPAREN);