X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Fformat-parser.c;h=c2187e5a2f1024c78062aa055ba392285f5aaecf;hb=74f7e168fc9a87ff45730452df3627636c5e2f77;hp=e3ca9ccad0d03ca9c98eee07913257fd1a225308;hpb=81579d9e9f994fb2908f50af41c3eb033d216e58;p=pspp

diff --git a/src/language/lexer/format-parser.c b/src/language/lexer/format-parser.c
index e3ca9ccad0..c2187e5a2f 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
@@ -24,7 +24,6 @@
 
 #include "data/format.h"
 #include "data/variable.h"
-#include "language/lexer/format-parser.h"
 #include "language/lexer/lexer.h"
 #include "libpspp/message.h"
 #include "libpspp/misc.h"
@@ -33,16 +32,25 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-static bool
+/* Parses a token taking the form of a format specifier and
+   returns true only if successful.  Emits an error message on
+   failure.  Stores a null-terminated string representing the
+   format type in TYPE, and the width and number of decimal
+   places in *WIDTH and *DECIMALS.
+
+   TYPE is not checked as to whether it is really the name of a
+   format.  Both width and decimals are considered optional.  If
+   missing, *WIDTH or *DECIMALS or both will be set to 0. */
+bool
 parse_abstract_format_specifier__ (struct lexer *lexer,
                                    char type[FMT_TYPE_LEN_MAX + 1],
-                                   int *width, int *decimals)
+                                   uint16_t *width, uint8_t *decimals)
 {
   struct substring s;
   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. */
@@ -76,23 +84,16 @@ parse_abstract_format_specifier__ (struct lexer *lexer,
   return true;
 
 error:
-  lex_error (lexer, _("expecting valid format specifier"));
+  lex_error (lexer, _("Syntax error expecting valid format specifier."));
   return false;
 }
 
-/* Parses a token taking the form of a format specifier and
-   returns true only if successful.  Emits an error message on
-   failure.  Stores a null-terminated string representing the
-   format type in TYPE, and the width and number of decimal
-   places in *WIDTH and *DECIMALS.
-
-   TYPE is not checked as to whether it is really the name of a
-   format.  Both width and decimals are considered optional.  If
-   missing, *WIDTH or *DECIMALS or both will be set to 0. */
+/* Like parse_abstract_format_specifier__(), but additionally advanced past
+   the token if successful. */
 bool
 parse_abstract_format_specifier (struct lexer *lexer,
                                  char type[FMT_TYPE_LEN_MAX + 1],
-                                 int *width, int *decimals)
+                                 uint16_t *width, uint8_t *decimals)
 {
   bool ok = parse_abstract_format_specifier__ (lexer, type, width, decimals);
   if (ok)
@@ -100,10 +101,9 @@ parse_abstract_format_specifier (struct lexer *lexer,
   return ok;
 }
 
-/* Parses a format specifier from the token stream and returns
-   true only if successful.  Emits an error message on
-   failure.  The caller should call check_input_specifier() or
-   check_output_specifier() on the parsed format as
+/* Parses a format specifier from the token stream and returns true only if
+   successful.  Emits an error message on failure.  The caller should call
+   fmt_check_input() or fmt_check_output() on the parsed format as
    necessary.  */
 bool
 parse_format_specifier (struct lexer *lexer, struct fmt_spec *format)
@@ -115,7 +115,14 @@ parse_format_specifier (struct lexer *lexer, struct fmt_spec *format)
 
   if (!fmt_from_name (type, &format->type))
     {
-      msg (SE, _("Unknown format type `%s'."), type);
+      lex_error (lexer, _("Unknown format type `%s'."), type);
+      return false;
+    }
+
+  if (format->w == 0 && !strchr (lex_tokcstr (lexer), '0'))
+    {
+      lex_error (lexer, _("Format specifier `%s' lacks required width."),
+                 lex_tokcstr (lexer));
       return false;
     }
 
@@ -130,12 +137,12 @@ parse_format_specifier_name (struct lexer *lexer, enum fmt_type *type)
 {
   if (lex_token (lexer) != T_ID)
     {
-      lex_error (lexer, _("expecting format type"));
+      lex_error (lexer, _("Syntax error expecting format type."));
       return false;
     }
   if (!fmt_from_name (lex_tokcstr (lexer), type))
     {
-      msg (SE, _("Unknown format type `%s'."), lex_tokcstr (lexer));
+      lex_error (lexer, _("Unknown format type `%s'."), lex_tokcstr (lexer));
       return false;
     }
   lex_get (lexer);