Improve parser error messages
This commit is contained in:
parent
55809f702d
commit
2894ad7447
4 changed files with 62 additions and 35 deletions
|
|
@ -1,112 +0,0 @@
|
|||
#include "parser.h"
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
static int INITIAL_STACK_SIZE = 100;
|
||||
|
||||
struct TSStackEntry {
|
||||
TSState state;
|
||||
TSTree *node;
|
||||
};
|
||||
|
||||
TSParser TSParserMake(const char *input) {
|
||||
TSParser result = {
|
||||
.tree = NULL,
|
||||
.input = input,
|
||||
.error_message = NULL,
|
||||
.position = 0,
|
||||
.lookahead_node = NULL,
|
||||
.lex_state = 0,
|
||||
.stack = calloc(INITIAL_STACK_SIZE, sizeof(TSStackEntry)),
|
||||
.stack_size = 0,
|
||||
};
|
||||
return result;
|
||||
}
|
||||
|
||||
void TSParserShift(TSParser *parser, TSState parse_state) {
|
||||
TSStackEntry *entry = (parser->stack + parser->stack_size);
|
||||
entry->state = parse_state;
|
||||
entry->node = parser->lookahead_node;
|
||||
parser->lookahead_node = NULL;
|
||||
parser->stack_size++;
|
||||
}
|
||||
|
||||
void TSParserReduce(TSParser *parser, TSSymbol symbol, int child_count) {
|
||||
parser->stack_size -= child_count;
|
||||
|
||||
TSTree **children = malloc(child_count * sizeof(TSTree *));
|
||||
for (int i = 0; i < child_count; i++) {
|
||||
size_t j = parser->stack_size + i;
|
||||
children[i] = parser->stack[j].node;
|
||||
}
|
||||
|
||||
parser->lookahead_node = TSTreeMake(symbol, child_count, children);
|
||||
}
|
||||
|
||||
void TSParserError(TSParser *parser, size_t count, const char **expected_inputs) {
|
||||
char *message = malloc(100 * sizeof(char));
|
||||
char *spot = message;
|
||||
sprintf(message, "Unexpected token '%ld'. Expected: ", TSParserLookaheadSym(parser));
|
||||
spot += strlen(message);
|
||||
for (int i = 0; i < count; i++) {
|
||||
spot += 2;
|
||||
sprintf(spot, "%s", expected_inputs[i]);
|
||||
spot += strlen(expected_inputs[i]);
|
||||
}
|
||||
parser->error_message = message;
|
||||
}
|
||||
|
||||
void TSParserLexError(TSParser *parser, size_t count, const char **expected_inputs) {
|
||||
char *message = malloc(100 * sizeof(char));
|
||||
char *spot = message;
|
||||
sprintf(message, "Unexpected character '%c'. Expected: ", parser->input[parser->position]);
|
||||
spot += 30;
|
||||
for (int i = 0; i < count; i++) {
|
||||
spot += 2;
|
||||
sprintf(spot, "%s", expected_inputs[i]);
|
||||
spot += strlen(expected_inputs[i]);
|
||||
}
|
||||
parser->error_message = message;
|
||||
}
|
||||
|
||||
void TSParserAdvance(TSParser *parser, TSState lex_state) {
|
||||
parser->position++;
|
||||
parser->lex_state = lex_state;
|
||||
}
|
||||
|
||||
char TSParserLookaheadChar(const TSParser *parser) {
|
||||
return parser->input[parser->position];
|
||||
}
|
||||
|
||||
long TSParserLookaheadSym(const TSParser *parser) {
|
||||
TSTree *node = parser->lookahead_node;
|
||||
return node ? node->value : -1;
|
||||
}
|
||||
|
||||
void TSParserSetLookaheadSym(TSParser *parser, TSSymbol symbol) {
|
||||
parser->lookahead_node = TSTreeMake(symbol, 0, NULL);
|
||||
}
|
||||
|
||||
TSState TSParserParseState(const TSParser *parser) {
|
||||
return parser->stack[parser->stack_size - 1].state;
|
||||
}
|
||||
|
||||
TSState TSParserLexState(const TSParser *parser) {
|
||||
return parser->lex_state;
|
||||
}
|
||||
|
||||
void TSParserSetLexState(TSParser *parser, TSState lex_state) {
|
||||
parser->lex_state = lex_state;
|
||||
}
|
||||
|
||||
void TSParserAcceptInput(TSParser *parser) {
|
||||
parser->tree = parser->stack[parser->stack_size - 1].node;
|
||||
}
|
||||
|
||||
TSParseResult TSParserResult(TSParser *parser) {
|
||||
TSParseResult result = {
|
||||
.tree = parser->tree,
|
||||
.error = { .position = parser->position, .message = parser->error_message }
|
||||
};
|
||||
return result;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue