-/* 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, 2009 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
+ GNU General Public License for more details.
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 <stdio.h>
#include <stdlib.h>
-#include "alloc.h"
-#include "command.h"
-#include "message.h"
-#include "hash.h"
-#include "lexer.h"
-#include "str.h"
-#include "value-labels.h"
-#include "variable.h"
+
+#include <data/procedure.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
+#include <language/command.h>
+#include <language/lexer/lexer.h>
+#include <language/lexer/value-parser.h>
+#include <language/lexer/variable-parser.h>
+#include <libpspp/hash.h>
+#include <libpspp/message.h>
+#include <libpspp/str.h>
+
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
\f
/* Declarations. */
-static int do_value_labels (int);
-static int verify_val_labs (struct variable **vars, size_t var_cnt);
+static int do_value_labels (struct lexer *,
+ const struct dictionary *dict, bool);
static void erase_labels (struct variable **vars, size_t var_cnt);
-static int get_label (struct variable **vars, size_t var_cnt);
+static int get_label (struct lexer *, struct variable **vars, size_t var_cnt);
\f
/* Stubs. */
int
-cmd_value_labels (void)
+cmd_value_labels (struct lexer *lexer, struct dataset *ds)
{
- return do_value_labels (1);
+ return do_value_labels (lexer, dataset_dict (ds), true);
}
int
-cmd_add_value_labels (void)
+cmd_add_value_labels (struct lexer *lexer, struct dataset *ds)
{
- return do_value_labels (0);
+ return do_value_labels (lexer, dataset_dict (ds), false);
}
\f
/* Do it. */
static int
-do_value_labels (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. */
int parse_err=0; /* true if error parsing variables */
- lex_match ('/');
-
- while (token != '.')
+ lex_match (lexer, '/');
+
+ while (lex_token (lexer) != '.')
{
- parse_err = !parse_variables (default_dict, &vars, &var_cnt,
- PV_SAME_TYPE) ;
+ parse_err = !parse_variables (lexer, dict, &vars, &var_cnt,
+ PV_SAME_WIDTH);
if (var_cnt < 1)
{
free(vars);
return CMD_FAILURE;
}
- if (!verify_val_labs (vars, var_cnt))
- goto lossage;
if (erase)
erase_labels (vars, var_cnt);
- while (token != '/' && token != '.')
- if (!get_label (vars, var_cnt))
+ while (lex_token (lexer) != '/' && lex_token (lexer) != '.')
+ if (!get_label (lexer, vars, var_cnt))
goto lossage;
- if (token != '/')
+ if (lex_token (lexer) != '/')
{
- free (vars);
- break;
+ free (vars);
+ break;
}
- lex_get ();
+ lex_get (lexer);
free (vars);
}
- if (token != '.')
- {
- lex_error (NULL);
- return CMD_TRAILING_GARBAGE;
- }
+ if (parse_err)
+ return CMD_FAILURE;
- return parse_err ? CMD_PART_SUCCESS_MAYBE : CMD_SUCCESS;
+ return lex_end_of_command (lexer);
lossage:
free (vars);
- return CMD_PART_SUCCESS_MAYBE;
-}
-
-/* Verifies that none of the VAR_CNT variables in VARS are long
- string variables. */
-static int
-verify_val_labs (struct variable **vars, size_t var_cnt)
-{
- size_t i;
-
- for (i = 0; i < var_cnt; i++)
- {
- struct variable *vp = vars[i];
-
- if (vp->type == ALPHA && vp->width > MAX_SHORT_STRING)
- {
- msg (SE, _("It is not possible to assign value labels to long "
- "string variables such as %s."), vp->name);
- return 0;
- }
- }
- return 1;
+ return CMD_FAILURE;
}
/* Erases all the labels for the VAR_CNT variables in VARS. */
static void
-erase_labels (struct variable **vars, size_t var_cnt)
+erase_labels (struct variable **vars, size_t var_cnt)
{
size_t i;
/* 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
the specified labels to those variables. */
static int
-get_label (struct variable **vars, size_t var_cnt)
+get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt)
{
/* Parse all the labels and add them to the variables. */
do
{
+ int width = var_get_width (vars[0]);
union value value;
- char *label;
+ struct string label;
size_t i;
/* Set value. */
- if (vars[0]->type == ALPHA)
- {
- if (token != T_STRING)
- {
- lex_error (_("expecting string"));
- return 0;
- }
- buf_copy_str_rpad (value.s, MAX_SHORT_STRING, ds_c_str (&tokstr));
- }
- else
- {
- if (!lex_is_number ())
- {
- lex_error (_("expecting integer"));
- return 0;
- }
- if (!lex_is_integer ())
- msg (SW, _("Value label `%g' is not integer."), tokval);
- value.f = tokval;
- }
- lex_get ();
+ value_init (&value, width);
+ if (!parse_value (lexer, &value, width))
+ {
+ value_destroy (&value, width);
+ return 0;
+ }
+ lex_match (lexer, ',');
/* Set label. */
- if (!lex_force_string ())
- return 0;
- if (ds_length (&tokstr) > 60)
+ if (lex_token (lexer) != T_ID && !lex_force_string (lexer))
+ {
+ value_destroy (&value, width);
+ return 0;
+ }
+
+ ds_init_string (&label, lex_tokstr (lexer));
+
+ if (ds_length (&label) > 60)
{
msg (SW, _("Truncating value label to 60 characters."));
- ds_truncate (&tokstr, 60);
+ ds_truncate (&label, 60);
}
- label = ds_c_str (&tokstr);
for (i = 0; i < var_cnt; i++)
- val_labs_replace (vars[i]->val_labs, value, label);
+ var_replace_value_label (vars[i], &value, ds_cstr (&label));
+
+ ds_destroy (&label);
+ value_destroy (&value, width);
- lex_get ();
+ lex_get (lexer);
+ lex_match (lexer, ',');
}
- while (token != '/' && token != '.');
+ while (lex_token (lexer) != '/' && lex_token (lexer) != '.');
return 1;
}
projects / pspp-builds.git / blobdiff