X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Fformat-parser.h;h=6316e38762a32732c92832d5cda75ba104cdd718;hb=4a7f0730eded5fc2b6add00ea0586a1d0e50e7da;hp=981a54854ccb60a7b8d95411d8579f594ca58f71;hpb=8e018d25310cb53e5339b46e95f0abe02db83782;p=pspp

diff --git a/src/language/lexer/format-parser.h b/src/language/lexer/format-parser.h
index 981a54854c..6316e38762 100644
--- a/src/language/lexer/format-parser.h
+++ b/src/language/lexer/format-parser.h
@@ -1,34 +1,37 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
 
-   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 <http://www.gnu.org/licenses/>. */
 
 #ifndef LANGUAGE_LEXER_FORMAT_PARSER_H
-#define LANGUAGE_LEXER_FORMAT_PARSER_H 1 
+#define LANGUAGE_LEXER_FORMAT_PARSER_H 1
 
 #include <stdbool.h>
 
-#include <data/format.h>
+#include "data/format.h"
 
 struct fmt_spec;
+struct lexer;
 
-bool parse_abstract_format_specifier (char type[FMT_TYPE_LEN_MAX + 1],
-                                      int *width, int *decimals);
-bool parse_format_specifier (struct fmt_spec *);
-bool parse_format_specifier_name (int *type);
+bool parse_abstract_format_specifier__ (struct lexer *,
+                                        char type[FMT_TYPE_LEN_MAX + 1],
+                                        uint16_t *width, uint8_t *decimals);
+bool parse_abstract_format_specifier (struct lexer *,
+                                      char type[FMT_TYPE_LEN_MAX + 1],
+                                      uint16_t *width, uint8_t *decimals);
+
+bool parse_format_specifier (struct lexer *, struct fmt_spec *);
+bool parse_format_specifier_name (struct lexer *, enum fmt_type *type);
 
 #endif /* language/lexer/format-parser.h. */