Merge pull request #45 from quark-programming/dev

0.3.1c With C Keyword Fix and Include Flag

Author: ephf

.gitignore

@@ -4,17 +4,19 @@
 # MacOS
 .DS_Store
 
-# CLion builds
+# Debugger Tools
 *.dSYM/
 
-# Local testing
+# bin
 qc
-testing/
+main
+
+# Local Testing
 tests/
-build/
+testing/
 
-# Unit tests
+# Unit Tests
 unit-tests/unit-tests
 
 # Build
-build/
+build/

main

@@ -19,7 +19,10 @@ static void function_declaration_compiler_hoisted(FunctionDeclaration* const sel
         if(i) strf(&declaration_line, ", ");
 
         compile(self->arguments.data[i].type, &declaration_line, compiler);
-        if(!hoisted) strf(&declaration_line, " %.*s", PRINT(self->arguments.data[i].identifier));
+        if(!hoisted) {
+            strf(&declaration_line, " ");
+            compile_identifier_base(self->arguments.data[i].identifier, &declaration_line);
+        }
     }
     strf(&declaration_line, hoisted ? ");" : ") {");
     push(&compiler->sections.data[(size_t) hoisted ? (size_t) hoisted : section].lines, declaration_line);

src/compiler/righthand/declaration/function_declaration.c

@@ -2,6 +2,32 @@
 
 #include "../../../parser/type/stringify_type.h"
 
