Add parser for tokens->ast conversion

1 files changed, 18 insertions, 19 deletions

diff --git a/src/lexer.c b/src/lexer.c
index 6a417e4..ac93a5c 100755
--- a/src/lexer.c
+++ b/src/lexer.c
@@ -16,7 +16,7 @@ static const char* token_str[] = {
 
 void
 print_token(Token tok) {
-    printf("[%4ld:%-4ld] ", tok.line, tok.column);
+    printf("[%4ld:%-4ld] ", tok.line, tok.col);
     printf("%s", token_str[tok.type]);
     switch (tok.type) {
         case TOKEN_FIXNUM: {
@@ -128,11 +128,10 @@ find_primitive_type(const StringView value) {
     return TOKEN_SYMBOL;
 }
 
-Tokens
-tokenize(const StringView *sv) {
-    Tokens tokens = {0};
-    tokens.tokens = NULL;
-    array_init(tokens.tokens, 1);
+Token *
+tokenize(const StringView *sv, Errors *errors) {
+    Token *tokens = NULL;
+    array_init(tokens, 1);
     Scanner scanner = (Scanner){
         .current = *sv,
         .line_number = 1,
@@ -163,7 +162,7 @@ tokenize(const StringView *sv) {
                     n++;
                 }
                 if (!found) {
-                    error_push(&tokens.errors, (Error){
+                    error_push(errors, (Error){
                         .type = ERR_TYPE_LEXER,
                         .value = ERR_UNMATCHED_STRING,
                         .line = line,
@@ -178,9 +177,9 @@ tokenize(const StringView *sv) {
                     },
                     .type = TOKEN_STRING,
                     .line = line,
-                    .column = col,
+                    .col = col,
                 };
-                array_push(tokens.tokens, token);
+                array_push(tokens, token);
             } break;
             case '(': {
                 if (scan_peek(&scanner) == ')') {
@@ -188,25 +187,25 @@ tokenize(const StringView *sv) {
                     Token token =  (Token){
                         .type = TOKEN_NIL,
                         .line = line,
-                        .column = col,
+                        .col = col,
                     };
-                    array_push(tokens.tokens, token);
+                    array_push(tokens, token);
                 } else {
                     Token token =  (Token){
                         .type = TOKEN_LPAREN,
                         .line = line,
-                        .column = col,
+                        .col = col,
                     };
-                    array_push(tokens.tokens, token);
+                    array_push(tokens, token);
                 }
             } break;
             case ')': {
                 Token token =  (Token){
                     .type = TOKEN_RPAREN,
                     .line = line,
-                    .column = col,
+                    .col = col,
                 };
-                array_push(tokens.tokens, token);
+                array_push(tokens, token);
             } break;
             default: {
                 size_t n = 1;
@@ -224,10 +223,10 @@ tokenize(const StringView *sv) {
                     },
                     .type = TOKEN_SYMBOL,
                     .line = line,
-                    .column = col,
+                    .col = col,
                 };
                 token.type = find_primitive_type(token.value);
-                array_push(tokens.tokens, token);
+                array_push(tokens, token);
             } break;
         }
     }
@@ -236,9 +235,9 @@ tokenize(const StringView *sv) {
     Token token =  (Token){
         .type = TOKEN_EOF,
         .line = scanner.line_number,
-        .column = 1,
+        .col = 1,
     };
-    array_push(tokens.tokens, token);
+    array_push(tokens, token);
 
     return tokens;
 }