-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 1997-9, 2000 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 <language/lexer/format-parser.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
#include "intprops.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
if (vector_cnt == vector_cap)
vectors = pool_2nrealloc (pool,
vectors, &vector_cap, sizeof *vectors);
- vectors[vector_cnt++] = xstrdup (lex_tokid (lexer));
+ vectors[vector_cnt++] = pool_strdup (pool, lex_tokid (lexer));
lex_get (lexer);
lex_match (lexer, ',');
seen_format = true;
if (!parse_format_specifier (lexer, &format)
|| !fmt_check_output (&format)
- || !fmt_check_type_compat (&format, VAR_NUMERIC))
+ || !fmt_check_type_compat (&format, VAL_NUMERIC))
goto fail;
}
else
}
/* Check that none of the variables exist and that
- their names are no more than LONG_NAME_LEN bytes
+ their names are no more than VAR_NAME_LEN bytes
long. */
for (i = 0; i < vector_cnt; i++)
{
int j;
for (j = 0; j < var_cnt; j++)
{
- char name[LONG_NAME_LEN + INT_STRLEN_BOUND (int) + 1];
+ char name[VAR_NAME_LEN + INT_STRLEN_BOUND (int) + 1];
sprintf (name, "%s%d", vectors[i], j + 1);
- if (strlen (name) > LONG_NAME_LEN)
+ if (strlen (name) > VAR_NAME_LEN)
{
msg (SE, _("%s is too long for a variable name."), name);
goto fail;
int j;
for (j = 0; j < var_cnt; j++)
{
- char name[LONG_NAME_LEN + 1];
+ char name[VAR_NAME_LEN + 1];
sprintf (name, "%s%d", vectors[i], j + 1);
vars[j] = dict_create_var_assert (dict, name, 0);
var_set_both_formats (vars[j], &format);