/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006 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 <config.h>
-#include "format-parser.h"
+#include "language/lexer/format-parser.h"
#include <ctype.h>
#include <stdint.h>
#include <stdlib.h>
-#include "lexer.h"
-#include <data/format.h>
-#include <data/variable.h>
-#include <language/lexer/format-parser.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/str.h>
+#include "data/format.h"
+#include "data/variable.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
static 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. */
- s = ds_ss (lex_tokstr (lexer));
- ss_get_chars (&s, ss_span (s, ss_cstr (CC_LETTERS)), &type_ss);
- ss_get_chars (&s, ss_span (s, ss_cstr (CC_DIGITS)), &width_ss);
- if (ss_match_char (&s, '.'))
+ s = ss_cstr (lex_tokcstr (lexer));
+ ss_get_bytes (&s, ss_span (s, ss_cstr (CC_LETTERS)), &type_ss);
+ ss_get_bytes (&s, ss_span (s, ss_cstr (CC_DIGITS)), &width_ss);
+ if (ss_match_byte (&s, '.'))
{
has_decimals = true;
- ss_get_chars (&s, ss_span (s, ss_cstr (CC_DIGITS)), &decimals_ss);
+ ss_get_bytes (&s, ss_span (s, ss_cstr (CC_DIGITS)), &decimals_ss);
}
else
has_decimals = false;
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 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;
}
lex_error (lexer, _("expecting format type"));
return false;
}
- if (!fmt_from_name (ds_cstr (lex_tokstr (lexer)), type))
+ if (!fmt_from_name (lex_tokcstr (lexer), type))
{
- msg (SE, _("Unknown format type `%s'."), ds_cstr (lex_tokstr (lexer)));
+ msg (SE, _("Unknown format type `%s'."), lex_tokcstr (lexer));
return false;
}
lex_get (lexer);