projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
First step in making struct variable opaque: the boring mechanical
[pspp-builds.git]
/
src
/
language
/
dictionary
/
variable-label.c
diff --git
a/src/language/dictionary/variable-label.c
b/src/language/dictionary/variable-label.c
index 63d64ef5bc58df7f5c12dc8f1628226b537298cd..857c783c45b979a4f24b99f7ea202780b19bcac0 100644
(file)
--- a/
src/language/dictionary/variable-label.c
+++ b/
src/language/dictionary/variable-label.c
@@
-35,42
+35,42
@@
#define _(msgid) gettext (msgid)
int
#define _(msgid) gettext (msgid)
int
-cmd_variable_labels (
void
)
+cmd_variable_labels (
struct lexer *lexer, struct dataset *ds
)
{
do
{
struct variable **v;
{
do
{
struct variable **v;
+ struct string label;
size_t nv;
size_t i;
size_t nv;
size_t i;
- if (!parse_variables (
dataset_dict (current_dataset
), &v, &nv, PV_NONE))
+ if (!parse_variables (
lexer, dataset_dict (ds
), &v, &nv, PV_NONE))
return CMD_FAILURE;
return CMD_FAILURE;
- if (
token
!= T_STRING)
+ if (
lex_token (lexer)
!= T_STRING)
{
msg (SE, _("String expected for variable label."));
free (v);
return CMD_FAILURE;
}
{
msg (SE, _("String expected for variable label."));
free (v);
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."));
{
msg (SW, _("Truncating variable label to 255 characters."));
- ds_truncate (&
tokstr
, 255);
+ ds_truncate (&
label
, 255);
}
for (i = 0; i < nv; i++)
}
for (i = 0; i < nv; i++)
- {
- if (v[i]->label)
- free (v[i]->label);
- v[i]->label = ds_xstrdup (&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);
}
free (v);
}
- while (
token
!= '.');
+ while (
lex_token (lexer)
!= '.');
return CMD_SUCCESS;
}
return CMD_SUCCESS;
}
@@
-79,8
+79,11
@@
cmd_variable_labels (void)
const char *
var_to_string(const struct variable *var)
{
const char *
var_to_string(const struct variable *var)
{
+ const char *label;
+
if ( !var )
return 0;
if ( !var )
return 0;
- return ( var->label ? var->label : var->name);
+ label = var_get_label (var);
+ return label ? label : var_get_name (var);
}
}