diff options
| author | Luc Van Oostenryck <luc.vanoostenryck@gmail.com> | 2020-07-01 23:51:20 +0200 |
|---|---|---|
| committer | Luc Van Oostenryck <luc.vanoostenryck@gmail.com> | 2020-07-06 01:28:21 +0200 |
| commit | 8e929d4e369f687552db8d127b2d39947eb93983 (patch) | |
| tree | c0d70e2b989c185bc3ec0f09e399dc227d6132d9 /parse.c | |
| parent | 111956db3b21cee7cc09ca91fa139697da50d425 (diff) | |
| download | sparse-dev-8e929d4e369f687552db8d127b2d39947eb93983.tar.gz | |
cleanup: move parsing helpers to parse.c
lib.c contains 2-3 helpers for parsing. Move them to parse.c.
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Diffstat (limited to 'parse.c')
| -rw-r--r-- | parse.c | 38 |
1 files changed, 38 insertions, 0 deletions
@@ -655,6 +655,44 @@ void init_parser(int stream) } +static struct token *skip_to(struct token *token, int op) +{ + while (!match_op(token, op) && !eof_token(token)) + token = token->next; + return token; +} + +static struct token bad_token = { .pos.type = TOKEN_BAD }; +struct token *expect(struct token *token, int op, const char *where) +{ + if (!match_op(token, op)) { + if (token != &bad_token) { + bad_token.next = token; + sparse_error(token->pos, "Expected %s %s", show_special(op), where); + sparse_error(token->pos, "got %s", show_token(token)); + } + if (op == ';') + return skip_to(token, op); + return &bad_token; + } + return token->next; +} + +/// +// issue an error message on new parsing errors +// @token: the current token +// @errmsg: the error message +// If the current token is from a previous error, an error message +// has already been issued, so nothing more is done. +// Otherwise, @errmsg is displayed followed by the current token. +static void unexpected(struct token *token, const char *errmsg) +{ + if (token == &bad_token) + return; + sparse_error(token->pos, "%s", errmsg); + sparse_error(token->pos, "got %s", show_token(token)); +} + // Add a symbol to the list of function-local symbols static void fn_local_symbol(struct symbol *sym) { |