+StringHashSet global_c_keywords = 0;
+
+void populate_global_c_keywords() {
+    // https://en.cppreference.com/w/c/keyword.html
+    char* keywords[] = {
+        "alignas", "alignas", "alignof", "auto", "bool", "break", "case", "char", "const", "constexpr", "continue",
+        "default", "do", "double", "else", "enum", "extern", "false", "float", "for", "goto", "if", "inline", "int",
+        "long", "nullptr", "register", "restrict", "return", "short", "signed", "sizeof", "static", "static_assert",
+        "struct", "switch", "thread_local", "true", "typedef", "typeof", "typeof_unequal", "union", "unsigned", "void",
+        "volatile", "while", "_Alignas", "_Alignof", "_Atomic", "_BitInt", "_Bool", "_Complex", "_Decimal128",
+        "_Decimal32", "_Decimal64", "_Generic", "_Imaginary", "_Noreturn", "_Static_assert", "_Thread_local",
+    };
+
+    for(int i = 0; i < sizeof(keywords) / sizeof(char*); i++) {
+        put(&global_c_keywords, ((String) { strlen(keywords[i]), 0, keywords[i] }));
+    }
+}
+
+void compile_identifier_base(const String base, String* line) {
+    strf(line, "%.*s", PRINT(base));
+
+    if(get(global_c_keywords, base)) {
+        strf(line, "_");
+    }
+}
+
 void compile_identifier(const Identifier identifier, String* line) {
     if(!identifier.is_external) {
         if(identifier.parent_scope && identifier.parent_scope->id == NodeFunctionDeclaration) {
@@ -20,7 +46,7 @@ void compile_identifier(const Identifier identifier, String* line) {
     }
 
     // TODO: change `PRINT` macro to `FMT` or `STRFMT`
-    strf(line, "%.*s", PRINT(identifier.base));
+    compile_identifier_base(identifier.base, line);
 
     if(identifier.parent_declaration->generics.type_arguments_stack.size && !identifier.is_external) {
         stringify_generics(line, last(identifier.parent_declaration->generics.type_arguments_stack),

src/compiler/righthand/declaration/identifier.c

@@ -3,6 +3,15 @@
 
 #include "../../compiler.h"
 
+
+typedef HashMap(UsableVoid) StringHashSet;
+
+extern StringHashSet global_c_keywords;
+
+void compile_identifier_base(String base, String* line);
+
 void compile_identifier(Identifier identifier, String* line);
 
+void populate_global_c_keywords();
+
 #endif

src/compiler/righthand/declaration/identifier.h

@@ -10,7 +10,9 @@ static void compile_struct_declaration(StructType* self, String* line, Compiler*
     strf(&typedef_line, " { ");
     for(size_t i = 0; i < self->fields.size; i++) {
         compile(self->fields.data[i].type, &typedef_line, compiler);
-        strf(&typedef_line, " %.*s; ", PRINT(self->fields.data[i].identifier));
+        strf(&typedef_line, " ");
+        compile_identifier_base(self->fields.data[i].identifier, &typedef_line);
+        strf(&typedef_line, "; ");
     }
     strf(&typedef_line, "};");
 

src/compiler/righthand/declaration/variable_declaration.c

@@ -7,6 +7,7 @@
 #include "parser/statement/statement.h"
 #include "parser/type/types.h"
 #include "parser/keywords.h"
+#include "compiler/righthand/declaration/identifier.h"
 
 #define QUARK_VERSION "0.3.1b"
 #define QUARK_STABILITY "untested"
@@ -47,23 +48,38 @@ int main(int argc, char** argv) {
     CStringVector input_files = { 0 };
     char* output_file = "out.c";
 
+    CStringVector include_paths = { 0 };
+
     int flag;
-    while((flag = clflag()))
+    while((flag = clflag())) {
         switch(flag) {
             case 'h':
                 printf(help_message, name, name);
                 return 0;
             case 'v':
                 puts("Quark Compiler version " QUARK_VERSION " \33[90m" QUARK_STABILITY "\33[0m");
                 return 0;
-            case -1: push(&input_files, clarg());
+            case -1:
+                push(&input_files, clarg());
+                break;
+            case 'o':
+                output_file = clarg();
                 break;
-            case 'o': output_file = clarg();
+            case 'l':
+                global_library_path = clarg();
                 break;
-            case 'l': global_library_path = clarg();
+            case 'i':
+                push(&include_paths, clarg());
                 break;
             default: panicf("unknown flag '-%c'\n hint: %s -h\n", flag, name);
         }
+    }
+
+    push(&include_paths, "stdint.h");
+    push(&include_paths, "stdio.h");
+    push(&include_paths, "string.h");
+    push(&include_paths, "stdlib.h");
+    push(&include_paths, "stdbool.h");
 
     if(input_files.size == 0) {
         panicf("missing input files\n hint: %s -h\n", name);
@@ -84,18 +100,23 @@ int main(int argc, char** argv) {
 
     push(&compiler.sections, (CompilerSection) { 0 });
     push(&compiler.sections, (CompilerSection) { 0 });
-    push(&compiler.sections.data[0].lines, String("#include <stdint.h>"));
-    push(&compiler.sections.data[0].lines, String("#include <stdio.h>"));
-    push(&compiler.sections.data[0].lines, String("#include <string.h>"));
-    push(&compiler.sections.data[0].lines, String("#include <stdlib.h>"));
-    push(&compiler.sections.data[0].lines, String("#include <stdbool.h>"));
+
+    for(size_t i = 0; i < include_paths.size; i++) {
+        push(&compiler.sections.data[0].lines, strf(0, "#include \"%s\"", include_paths.data[i]));
+    }
+    // push(&compiler.sections.data[0].lines, String("#include <stdint.h>"));
+    // push(&compiler.sections.data[0].lines, String("#include <stdio.h>"));
+    // push(&compiler.sections.data[0].lines, String("#include <string.h>"));
+    // push(&compiler.sections.data[0].lines, String("#include <stdlib.h>"));
+    // push(&compiler.sections.data[0].lines, String("#include <stdbool.h>"));
 
     push(&parser.stack, new_scope(NULL));
 
     FunctionDeclaration* entry = entry_declaration();
     push(&parser.stack, entry->body);
 
     populate_keyword_table();
+    populate_global_c_keywords();
 
     push(&entry->body->children, eval_w("lib::std", "import lib::std;", &parser, &statement));
     const NodeVector body = collect_until(&parser, &statement, 0, 0);