1 files changed, 9 insertions, 7 deletions

diff --git a/src/lexer.c b/src/lexer.c
index df998f2..6a5621c 100644
--- a/src/lexer.c
+++ b/src/lexer.c
@@ -1,6 +1,8 @@
+#include "badlib.h"
+
 #define LEXER_MEM GB(2)
 
-typedef enum TokenType {
+typedef enum TokenKind {
     TOK_UNKNOWN = 0,
 
     // Parentheses.
@@ -65,7 +67,7 @@ typedef enum TokenType {
 
     // End of file.
     TOK_EOF,
-} TokenType;
+} TokenKind;
 
 Str token_str[] = {
     [TOK_UNKNOWN] = cstr("UNKNOWN"),
@@ -135,7 +137,7 @@ Str token_str[] = {
 };
 
 typedef struct Token {
-    TokenType type;
+    TokenKind kind;
     Str val;
     sz line;
     sz col;
@@ -256,7 +258,7 @@ scan_skip_until_valid(Scanner *scanner) {
 }
 
 Token
-emit_token(Scanner current, Scanner *scanner, TokenType t) {
+emit_token(Scanner current, Scanner *scanner, TokenKind t) {
     Str val = current.str;
     val.size = current.str.size - scanner->str.size;
     val.size = val.size < 0 ? 0 : val.size;
@@ -264,7 +266,7 @@ emit_token(Scanner current, Scanner *scanner, TokenType t) {
         .val = val,
         .line = current.line + 1,
         .col = current.col + 1,
-        .type = t,
+        .kind = t,
     };
 }
 
@@ -274,7 +276,7 @@ emit_token_err(Scanner *scanner, Str err_msg) {
         .line = scanner->line + 1,
         .col = scanner->col + 1,
         .val = err_msg,
-        .type = TOK_UNKNOWN,
+        .kind = TOK_UNKNOWN,
     };
 }
 
@@ -430,7 +432,7 @@ scan_token(Scanner *scanner) {
                 *scanner = current;
                 return emit_token_number(scanner);
             }
-            return emit_token(current, scanner, TOK_ADD);
+            return emit_token(current, scanner, TOK_SUB);
         };
         case '*':
             return emit_token(current, scanner, TOK_MUL);