#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],
uint16_t *width, uint8_t *decimals)
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],
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'))
{
- msg (SE, _("Format specifier `%s' lacks required width."),
- lex_tokcstr (lexer));
+ lex_error (lexer, _("Format specifier `%s' lacks required width."),
+ lex_tokcstr (lexer));
return false;
}
{
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);