Merge pull request #52 from quark-programming/feat-mult-imp

multiple import directories

Author: ephf

src/main.c

@@ -9,11 +9,9 @@
 #include "parser/keywords.h"
 #include "compiler/righthand/declaration/identifier.h"
 
-#define QUARK_VERSION "0.4.0b"
+#define QUARK_VERSION "0.4.1"
 #define QUARK_STABILITY "untested"
 
-typedef Vector(char*) CStringVector;
-
 FunctionDeclaration* entry_declaration() {
     FunctionType* function_type = (void*) new_type((Type) { NodeFunctionType });
     Type* const int_type = new_type((Type) { .External = { NodeExternal, .data = String("int") } });
@@ -66,7 +64,7 @@ int main(int argc, char** argv) {
                 output_file = clarg();
                 break;
             case 'l':
-                global_library_path = clarg();
+                push(&global_library_paths, clarg());
                 break;
             case 'i':
                 push(&include_paths, clarg());
@@ -75,6 +73,8 @@ int main(int argc, char** argv) {
         }
     }
 
+    push(&global_library_paths, ".");
+
     push(&include_paths, "stdint.h");
     push(&include_paths, "stdio.h");
     push(&include_paths, "string.h");

src/parser/statement/keywords.c

@@ -7,39 +7,46 @@
 #include "../type/clash_types.h"
 #include "../type/types.h"
 
-char* global_library_path = ".";
+CStringVector global_library_paths = { 0 };
 
 // TODO: (organizational) move some of these functions out of this file
 
 Node* keyword_import(const Token token, Parser* parser) {
-    String import_path = strf(0, global_library_path);
+    String sub_path = { 0 };
     Trace full_trace = token.trace;
 
     do {
         const Trace section = expect(parser->tokenizer, TokenIdentifier).trace;
-        strf(&import_path, "/%.*s", PRINT(section.source));
+        strf(&sub_path, "/%.*s", PRINT(section.source));
         full_trace = stretch(full_trace, section);
     } while(try(parser->tokenizer, TokenDoubleColon, NULL));
     expect(parser->tokenizer, ';');
 
-    strf(&import_path, ".qk");
-    push(&import_path, '\0');
+    strf(&sub_path, ".qk");
 
-    char* input_content = fs_readfile(import_path.data);
-    if(!input_content) {
-        push(parser->tokenizer->messages,
-             REPORT_ERR(full_trace, strf(0, "unable to open or read '%.*s'", PRINT(import_path))));
-        return new_node((Node) { NodeNone });
-    }
+    String import_path = { 0 };
+    for(size_t i = 0; i < global_library_paths.size; i++) {
+        strf(&import_path, "%s%.*s%c", global_library_paths.data[i], PRINT(sub_path), 0);
+        char* input_content = fs_readfile(import_path.data);
+
+        if(!input_content) {
+            import_path.size = 0;
+            continue;
+        }
 
-    Tokenizer import_tokenizer = new_tokenizer(import_path.data, input_content, parser->tokenizer->messages);
-    Tokenizer* const tokenizer = parser->tokenizer;
-    parser->tokenizer = &import_tokenizer;
+        Tokenizer import_tokenizer = new_tokenizer(import_path.data, input_content, parser->tokenizer->messages);
+        Tokenizer* const tokenizer = parser->tokenizer;
+        parser->tokenizer = &import_tokenizer;
 
-    Scope* scope = new_scope(NULL);
-    scope->children = collect_until(parser, &statement, 0, 0);
-    parser->tokenizer = tokenizer;
-    return (void*) scope;
+        Scope* scope = new_scope(NULL);
+        scope->children = collect_until(parser, &statement, 0, 0);
+        parser->tokenizer = tokenizer;
+        return (void*) scope;
+    }
+
+    push(parser->tokenizer->messages,
+         REPORT_ERR(full_trace, strf(0, "unable to open or read '%.*s'", PRINT(import_path))));
+    return new_node((Node) { NodeNone });
 }
 
 Node* keyword_return(const Token token, Parser* parser) {

src/parser/statement/statement.h

@@ -8,6 +8,8 @@ NodeVector collect_until(Parser* parser, Node* (*supplier)(Parser*), char separa
 
 Node* statement(Parser* parser);
 
-extern char* global_library_path;
+typedef Vector(char*) CStringVector;
+
+extern CStringVector global_library_paths;
 
 #endif