X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fxforms%2Fcount.c;h=716c5d3999a1d2df7b3d9548ec222b9c60feb11d;hb=8297784ffdab47d35820735eb130a484ba9b6c01;hp=8673c6de2435fd6b71ce7ad563ccc9c274885b6f;hpb=81fff61a96bece351e381ad3fef8ab1248a952ba;p=pspp

diff --git a/src/language/xforms/count.c b/src/language/xforms/count.c
index 8673c6de24..716c5d3999 100644
--- a/src/language/xforms/count.c
+++ b/src/language/xforms/count.c
@@ -29,6 +29,7 @@
 #include <language/command.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/range-parser.h>
+#include <language/lexer/variable-parser.h>
 #include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <libpspp/message.h>
@@ -116,7 +117,7 @@ cmd_count (void)
       /* Get destination variable, or at least its name. */
       if (!lex_force_id ())
 	goto fail;
-      dv->var = dict_lookup_var (default_dict, tokid);
+      dv->var = dict_lookup_var (dataset_dict (current_dataset), tokid);
       if (dv->var != NULL)
         {
           if (dv->var->type == ALPHA)
@@ -139,7 +140,7 @@ cmd_count (void)
           
 	  crit->next = NULL;
 	  crit->vars = NULL;
-	  if (!parse_variables (default_dict, &crit->vars, &crit->var_cnt,
+	  if (!parse_variables (dataset_dict (current_dataset), &crit->vars, &crit->var_cnt,
                                 PV_DUPLICATE | PV_SAME_TYPE))
 	    goto fail;
           pool_register (trns->pool, free, crit->vars);
@@ -175,13 +176,13 @@ cmd_count (void)
       {
 	/* It's valid, though motivationally questionable, to count to
 	   the same dest var more than once. */
-	dv->var = dict_lookup_var (default_dict, dv->name);
+	dv->var = dict_lookup_var (dataset_dict (current_dataset), dv->name);
 
 	if (dv->var == NULL) 
-          dv->var = dict_create_var_assert (default_dict, dv->name, 0);
+          dv->var = dict_create_var_assert (dataset_dict (current_dataset), dv->name, 0);
       }
 
-  add_transformation (count_trns_proc, count_trns_free, trns);
+  add_transformation (current_dataset, count_trns_proc, count_trns_free, trns);
   return CMD_SUCCESS;
 
 fail:
@@ -254,7 +255,7 @@ parse_string_criteria (struct pool *pool, struct criteria *crit)
 	return false;
       cur = &crit->values.str[crit->value_cnt++];
       *cur = pool_alloc (pool, len + 1);
-      str_copy_rpad (*cur, len + 1, ds_c_str (&tokstr));
+      str_copy_rpad (*cur, len + 1, ds_cstr (&tokstr));
       lex_get ();
 
       lex_match (',');
@@ -324,7 +325,7 @@ count_string (struct criteria *crit, struct ccase *c)
 /* Performs the COUNT transformation T on case C. */
 static int
 count_trns_proc (void *trns_, struct ccase *c,
-                 int case_num UNUSED)
+                 casenum_t case_num UNUSED)
 {
   struct count_trns *trns = trns_;
   struct dst_var *dv;