X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvector.c;h=16617f87e0b9e74f0864a22ccc285ee945d40f93;hb=f5dd6243820dbcd19c1d3201436fc01fffc475e5;hp=3be0723f705d0da04534011c2a2e884d7728755a;hpb=55e6e7ba37a30570f5a31e2d78c22dfa7b61a36f;p=pspp diff --git a/src/language/dictionary/vector.c b/src/language/dictionary/vector.c index 3be0723f70..16617f87e0 100644 --- a/src/language/dictionary/vector.c +++ b/src/language/dictionary/vector.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2010, 2011, 2012, 2016 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 @@ -18,22 +18,23 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "intprops.h" -#include "xalloc.h" +#include "data/dataset.h" +#include "data/format.h" +#include "data/dictionary.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/lexer/format-parser.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/assertion.h" +#include "libpspp/i18n.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/pool.h" +#include "libpspp/str.h" + +#include "gl/intprops.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -47,14 +48,15 @@ cmd_vector (struct lexer *lexer, struct dataset *ds) do { char **vectors; - size_t vector_cnt, vector_cap; + size_t n_vectors, allocated_vectors; /* Get the name(s) of the new vector(s). */ - if (!lex_force_id (lexer)) + if (!lex_force_id (lexer) + || !dict_id_is_valid (dict, lex_tokcstr (lexer), true)) return CMD_CASCADING_FAILURE; vectors = NULL; - vector_cnt = vector_cap = 0; + n_vectors = allocated_vectors = 0; while (lex_token (lexer) == T_ID) { size_t i; @@ -66,18 +68,18 @@ cmd_vector (struct lexer *lexer, struct dataset *ds) goto fail; } - for (i = 0; i < vector_cnt; i++) - if (!strcasecmp (vectors[i], lex_tokcstr (lexer))) + for (i = 0; i < n_vectors; i++) + if (!utf8_strcasecmp (vectors[i], lex_tokcstr (lexer))) { msg (SE, _("Vector name %s is given twice."), lex_tokcstr (lexer)); goto fail; } - if (vector_cnt == vector_cap) - vectors = pool_2nrealloc (pool, - vectors, &vector_cap, sizeof *vectors); - vectors[vector_cnt++] = pool_strdup (pool, lex_tokcstr (lexer)); + if (n_vectors == allocated_vectors) + vectors = pool_2nrealloc (pool, vectors, &allocated_vectors, + sizeof *vectors); + vectors[n_vectors++] = pool_strdup (pool, lex_tokcstr (lexer)); lex_get (lexer); lex_match (lexer, T_COMMA); @@ -91,7 +93,7 @@ cmd_vector (struct lexer *lexer, struct dataset *ds) struct variable **v; size_t nv; - if (vector_cnt > 1) + if (n_vectors > 1) { msg (SE, _("A slash must separate each vector " "specification in VECTOR's long form.")); @@ -111,31 +113,27 @@ cmd_vector (struct lexer *lexer, struct dataset *ds) bool seen_format = false; struct variable **vars; - int var_cnt; + int n_vars; size_t i; - var_cnt = 0; + n_vars = 0; format = fmt_for_output (FMT_F, 8, 2); seen_format = false; while (!lex_match (lexer, T_RPAREN)) { - if (lex_is_integer (lexer) && var_cnt == 0) + if (lex_is_integer (lexer) && n_vars == 0) { - var_cnt = lex_integer (lexer); + if (!lex_force_int_range (lexer, NULL, 1, INT_MAX)) + goto fail; + n_vars = lex_integer (lexer); lex_get (lexer); - if (var_cnt <= 0) - { - msg (SE, _("Vectors must have at least one element.")); - goto fail; - } } else if (lex_token (lexer) == T_ID && !seen_format) { seen_format = true; if (!parse_format_specifier (lexer, &format) - || !fmt_check_output (&format) - || !fmt_check_type_compat (&format, VAL_NUMERIC)) + || !fmt_check_output (&format)) goto fail; } else @@ -145,48 +143,49 @@ cmd_vector (struct lexer *lexer, struct dataset *ds) } lex_match (lexer, T_COMMA); } - if (var_cnt == 0) + if (n_vars == 0) { lex_error (lexer, _("expecting vector length")); goto fail; } - /* Check that none of the variables exist and that - their names are no more than VAR_NAME_LEN bytes - long. */ - for (i = 0; i < vector_cnt; i++) + /* Check that none of the variables exist and that their names are + not excessively long. */ + for (i = 0; i < n_vectors; i++) { int j; - for (j = 0; j < var_cnt; j++) + for (j = 0; j < n_vars; j++) { - char name[VAR_NAME_LEN + INT_STRLEN_BOUND (int) + 1]; - sprintf (name, "%s%d", vectors[i], j + 1); - if (strlen (name) > VAR_NAME_LEN) + char *name = xasprintf ("%s%d", vectors[i], j + 1); + if (!dict_id_is_valid (dict, name, true)) { - msg (SE, _("%s is too long for a variable name."), name); + free (name); goto fail; } if (dict_lookup_var (dict, name)) { msg (SE, _("%s is an existing variable name."), name); + free (name); goto fail; } + free (name); } } /* Finally create the variables and vectors. */ - vars = pool_nmalloc (pool, var_cnt, sizeof *vars); - for (i = 0; i < vector_cnt; i++) + vars = pool_nmalloc (pool, n_vars, sizeof *vars); + for (i = 0; i < n_vectors; i++) { int j; - for (j = 0; j < var_cnt; j++) + for (j = 0; j < n_vars; j++) { - char name[VAR_NAME_LEN + 1]; - sprintf (name, "%s%d", vectors[i], j + 1); - vars[j] = dict_create_var_assert (dict, name, 0); + char *name = xasprintf ("%s%d", vectors[i], j + 1); + vars[j] = dict_create_var_assert (dict, name, + fmt_var_width (&format)); var_set_both_formats (vars[j], &format); + free (name); } - dict_create_vector_assert (dict, vectors[i], vars, var_cnt); + dict_create_vector_assert (dict, vectors[i], vars, n_vars); } } else @@ -198,7 +197,7 @@ cmd_vector (struct lexer *lexer, struct dataset *ds) while (lex_match (lexer, T_SLASH)); pool_destroy (pool); - return lex_end_of_command (lexer); + return CMD_SUCCESS; fail: pool_destroy (pool);