From 0410bab11f4be35c22916935509a62a7e7bd8bd2 Mon Sep 17 00:00:00 2001 From: s-over-4 Date: Tue, 13 Jun 2023 15:29:47 -0400 Subject: ok --- src/include/util.h | 3 +-- src/lexer.c | 8 +++++++- src/util.c | 21 +-------------------- 3 files changed, 9 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/include/util.h b/src/include/util.h index a8efe7a..63ee8bb 100644 --- a/src/include/util.h +++ b/src/include/util.h @@ -7,10 +7,9 @@ #include +void die(const char* fmt, ...); void log_inf(const char* fmt, ...); void log_raw(const char* fmt, ...); void log_war(const char* fmt, ...); -void log_err(const char* fmt, ...); -void die(const char* fmt, ...); #endif diff --git a/src/lexer.c b/src/lexer.c index 553a794..aca05e3 100644 --- a/src/lexer.c +++ b/src/lexer.c @@ -155,7 +155,13 @@ token_t* lexer_get_next_token(lexer_t* lexer) { return token_init(TOKEN_EOF, lexer_get_c_as_string(lexer)); break; default: - return token_init(TOKEN_UNKNOWN, lexer_get_c_as_string(lexer)); + return lexer_next_token( + lexer, + token_init( + TOKEN_UNKNOWN, + lexer_get_c_as_string(lexer) + ) + ); } } diff --git a/src/util.c b/src/util.c index 5bdabfa..b4a2e15 100644 --- a/src/util.c +++ b/src/util.c @@ -3,7 +3,7 @@ void die(const char* fmt, ...) { va_list ap; - fprintf(stderr, "== FATAL ERROR ==\n"); + fprintf(stderr, "== ERROR ==\n"); va_start(ap, fmt); vfprintf(stderr, fmt, ap); @@ -61,22 +61,3 @@ void log_war(const char* fmt, ...) { fprintf(stderr, "\n"); } - -void log_err(const char* fmt, ...) { - va_list ap; - - fprintf(stderr, "== ERROR =="); - - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); - - if (fmt[0] && fmt[strlen(fmt) - 1] == ':') { - fputc(' ', stderr); - perror(NULL); - } else { - fputc('\n', stderr); - } - - fprintf(stderr, "\n"); -} -- cgit v1.2.3