Moved the responsibility for opening files from the parser to stream.c

Author: Fedjmike

inc/lexer.h

@@ -74,7 +74,7 @@ typedef struct lexerCtx {
     int length;
 } lexerCtx;
 
-lexerCtx* lexerInit (FILE* file);
+lexerCtx* lexerInit (const char* filename);
 void lexerEnd (lexerCtx* ctx);
 
 void lexerNext (lexerCtx* ctx);

inc/stream.h

@@ -13,7 +13,7 @@ typedef struct streamCtx {
     int lineChar;
 } streamCtx;
 
-streamCtx* streamInit (FILE* file);
+streamCtx* streamInit (const char* filename);
 void streamEnd (streamCtx* ctx);
 
 /**

src/lexer.c

@@ -16,9 +16,9 @@ static bool lexerTryEatNext (lexerCtx* ctx, char c);
 
 static keywordTag lookKeyword (const char* str);
 
-lexerCtx* lexerInit (FILE* file) {
+lexerCtx* lexerInit (const char* filename) {
     lexerCtx* ctx = malloc(sizeof(lexerCtx));
-    ctx->stream = streamInit(file);
+    ctx->stream = streamInit(filename);
     ctx->line = 1;
     ctx->lineChar = 1;
 

src/parser.c

@@ -25,7 +25,7 @@ static ast* parserDoWhile (parserCtx* ctx);
 static ast* parserFor (parserCtx* ctx);
 
 static void parserInit (parserCtx* ctx, sym* scope, char* filename, char* fullname, compilerCtx* comp) {
-    ctx->lexer = lexerInit(fopen(fullname, "r"));
+    ctx->lexer = lexerInit(fullname);
     ctx->location = (tokenLocation) {0, 0, 0};
 
     ctx->filename = filename;

src/stream.c

@@ -6,9 +6,9 @@
 #include "stdlib.h"
 #include "stdio.h"
 
-streamCtx* streamInit (FILE* file) {
+streamCtx* streamInit (const char* filename) {
     streamCtx* ctx = malloc(sizeof(streamCtx));
-    ctx->file = file;
+    ctx->file = fopen(filename, "r");
 
     ctx->current = 0;
     ctx->line = 1;