X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fnpar.c;h=3f2bae298ef45669cd6331f896c160d0988ff465;hb=49239dc60d3bfe5a29b6f08b176783dd72804d91;hp=7dd94f7813df4f4f11ed5690f002bb6e6c65f74b;hpb=55e6e7ba37a30570f5a31e2d78c22dfa7b61a36f;p=pspp-builds.git

diff --git a/src/language/stats/npar.c b/src/language/stats/npar.c
index 7dd94f78..3f2bae29 100644
--- a/src/language/stats/npar.c
+++ b/src/language/stats/npar.c
@@ -158,7 +158,7 @@ parse_npar_tests (struct lexer *lexer, struct dataset *ds, struct cmd_npar_tests
   memset (npt->a_statistics, 0, sizeof npt->a_statistics);
   for (;;)
     {
-      if (lex_match_hyphenated_word (lexer, "COCHRAN"))
+      if (lex_match_id (lexer, "COCHRAN"))
 	{
           npt->cochran++;
           switch (npar_cochran (lexer, ds, nps))
@@ -174,7 +174,7 @@ parse_npar_tests (struct lexer *lexer, struct dataset *ds, struct cmd_npar_tests
               NOT_REACHED ();
             }
 	}
-      else if (lex_match_hyphenated_word (lexer, "FRIEDMAN"))
+      else if (lex_match_id (lexer, "FRIEDMAN"))
 	{
           npt->friedman++;
           switch (npar_friedman (lexer, ds, nps))
@@ -190,7 +190,7 @@ parse_npar_tests (struct lexer *lexer, struct dataset *ds, struct cmd_npar_tests
               NOT_REACHED ();
             }
 	}
-      else if (lex_match_hyphenated_word (lexer, "KENDALL"))
+      else if (lex_match_id (lexer, "KENDALL"))
 	{
           npt->kendall++;
           switch (npar_kendall (lexer, ds, nps))
@@ -206,7 +206,7 @@ parse_npar_tests (struct lexer *lexer, struct dataset *ds, struct cmd_npar_tests
               NOT_REACHED ();
             }
 	}
-      else if (lex_match_hyphenated_word (lexer, "RUNS"))
+      else if (lex_match_id (lexer, "RUNS"))
 	{
           npt->runs++;
           switch (npar_runs (lexer, ds, nps))
@@ -222,7 +222,7 @@ parse_npar_tests (struct lexer *lexer, struct dataset *ds, struct cmd_npar_tests
               NOT_REACHED ();
             }
 	}
-      else if (lex_match_hyphenated_word (lexer, "CHISQUARE"))
+      else if (lex_match_id (lexer, "CHISQUARE"))
         {
           lex_match (lexer, T_EQUALS);
           npt->chisquare++;
@@ -235,11 +235,13 @@ 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 ();
             }
         }
-      else if (lex_match_hyphenated_word (lexer, "BINOMIAL"))
+      else if (lex_match_id (lexer, "BINOMIAL"))
         {
           lex_match (lexer, T_EQUALS);
           npt->binomial++;
@@ -292,7 +294,7 @@ parse_npar_tests (struct lexer *lexer, struct dataset *ds, struct cmd_npar_tests
               NOT_REACHED ();
             }
         }
-      else if (lex_match_hyphenated_word (lexer, "WILCOXON"))
+      else if (lex_match_id (lexer, "WILCOXON"))
         {
           lex_match (lexer, T_EQUALS);
           npt->wilcoxon++;
@@ -309,7 +311,7 @@ parse_npar_tests (struct lexer *lexer, struct dataset *ds, struct cmd_npar_tests
               NOT_REACHED ();
             }
         }
-      else if (lex_match_hyphenated_word (lexer, "SIGN"))
+      else if (lex_match_id (lexer, "SIGN"))
         {
           lex_match (lexer, T_EQUALS);
           npt->sign++;
@@ -326,7 +328,7 @@ parse_npar_tests (struct lexer *lexer, struct dataset *ds, struct cmd_npar_tests
               NOT_REACHED ();
             }
         }
-      else if (lex_match_hyphenated_word (lexer, "MISSING"))
+      else if (lex_match_id (lexer, "MISSING"))
         {
           lex_match (lexer, T_EQUALS);
           npt->missing++;
@@ -337,13 +339,13 @@ parse_npar_tests (struct lexer *lexer, struct dataset *ds, struct cmd_npar_tests
             }
           while (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD)
             {
-              if (lex_match_hyphenated_word (lexer, "ANALYSIS"))
+              if (lex_match_id (lexer, "ANALYSIS"))
                 npt->miss = MISS_ANALYSIS;
-              else if (lex_match_hyphenated_word (lexer, "LISTWISE"))
+              else if (lex_match_id (lexer, "LISTWISE"))
                 npt->miss = MISS_LISTWISE;
-              else if (lex_match_hyphenated_word (lexer, "INCLUDE"))
+              else if (lex_match_id (lexer, "INCLUDE"))
                 nps->filter = MV_SYSTEM;
-              else if (lex_match_hyphenated_word (lexer, "EXCLUDE"))
+              else if (lex_match_id (lexer, "EXCLUDE"))
                 nps->filter = MV_ANY;
               else
                 {
@@ -353,7 +355,7 @@ parse_npar_tests (struct lexer *lexer, struct dataset *ds, struct cmd_npar_tests
               lex_match (lexer, T_COMMA);
             }
         }
-      else if (lex_match_hyphenated_word (lexer, "METHOD"))
+      else if (lex_match_id (lexer, "METHOD"))
         {
           lex_match (lexer, T_EQUALS);
           npt->method++;
@@ -375,15 +377,15 @@ parse_npar_tests (struct lexer *lexer, struct dataset *ds, struct cmd_npar_tests
               NOT_REACHED ();
             }
         }
-      else if (lex_match_hyphenated_word (lexer, "STATISTICS"))
+      else if (lex_match_id (lexer, "STATISTICS"))
         {
           lex_match (lexer, T_EQUALS);
           npt->statistics++;
           while (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD)
             {
-              if (lex_match_hyphenated_word (lexer, "DESCRIPTIVES"))
+              if (lex_match_id (lexer, "DESCRIPTIVES"))
                 npt->a_statistics[NPAR_ST_DESCRIPTIVES] = 1;
-              else if (lex_match_hyphenated_word (lexer, "QUARTILES"))
+              else if (lex_match_id (lexer, "QUARTILES"))
                 npt->a_statistics[NPAR_ST_QUARTILES] = 1;
               else if (lex_match (lexer, T_ALL))
                 npt->a_statistics[NPAR_ST_ALL] = 1;
@@ -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;
 }
 
 
@@ -826,6 +828,7 @@ npar_binomial (struct lexer *lexer, struct dataset *ds,
   struct binomial_test *btp = pool_alloc (specs->pool, sizeof (*btp));
   struct one_sample_test *tp = &btp->parent;
   struct npar_test *nt = &tp->parent;
+  bool equals;
 
   nt->execute = binomial_execute;
   nt->insert_variables = one_sample_insert_variables;
@@ -836,6 +839,7 @@ npar_binomial (struct lexer *lexer, struct dataset *ds,
 
   if ( lex_match (lexer, T_LPAREN) )
     {
+      equals = false;
       if ( lex_force_num (lexer) )
 	{
 	  btp->p = lex_number (lexer);
@@ -846,10 +850,9 @@ npar_binomial (struct lexer *lexer, struct dataset *ds,
 	return 0;
     }
   else
-    /* Kludge: q2c swallows the '=' so put it back here  */
-     lex_put_back (lexer, T_EQUALS);
+    equals = true;
 
-  if (lex_match (lexer, T_EQUALS) )
+  if (equals || lex_match (lexer, T_EQUALS) )
     {
       if (parse_variables_const_pool (lexer, specs->pool, dataset_dict (ds),
 				      &tp->vars, &tp->n_vars,