X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Fformat-parser.c;h=aa30852d11327b3ddcf2d3fc8488f04649fc73f7;hb=209f7e5ccf28c97641b9e69ef6b9df81efe4dc38;hp=906d0f327168c5508f16859f46c52c3684987334;hpb=ea75d9702346b57b13830e619e9c447b0b976f89;p=pspp diff --git a/src/language/lexer/format-parser.c b/src/language/lexer/format-parser.c index 906d0f3271..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], @@ -99,10 +101,9 @@ parse_abstract_format_specifier (struct lexer *lexer, return ok; } -/* Parses a format specifier from the token stream and returns - true only if successful. Emits an error message on - failure. The caller should call check_input_specifier() or - check_output_specifier() on the parsed format as +/* Parses a format specifier from the token stream and returns true only if + successful. Emits an error message on failure. The caller should call + fmt_check_input() or fmt_check_output() on the parsed format as necessary. */ bool parse_format_specifier (struct lexer *lexer, struct fmt_spec *format)