/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
/* Declarations. */
static int do_value_labels (struct lexer *,
- const struct dictionary *dict, int);
+ const struct dictionary *dict, bool);
static int verify_val_labs (struct variable **vars, size_t var_cnt);
static void erase_labels (struct variable **vars, size_t var_cnt);
static int get_label (struct lexer *, struct variable **vars, size_t var_cnt);
int
cmd_value_labels (struct lexer *lexer, struct dataset *ds)
{
- return do_value_labels (lexer, dataset_dict (ds), 1);
+ return do_value_labels (lexer, dataset_dict (ds), true);
}
int
cmd_add_value_labels (struct lexer *lexer, struct dataset *ds)
{
- return do_value_labels (lexer, dataset_dict (ds), 0);
+ return do_value_labels (lexer, dataset_dict (ds), false);
}
\f
/* Do it. */
static int
-do_value_labels (struct lexer *lexer, const struct dictionary *dict, int erase)
+do_value_labels (struct lexer *lexer, const struct dictionary *dict, bool erase)
{
struct variable **vars; /* Variable list. */
size_t var_cnt; /* Number of variables. */
for (i = 0; i < var_cnt; i++)
{
- struct variable *vp = vars[i];
+ const struct variable *vp = vars[i];
- if (vp->type == ALPHA && vp->width > MAX_SHORT_STRING)
+ if (var_is_long_string (vp))
{
msg (SE, _("It is not possible to assign value labels to long "
- "string variables such as %s."), vp->name);
+ "string variables such as %s."), var_get_name (vp));
return 0;
}
}
/* Erase old value labels if desired. */
for (i = 0; i < var_cnt; i++)
- val_labs_clear (vars[i]->val_labs);
+ var_clear_value_labels (vars[i]);
}
/* Parse all the labels for the VAR_CNT variables in VARS and add
size_t i;
/* Set value. */
- if (vars[0]->type == ALPHA)
+ if (var_is_alpha (vars[0]))
{
if (lex_token (lexer) != T_STRING)
{
}
for (i = 0; i < var_cnt; i++)
- val_labs_replace (vars[i]->val_labs, value, ds_cstr (&label));
+ var_replace_value_label (vars[i], &value, ds_cstr (&label));
ds_destroy (&label);