X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Flexer%2Fformat-parser.c;h=35e9a991fafbf9a66478584facea9edad818d6bb;hb=0c120e1c2f74ace50987771f1102fa609fd271cd;hp=2eb72a045d075979cbbaa8ddc0b68c4df5a7ed49;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp
diff --git a/src/language/lexer/format-parser.c b/src/language/lexer/format-parser.c
index 2eb72a045d..35e9a991fa 100644
--- a/src/language/lexer/format-parser.c
+++ b/src/language/lexer/format-parser.c
@@ -1,26 +1,25 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 1997-9, 2000, 2006 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#include
#include "format-parser.h"
#include
+#include
#include
#include "lexer.h"
@@ -31,8 +30,6 @@
#include
#include
-#include "size_max.h"
-
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -47,7 +44,7 @@
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)
+ int *width, int *decimals)
{
struct substring s;
struct substring type_ss, width_ss, decimals_ss;
@@ -60,7 +57,7 @@ parse_abstract_format_specifier (struct lexer *lexer, char type[FMT_TYPE_LEN_MAX
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, '.'))
+ if (ss_match_char (&s, '.'))
{
has_decimals = true;
ss_get_chars (&s, ss_span (s, ss_cstr (CC_DIGITS)), &decimals_ss);
@@ -110,16 +107,16 @@ parse_format_specifier (struct lexer *lexer, struct fmt_spec *format)
msg (SE, _("Unknown format type \"%s\"."), type);
return false;
}
-
+
return true;
}
/* Parses a token containing just the name of a format type and
returns true if successful. */
bool
-parse_format_specifier_name (struct lexer *lexer, enum fmt_type *type)
+parse_format_specifier_name (struct lexer *lexer, enum fmt_type *type)
{
- if (lex_token (lexer) != T_ID)
+ if (lex_token (lexer) != T_ID)
{
lex_error (lexer, _("expecting format type"));
return false;