projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct name of function fn_is_special. Thanks to John McCabe-Dansted
[pspp]
/
src
/
language
/
dictionary
/
variable-label.c
diff --git
a/src/language/dictionary/variable-label.c
b/src/language/dictionary/variable-label.c
index a663dc9ddb458db614e204f43f01ec11f4148796..d56db519c7b6de40a44716084a6aaa7ad1d401ea 100644
(file)
--- a/
src/language/dictionary/variable-label.c
+++ b/
src/language/dictionary/variable-label.c
@@
-1,6
+1,5
@@
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
/* 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
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@
-18,65
+17,61
@@
02110-1301, USA. */
#include <config.h>
02110-1301, USA. */
#include <config.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
+
+#include <data/procedure.h>
+#include <data/variable.h>
#include <language/command.h>
#include <language/command.h>
-#include <libpspp/message.h>
#include <language/lexer/lexer.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 <libpspp/str.h>
-#include <data/variable.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
int
#include "gettext.h"
#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 (
default_dict
, &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 = 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);
}
free (v);
}
- while (
token
!= '.');
+ while (
lex_token (lexer)
!= '.');
return CMD_SUCCESS;
}
return CMD_SUCCESS;
}
-const char *
-var_to_string(const struct variable *var)
-{
- if ( !var )
- return 0;
-
- return ( var->label ? var->label : var->name);
-}