Make main properly return with failure on parsing errors

This commit is contained in:
omicron 2025-04-07 10:50:57 +02:00
parent d3d69b82d5
commit 8c0e9926c5

View File

@ -32,21 +32,22 @@ void print_text(tokenlist_t *list) {
} }
} }
void print_ast(tokenlist_t *list) { error_t *print_ast(tokenlist_t *list) {
parse_result_t result = parse(list->head); parse_result_t result = parse(list->head);
if (result.err) { if (result.err)
puts(result.err->message); return result.err;
error_free(result.err);
return;
}
ast_node_print(result.node); ast_node_print(result.node);
if (result.next != nullptr) { if (result.next != nullptr) {
puts("First unparsed token:"); puts("First unparsed token:");
lexer_token_print(&result.next->token); lexer_token_print(&result.next->token);
} }
ast_node_free(result.node); ast_node_free(result.node);
if (result.next != nullptr) {
return errorf("did not parse entire input token stream");
}
return nullptr;
} }
int get_execution_mode(int argc, char *argv[]) { int get_execution_mode(int argc, char *argv[]) {
@ -63,6 +64,20 @@ int get_execution_mode(int argc, char *argv[]) {
return MODE_AST; return MODE_AST;
} }
error_t *do_action(mode_t mode, tokenlist_t *list) {
switch (mode) {
case MODE_TOKENS:
print_tokens(list);
return nullptr;
case MODE_TEXT:
print_text(list);
return nullptr;
case MODE_AST:
return print_ast(list);
}
__builtin_unreachable();
}
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
mode_t mode = get_execution_mode(argc, argv); mode_t mode = get_execution_mode(argc, argv);
char *filename = argv[2]; char *filename = argv[2];
@ -81,17 +96,9 @@ int main(int argc, char *argv[]) {
if (err) if (err)
goto cleanup_tokens; goto cleanup_tokens;
switch (mode) { err = do_action(mode, list);
case MODE_TOKENS: if (err)
print_tokens(list); goto cleanup_tokens;
break;
case MODE_TEXT:
print_text(list);
break;
case MODE_AST:
print_ast(list);
break;
}
tokenlist_free(list); tokenlist_free(list);
error_free(err); error_free(err);