Eliminated global variable current_dataset.

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

diff --git a/src/language/lexer/variable-parser.h b/src/language/lexer/variable-parser.h
index f71a778e467841f6213b43c0227fa2c5de874161..9760d857e9969f340135664bd4cf9f938d808826 100644 (file)
--- a/src/language/lexer/variable-parser.h
+++ b/src/language/lexer/variable-parser.h
@@ -55,8 +55,7 @@ enum
     PV_NO_SCRATCH = 00200      /* Disallow scratch variables. */
   };
 
-struct variable *parse_variable (void);
-struct variable *parse_dict_variable (const struct dictionary *);
+struct variable *parse_variable (const struct dictionary *);
 bool parse_variables (const struct dictionary *, struct variable ***, size_t *,
                      int opts);
 bool parse_variables_pool (struct pool *, const struct dictionary *,
@@ -66,8 +65,10 @@ bool parse_var_set_vars (const struct var_set *, struct variable ***, size_t *,
 bool parse_DATA_LIST_vars (char ***names, size_t *cnt, int opts);
 bool parse_DATA_LIST_vars_pool (struct pool *,
                                char ***names, size_t *cnt, int opts);
-bool parse_mixed_vars (char ***names, size_t *cnt, int opts);
-bool parse_mixed_vars_pool (struct pool *,
+bool parse_mixed_vars (const struct dictionary *dict, 
+                      char ***names, size_t *cnt, int opts);
+bool parse_mixed_vars_pool (const struct dictionary *dict, 
+                           struct pool *,
                            char ***names, size_t *cnt, int opts);
 
 #endif /* variable-parser.h */