X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fxforms%2Fcount.c;h=39f04574975faa4732cc682878937f888d1b222d;hb=48386ee68a5283653435d05a9ea4e449710fd370;hp=8afab3554ff99ff768fbcbf590c9dc3d95113637;hpb=888d0f91d57e0c3c5a4206c30ac71eb87bf44227;p=pspp-builds.git

diff --git a/src/language/xforms/count.c b/src/language/xforms/count.c
index 8afab355..39f04574 100644
--- a/src/language/xforms/count.c
+++ b/src/language/xforms/count.c
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -59,10 +58,10 @@ struct criteria
     struct criteria *next;
 
     /* Variables to count. */
-    struct variable **vars;
+    const struct variable **vars;
     size_t var_cnt;
 
-    /* Count special values?. */
+    /* Count special values? */
     bool count_system_missing;  /* Count system missing? */
     bool count_user_missing;    /* Count user missing? */
 
@@ -137,10 +136,11 @@ cmd_count (struct lexer *lexer, struct dataset *ds)
       for (;;)
 	{
           bool ok;
-          
+
 	  crit->next = NULL;
 	  crit->vars = NULL;
-	  if (!parse_variables (lexer, dataset_dict (ds), &crit->vars, &crit->var_cnt,
+	  if (!parse_variables_const (lexer, dataset_dict (ds), &crit->vars, 
+				      &crit->var_cnt,
                                 PV_DUPLICATE | PV_SAME_TYPE))
 	    goto fail;
           pool_register (trns->pool, free, crit->vars);
@@ -277,12 +277,14 @@ count_numeric (struct criteria *crit, struct ccase *c)
 
   for (i = 0; i < crit->var_cnt; i++)
     {
-      double x = case_num (c, crit->vars[i]->fv);
-      if (x == SYSMIS)
-        counter += crit->count_system_missing;
-      else if (crit->count_user_missing
-               && var_is_num_user_missing (crit->vars[i], x))
-        counter++;
+      double x = case_num (c, crit->vars[i]);
+      if (var_is_num_missing (crit->vars[i], x, MV_ANY))
+        {
+          if (x == SYSMIS
+              ? crit->count_system_missing
+              : crit->count_user_missing)
+            counter++; 
+        }
       else 
         {
           struct num_value *v;
@@ -311,7 +313,7 @@ count_string (struct criteria *crit, struct ccase *c)
     {
       char **v;
       for (v = crit->values.str; v < crit->values.str + crit->value_cnt; v++)
-        if (!memcmp (case_str (c, crit->vars[i]->fv), *v,
+        if (!memcmp (case_str (c, crit->vars[i]), *v,
                      var_get_width (crit->vars[i])))
           {
 	    counter++;
@@ -341,7 +343,7 @@ count_trns_proc (void *trns_, struct ccase *c,
 	  counter += count_numeric (crit, c);
 	else
 	  counter += count_string (crit, c);
-      case_data_rw (c, dv->var->fv)->f = counter;
+      case_data_rw (c, dv->var)->f = counter;
     }
   return TRNS_CONTINUE;
 }