02110-1301, USA. */
#include <config.h>
+
#include <stdio.h>
#include <stdlib.h>
-#include "alloc.h"
-#include "command.h"
-#include "message.h"
-#include "lexer.h"
-#include "str.h"
-#include "variable.h"
+
+#include <data/procedure.h>
+#include <data/variable.h>
+#include <language/command.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 "gettext.h"
#define _(msgid) gettext (msgid)
-#include "debug-print.h"
-
int
-cmd_variable_labels (void)
+cmd_variable_labels (struct lexer *lexer, struct dataset *ds)
{
do
{
struct variable **v;
+ struct string label;
size_t nv;
size_t i;
- if (!parse_variables (default_dict, &v, &nv, PV_NONE))
- return CMD_PART_SUCCESS_MAYBE;
+ if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
+ return CMD_FAILURE;
- if (token != T_STRING)
+ if (lex_token (lexer) != T_STRING)
{
msg (SE, _("String expected for variable label."));
free (v);
- return CMD_PART_SUCCESS_MAYBE;
+ return CMD_FAILURE;
}
- if (ds_length (&tokstr) > 255)
+
+ ds_init_string (&label, lex_tokstr (lexer) );
+ if (ds_length (&label) > 255)
{
msg (SW, _("Truncating variable label to 255 characters."));
- ds_truncate (&tokstr, 255);
+ ds_truncate (&label, 255);
}
for (i = 0; i < nv; i++)
- {
- if (v[i]->label)
- free (v[i]->label);
- v[i]->label = xstrdup (ds_c_str (&tokstr));
- }
+ var_set_label (v[i], ds_cstr (&label));
+ ds_destroy (&label);
- lex_get ();
- while (token == '/')
- lex_get ();
+ lex_get (lexer);
+ while (lex_token (lexer) == '/')
+ lex_get (lexer);
free (v);
}
- while (token != '.');
+ while (lex_token (lexer) != '.');
return CMD_SUCCESS;
}
const char *
var_to_string(const struct variable *var)
{
+ const char *label;
+
if ( !var )
return 0;
- return ( var->label ? var->label : var->name);
+ label = var_get_label (var);
+ return label ? label : var_get_name (var);
}