aboutsummaryrefslogtreecommitdiff
path: root/asm/main.c
diff options
context:
space:
mode:
authorAryadev Chavali <aryadev@aryadevchavali.com>2023-10-28 18:21:56 +0100
committerAryadev Chavali <aryadev@aryadevchavali.com>2023-10-28 18:22:18 +0100
commit1c0bd20cbad1c4089a4f5d19d2154d710fee2481 (patch)
treeab976a304c2fec3bbc1bdec521094015b9522e43 /asm/main.c
parenteac8cbf1dab16ea3f2e066e142c6d6da39bdfea0 (diff)
downloadovm-1c0bd20cbad1c4089a4f5d19d2154d710fee2481.tar.gz
ovm-1c0bd20cbad1c4089a4f5d19d2154d710fee2481.tar.bz2
ovm-1c0bd20cbad1c4089a4f5d19d2154d710fee2481.zip
Introduce error reporting in asm/main
Pretty simple implementation, I've stopped printing the tokens cos I think the lexer is done.
Diffstat (limited to 'asm/main.c')
-rw-r--r--asm/main.c43
1 files changed, 29 insertions, 14 deletions
diff --git a/asm/main.c b/asm/main.c
index bb1a2b6..aa6dcec 100644
--- a/asm/main.c
+++ b/asm/main.c
@@ -17,33 +17,48 @@
int main(void)
{
- FILE *fp = fopen("main.asm", "rb");
- darr_t buffer = darr_read_file(fp);
+ int ret = 0;
+ const char *filename = "main.asm";
+ FILE *fp = fopen(filename, "rb");
+ darr_t buffer = darr_read_file(fp);
fclose(fp);
token_stream_t tokens = tokenise_buffer(&buffer);
printf("%lu bytes -> %lu tokens\n", buffer.used, tokens.available);
free(buffer.data);
- for (size_t i = 0; i < tokens.available; ++i)
- printf("%s(%.*s)\n",
- token_type_as_cstr((TOKEN_STREAM_AT(tokens.data, i)).type),
- (int)(TOKEN_STREAM_AT(tokens.data, i).str_size),
- (TOKEN_STREAM_AT(tokens.data, i).str));
- puts("");
-
size_t number = 0;
- inst_t *instructions = parse_stream(&tokens, &number);
+ inst_t *instructions = NULL;
+ perr_t parse_error = parse_stream(&tokens, &instructions, &number);
+ if (parse_error)
+ {
+ size_t column = 0;
+ size_t line = 0;
+ if (tokens.used < tokens.available)
+ {
+ token_t t = TOKEN_STREAM_AT(tokens.data, tokens.used);
+ column = t.column;
+ line = t.line;
+ }
+ fprintf(stderr, "%s:%lu:%lu: %s\n", filename, line, column,
+ perr_as_cstr(parse_error));
+ ret = 255 - parse_error;
+ goto end;
+ }
for (size_t i = 0; i < number; ++i)
{
inst_print(instructions[i], stdout);
puts("");
}
// Free the tokens
- for (size_t i = 0; i < tokens.available; ++i)
- free(TOKEN_STREAM_AT(tokens.data, i).str);
- free(tokens.data);
+end:
+ if (tokens.data)
+ {
+ for (size_t i = 0; i < tokens.available; ++i)
+ free(TOKEN_STREAM_AT(tokens.data, i).str);
+ free(tokens.data);
+ }
if (instructions)
free(instructions);
- return 0;
+ return ret;
}