X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Fformat-parser.c;h=2c05335ff984fa711bacba8920f682cb01c358ee;hb=b92e8417c7b44c8ce39829dca4eb8ab26f8b5494;hp=45a0b4b1e32d1c4cb473cfcdc810d3add3c52361;hpb=cf40a7c5308d086195265623f35b310c0b35f766;p=pspp

diff --git a/src/language/lexer/format-parser.c b/src/language/lexer/format-parser.c
index 45a0b4b1e3..2c05335ff9 100644
--- a/src/language/lexer/format-parser.c
+++ b/src/language/lexer/format-parser.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, 2012 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
@@ -40,7 +40,7 @@ parse_abstract_format_specifier__ (struct lexer *lexer,
   struct substring type_ss, width_ss, decimals_ss;
   bool has_decimals;
 
-  if (lex_token (lexer) != T_ID)
+  if (lex_token (lexer) != T_ID && lex_token (lexer) != T_STRING)
     goto error;
 
   /* Extract pieces. */
@@ -117,6 +117,13 @@ parse_format_specifier (struct lexer *lexer, struct fmt_spec *format)
       return false;
     }
 
+  if (format->w == 0 && !strchr (lex_tokcstr (lexer), '0'))
+    {
+      msg (SE, _("Format specifier `%s' lacks required width."),
+           lex_tokcstr (lexer));
+      return false;
+    }
+
   lex_get (lexer);
   return true;
 }