/* 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
#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"
#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. */
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)
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)
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;
}