02110-1301, USA. */
#include <config.h>
+
#include <stdio.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
+
+#include <data/procedure.h>
+#include <data/variable.h>
#include <language/command.h>
-#include <libpspp/message.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
+#include <libpspp/alloc.h>
+#include <libpspp/message.h>
#include <libpspp/str.h>
-#include <data/variable.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
int
-cmd_variable_labels (void)
+cmd_variable_labels (struct dataset *ds)
{
do
{
size_t i;
- if (!parse_variables (default_dict, &v, &nv, PV_NONE))
+ if (!parse_variables (dataset_dict (ds), &v, &nv, PV_NONE))
return CMD_FAILURE;
if (token != T_STRING)
{
if (v[i]->label)
free (v[i]->label);
- v[i]->label = xstrdup (ds_c_str (&tokstr));
+ v[i]->label = ds_xstrdup (&tokstr);
}
lex_get ();