X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fnumeric.c;h=41f3c79a67b8bcc3ea5b1194f770a93535f86713;hb=8dfe93d6dde6f5a500c5c4f0dccb067fe647904c;hp=0cf08ae53770a18dba7fe21a1be940f0cd28033f;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp
diff --git a/src/language/dictionary/numeric.c b/src/language/dictionary/numeric.c
index 0cf08ae537..41f3c79a67 100644
--- a/src/language/dictionary/numeric.c
+++ b/src/language/dictionary/numeric.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 1997-9, 2000, 2006, 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
+ 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 . */
#include
@@ -23,6 +21,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -44,13 +43,13 @@ cmd_numeric (struct lexer *lexer, struct dataset *ds)
char **v;
size_t nv;
- /* Format spec for variables to create. f.type==-1 if default is to
- be used. */
- struct fmt_spec f;
-
do
{
- if (!parse_DATA_LIST_vars (lexer, &v, &nv, PV_NONE))
+ /* Format spec for variables to create. f.type==-1 if default is to
+ be used. */
+ struct fmt_spec f;
+
+ if (!parse_DATA_LIST_vars (lexer, &v, &nv, PV_NO_DUPLICATE))
return CMD_FAILURE;
/* Get the optional format specification. */
@@ -58,6 +57,10 @@ cmd_numeric (struct lexer *lexer, struct dataset *ds)
{
if (!parse_format_specifier (lexer, &f))
goto fail;
+
+ if ( ! fmt_check_output (&f))
+ goto fail;
+
if (fmt_is_string (f.type))
{
char str[FMT_STRING_LEN_MAX + 1];
@@ -124,7 +127,7 @@ cmd_string (struct lexer *lexer, struct dataset *ds)
do
{
- if (!parse_DATA_LIST_vars (lexer, &v, &nv, PV_NONE))
+ if (!parse_DATA_LIST_vars (lexer, &v, &nv, PV_NO_DUPLICATE))
return CMD_FAILURE;
if (!lex_force_match (lexer, '(')