projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lexer: Change the functions for retrieving token strings.
[pspp]
/
src
/
language
/
dictionary
/
variable-label.c
diff --git
a/src/language/dictionary/variable-label.c
b/src/language/dictionary/variable-label.c
index 6ddb00a5ef6f8443e9b0e166e179af9fd71a329a..804a4213d1c4ac8967c8ec1f18b4e8e6322c6e66 100644
(file)
--- a/
src/language/dictionary/variable-label.c
+++ b/
src/language/dictionary/variable-label.c
@@
-1,84
+1,75
@@
-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc.
- This program is free software
; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
-
License, or
(at your option) any later version.
+ This program is free software
: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful,
but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+
but
WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ G
NU G
eneral Public License for more details.
You should have received a copy of the GNU General Public License
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <config.h>
+
#include <stdio.h>
#include <stdlib.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/message.h>
+#include <libpspp/str.h>
+
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
-#include "debug-print.h"
-
int
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))
- return CMD_
PART_SUCCESS_MAYB
E;
+ if (!parse_variables (
lexer, dataset_dict (ds)
, &v, &nv, PV_NONE))
+ return CMD_
FAILUR
E;
- if (
token != T_STRING
)
+ if (
!lex_force_string (lexer)
)
{
{
- msg (SE, _("String expected for variable label."));
free (v);
free (v);
- return CMD_
PART_SUCCESS_MAYB
E;
+ return CMD_
FAILUR
E;
}
}
- if (ds_length (&tokstr) > 255)
+
+ ds_init_substring (&label, lex_tokss (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) == T_SLASH
)
+ lex_get (
lexer
);
free (v);
}
free (v);
}
- while (
token != '.'
);
+ while (
lex_token (lexer) != T_ENDCMD
);
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);
-}