From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 28 Aug 2022 21:15:13 +0000 (-0700)
Subject: format-parser: Comment and style fixes.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=891b597f6ac3e3020ac37bee8912045b01464c9e

format-parser: Comment and style fixes.
---

diff --git a/src/language/lexer/format-parser.c b/src/language/lexer/format-parser.c
index 85579a2ab2..aa30852d11 100644
--- a/src/language/lexer/format-parser.c
+++ b/src/language/lexer/format-parser.c
@@ -32,7 +32,16 @@
 #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)
@@ -79,15 +88,8 @@ error:
   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],
diff --git a/src/language/lexer/format-parser.h b/src/language/lexer/format-parser.h
index 7601bc46b2..6316e38762 100644
--- a/src/language/lexer/format-parser.h
+++ b/src/language/lexer/format-parser.h
@@ -21,14 +21,16 @@
 
 #include "data/format.h"
 
+struct fmt_spec;
 struct lexer;
 
+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);
 
-enum fmt_type ;
-struct fmt_spec;
 bool parse_format_specifier (struct lexer *, struct fmt_spec *);
 bool parse_format_specifier_name (struct lexer *, enum fmt_type *type);