Change identifiers for consistency with other commands
authorJohn Darrington <john@darrington.wattle.id.au>
Fri, 8 Oct 2010 17:45:49 +0000 (19:45 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Sat, 9 Oct 2010 07:40:31 +0000 (09:40 +0200)
src/language/stats/npar.c

index 7ebb12c4bfd471557510ed9c859df4fb780c92c6..97cb7c7bf1c750a171edfcb4fa7f51d0c5a549d4 100644 (file)
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-struct dataset;
 /* Settings for subcommand specifiers. */
-enum
+enum missing_type
   {
-    NPAR_ANALYSIS,
-    NPAR_LISTWISE,
+    MISS_ANALYSIS,
+    MISS_LISTWISE,
   };
 
 enum
@@ -141,7 +140,7 @@ parse_npar_tests (struct lexer *lexer, struct dataset *ds, struct cmd_npar_tests
   npt->wilcoxon = 0;
   npt->sign = 0;
   npt->missing = 0;
-  npt->miss = NPAR_ANALYSIS;
+  npt->miss = MISS_ANALYSIS;
   npt->incl = NPAR_EXCLUDE;
   npt->method = 0;
   npt->statistics = 0;
@@ -228,9 +227,9 @@ parse_npar_tests (struct lexer *lexer, struct dataset *ds, struct cmd_npar_tests
           while (lex_token (lexer) != '/' && lex_token (lexer) != '.')
             {
               if (lex_match_hyphenated_word (lexer, "ANALYSIS"))
-                npt->miss = NPAR_ANALYSIS;
+                npt->miss = MISS_ANALYSIS;
               else if (lex_match_hyphenated_word (lexer, "LISTWISE"))
-                npt->miss = NPAR_LISTWISE;
+                npt->miss = MISS_LISTWISE;
               else if (lex_match_hyphenated_word (lexer, "INCLUDE"))
                 npt->incl = NPAR_INCLUDE;
               else if (lex_match_hyphenated_word (lexer, "EXCLUDE"))
@@ -421,7 +420,7 @@ cmd_npar_tests (struct lexer *lexer, struct dataset *ds)
   npar_specs.filter = cmd.incl == NPAR_EXCLUDE ? MV_ANY : MV_SYSTEM;
 
   input = proc_open (ds);
-  if ( cmd.miss == NPAR_LISTWISE )
+  if ( cmd.miss == MISS_LISTWISE )
     {
       input = casereader_create_filter_missing (input,
                                                npar_specs.vv,