X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fnumeric.c;h=18728014f331f5ba68eabbafafe23467b6f069f1;hb=4fea709b5f138c4087954b57664d5f171e02a399;hp=7b367f9d1d65cfa5373109adadf2707670ca2374;hpb=fe8dc2171009e90d2335f159d05f7e6660e24780;p=pspp

diff --git a/src/language/dictionary/numeric.c b/src/language/dictionary/numeric.c
index 7b367f9d1d..18728014f3 100644
--- a/src/language/dictionary/numeric.c
+++ b/src/language/dictionary/numeric.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2010, 2011, 2014 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
@@ -45,8 +45,7 @@ cmd_numeric (struct lexer *lexer, struct dataset *ds)
 
   do
     {
-      /* Format spec for variables to create.  f.type==-1 if default is to
-	 be used. */
+      /* Format spec for variables to create. */
       struct fmt_spec f;
 
       if (!parse_DATA_LIST_vars (lexer, dataset_dict (ds),
@@ -59,25 +58,31 @@ cmd_numeric (struct lexer *lexer, struct dataset *ds)
 	  if (!parse_format_specifier (lexer, &f))
 	    goto fail;
 
-	  if ( ! fmt_check_output (&f))
-	    goto fail;
+          char *error = fmt_check_output__ (&f);
+          if (error)
+            {
+              lex_next_error (lexer, -1, -1, "%s", error);
+              free (error);
+              goto fail;
+            }
 
 	  if (fmt_is_string (f.type))
 	    {
               char str[FMT_STRING_LEN_MAX + 1];
-	      msg (SE, _("Format type %s may not be used with a numeric "
-                         "variable."), fmt_to_string (&f, str));
+	      lex_next_error (lexer, -1, -1,
+                              _("Format type %s may not be used with a numeric "
+                                "variable."), fmt_to_string (&f, str));
 	      goto fail;
 	    }
 
 	  if (!lex_match (lexer, T_RPAREN))
 	    {
-	      msg (SE, _("`)' expected after output format."));
+              lex_error_expecting (lexer, "`)'");
 	      goto fail;
 	    }
 	}
       else
-	f.type = -1;
+	f = var_default_formats (0);
 
       /* Create each variable. */
       for (i = 0; i < nv; i++)
@@ -86,10 +91,7 @@ cmd_numeric (struct lexer *lexer, struct dataset *ds)
 	  if (!new_var)
 	    msg (SE, _("There is already a variable named %s."), v[i]);
 	  else
-	    {
-	      if (f.type != -1)
-                var_set_both_formats (new_var, &f);
-	    }
+            var_set_both_formats (new_var, &f);
 	}
 
       /* Clean up. */
@@ -133,17 +135,20 @@ cmd_string (struct lexer *lexer, struct dataset *ds)
 	return CMD_FAILURE;
 
       if (!lex_force_match (lexer, T_LPAREN)
-          || !parse_format_specifier (lexer, &f)
-          || !lex_force_match (lexer, T_RPAREN))
+          || !parse_format_specifier (lexer, &f))
 	goto fail;
-      if (!fmt_is_string (f.type))
-	{
-          char str[FMT_STRING_LEN_MAX + 1];
-	  msg (SE, _("Format type %s may not be used with a string "
-                     "variable."), fmt_to_string (&f, str));
-	  goto fail;
-	}
-      if (!fmt_check_output (&f))
+
+      char *error = fmt_check_type_compat__ (&f, NULL, VAL_STRING);
+      if (!error)
+        error = fmt_check_output__ (&f);
+      if (error)
+        {
+          lex_next_error (lexer, -2, -2, "%s", error);
+          free (error);
+          goto fail;
+        }
+
+      if (!lex_force_match (lexer, T_RPAREN))
         goto fail;
 
       width = fmt_var_width (&f);