X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fnumeric.c;h=5fa77541b24791aa7d309e5500a6744d4d758b7a;hb=c8377117389554c8e914052a46b03aa8bcae8364;hp=b7ad96eb7440d9eb7cb5dc244c3aa00eee4bb9dd;hpb=3816248a008a4af75aac6319d0c9929cb7ff679e;p=pspp-builds.git

diff --git a/src/language/dictionary/numeric.c b/src/language/dictionary/numeric.c
index b7ad96eb..5fa77541 100644
--- a/src/language/dictionary/numeric.c
+++ b/src/language/dictionary/numeric.c
@@ -1,21 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
 
-   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>
 
@@ -24,6 +21,7 @@
 #include <data/dictionary.h>
 #include <data/procedure.h>
 #include <data/variable.h>
+#include <data/format.h>
 #include <language/command.h>
 #include <language/lexer/format-parser.h>
 #include <language/lexer/lexer.h>
@@ -45,12 +43,12 @@ 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
     {
+      /* 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_NONE))
 	return CMD_FAILURE;
 
@@ -59,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];
@@ -85,7 +87,7 @@ cmd_numeric (struct lexer *lexer, struct dataset *ds)
 	  else
 	    {
 	      if (f.type != -1)
-		new_var->print = new_var->write = f;
+                var_set_both_formats (new_var, &f);
 	    }
 	}
 
@@ -152,7 +154,7 @@ cmd_string (struct lexer *lexer, struct dataset *ds)
 	  if (!new_var)
 	    msg (SE, _("There is already a variable named %s."), v[i]);
 	  else
-            new_var->print = new_var->write = f;
+            var_set_both_formats (new_var, &f);
 	}
 
       /* Clean up. */
@@ -185,7 +187,7 @@ cmd_leave (struct lexer *lexer, struct dataset *ds)
   if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
     return CMD_CASCADING_FAILURE;
   for (i = 0; i < nv; i++)
-    v[i]->leave = true;
+    var_set_leave (v[i], true);
   free (v);
 
   return lex_end_of_command (lexer);