2 files changed, 12 insertions, 7 deletions
diff --git a/src/lexer/keywords.c b/src/lexer/keywords.c
index 7bb6b47..30eb2a1 100644
--- a/src/lexer/keywords.c
+++ b/src/lexer/keywords.c
@@ -34,7 +34,7 @@
 #include "lexer/keywords.h"
 #include "log.h"
 
-#define KEYWORD_COUNT 1
+#define KEYWORD_COUNT 2
 
 #define KEYWORD_MAP_ROWS 16
 
@@ -43,13 +43,15 @@ static struct hashmap map;
 
 static struct {
     const char *str;
-    enum token_kind value;
+    enum token_kind tok_kind;
+    uint8_t tok_flags;
 } info[KEYWORD_COUNT] = {
-    { "void", TK_VOID }
+    { "void", TK_VOID, TF_BUILTIN_TYPE },
+    { "int" , TK_INT , TF_BUILTIN_TYPE }
 };
 
 static void
-add_keyword(const char *str, enum token_kind value)
+add_keyword(const char *str, enum token_kind tok_kind, uint8_t tok_flags)
 {
     struct keyword *kwd;
 
@@ -60,7 +62,8 @@ add_keyword(const char *str, enum token_kind value)
     }
 
     kwd->len = strlen(str);
-    kwd->value = value;
+    kwd->tok_kind = tok_kind;
+    kwd->tok_flags = tok_flags;
 
     kwd->hashmap_entry.hash = hash(str, kwd->len);
     hashmap_add(map, &kwd->hashmap_entry);
@@ -93,6 +96,6 @@ keywords_init(void)
 
     /* Register all keywords */
     for (int k = 0; k < KEYWORD_COUNT; k++) {
-        add_keyword(info[k].str, info[k].value);
+        add_keyword(info[k].str, info[k].tok_kind, info[k].tok_flags);
     }
 }
diff --git a/src/lexer/lexer.c b/src/lexer/lexer.c
index 183bd76..9be4cb1 100644
--- a/src/lexer/lexer.c
+++ b/src/lexer/lexer.c
@@ -63,7 +63,8 @@ lex_identifier(struct lexer *ctx, struct token *tok)
     /* Look for a keyword matching the identifier */
     kwd = keywords_find(tok);
     if (kwd != NULL) {
-        tok->kind = kwd->value;
+        tok->kind = kwd->tok_kind;
+        tok->flags |= kwd->tok_flags;
     } else {
         tok->kind = TK_IDENTIFIER;
     }
@@ -78,6 +79,7 @@ lexer_next(struct lexer *ctx, struct token *tok)
 
     skip_whitespace(ctx);
 
+    tok->flags = TF_NONE;
     tok->pos = ctx->pos;
     tok->line = ctx->line;
     tok->col = (int)(tok->pos - ctx->line_start) + 1;