Encapsulated the static data of procedure.[ch] into a single object, to be

[pspp-builds.git] / src / language / lexer / variable-parser.c

diff --git a/src/language/lexer/variable-parser.c b/src/language/lexer/variable-parser.c
index a2068f02eaf2f3d568cc64fd77f33506c90a93f5..54a4e85c0e4158686f5514d0c78aeafa6b412c0a 100644 (file)
--- a/src/language/lexer/variable-parser.c
+++ b/src/language/lexer/variable-parser.c
@@ -87,13 +87,13 @@ parse_dict_variable (const struct dictionary *d)
   return var;
 }
 
-/* Parses a variable name in default_dict and returns the
+/* Parses a variable name in dataset_dict (current_dataset) and returns the
    variable if successful.  On failure emits an error message and
    returns a null pointer. */
 struct variable *
 parse_variable (void)
 {
-  return parse_dict_variable (default_dict);
+  return parse_dict_variable (dataset_dict (current_dataset));
 }
 
 
@@ -548,12 +548,12 @@ parse_mixed_vars (char ***names, size_t *nnames, int pv_opts)
     }
   while (token == T_ID || token == T_ALL)
     {
-      if (token == T_ALL || dict_lookup_var (default_dict, tokid) != NULL)
+      if (token == T_ALL || dict_lookup_var (dataset_dict (current_dataset), tokid) != NULL)
        {
          struct variable **v;
          size_t nv;
 
-         if (!parse_variables (default_dict, &v, &nv, PV_NONE))
+         if (!parse_variables (dataset_dict (current_dataset), &v, &nv, PV_NONE))
            goto fail;
          *names = xnrealloc (*names, *nnames + nv, sizeof **names);
          for (i = 0; i < nv; i++)