Merge pull request #41 from quark-programming/dev

Major bug fixes and compiler re-writes + a couple small features

Author: ephf

.gitignore

@@ -10,6 +10,11 @@
 # Local testing
 qc
 testing/
+tests/
+build/
 
 # Unit tests
-unit-tests/unit-tests
+unit-tests/unit-tests
+
+# Build
+build/

Makefile

@@ -1,23 +1,145 @@
-# CLion source config
-SRCS := $(wildcard src/*.c) $(wildcard src/*/*.c) $(wildcard src/*/*/*.c) $(wildcard src/*/*/*/*.c) \
-	unit-tests/main.c $(wildcard unit-tests/*/*.c)
-CFLAGS := -Isrc/include -Isrc -Wall -Wno-missing-braces -Wno-char-subscripts
+#-------------------------------------------------
+# Makefile Usage
+# > make                  # release build + unit-tests
+# > make build            # release build qc
+# > make build MODE=debug # debug build qc
+# > make test             # qk tests
+# > make test-c           # unit-tests
+# > make release          # release build qc + unit-tests
+# > make debug            # debug build qc + unit-tests
+# > make clean            # remove build/files
+#-------------------------------------------------
 
-BSRCS := $(wildcard src/*.c) $(wildcard src/*/*.c) $(wildcard src/*/*/*.c) $(wildcard src/*/*/*/*.c)
-UT_SRCS := unit-tests/main.c $(wildcard src/*/*.c) $(wildcard src/*/*/*.c) $(wildcard src/*/*/*/*.c) \
-	$(wildcard unit-tests/*/*.c)
-OUT = qc
+# ========= Tools =========
+CC  := gcc
+QC  := qc
+EXE :=
 
-build: $(SRCS)
-	$(CC) $(CFLAGS) $(BSRCS) -o $(OUT)
+# ========= Platform detection =========
+ifeq ($(OS),Windows_NT)
+	PLATFORM := windows
+	EXE := .exe
+	CC  := $(CC)$(EXE)
+	QC  := $(QC)$(EXE)
 
-build-debug: $(SRCS)
-	$(CC) $(CFLAGS) $(BSRCS) -o $(OUT) -g -ggdb -DEBUG
+	MKDIR = if not exist "$(1)" mkdir "$(1)"
+	RM_RF = if exist "$(1)" rmdir /S /Q "$(1)"
+	RM_F  = if exist "$(1)" del /Q "$(1)"
+	COPY  = copy /Y
+else
+	UNAME_S := $(shell uname -s)
+	ifeq ($(UNAME_S),Darwin)
+		PLATFORM := macos
+	else
+		PLATFORM := linux
+	endif
 
-all: build test
+	MKDIR = mkdir -p "$(1)"
+	RM_RF = rm -rf "$(1)"
+	RM_F  = rm -f "$(1)"
+	COPY  = cp
+endif
 
-test: $(UT_SRCS)
-	$(CC) $(CFLAGS) $(UT_SRCS) -o unit-tests/unit-tests -g
+# ========= Flags =========
+CFLAGS  := -Isrc/include -Isrc -Wall -Wno-missing-braces -Wno-char-subscripts
+LDFLAGS :=
 
+# ========= Directories =========
+BUILD_DIR := build
+TEST_BUILD := $(BUILD_DIR)/tests
+UT_BUILD   := $(BUILD_DIR)/unit_tests
+
+# ========= Mode normalize =========
+MODE ?= release
+MODE_L := $(shell echo $(MODE) | tr A-Z a-z)
+
+# ========= Sources =========
+MAIN_C := src/main.c
+SRCS := \
+	$(wildcard src/*/*.c) \
+	$(wildcard src/*/*/*.c) \
+	$(wildcard src/*/*/*/*.c)
+
+TEST_QK := $(wildcard tests/*.qk)
+
+UT_SRCS := \
+	$(wildcard unit-tests/*.c) \
+	$(wildcard unit-tests/*/*.c) \
+	$(wildcard unit-tests/*/*/*.c) \
+	$(wildcard unit-tests/*/*/*/*.c) \
+
+# ========= Output =========
+OUT := ./${QC}
+
+.PHONY: all build test test-c release debug clean
+.DEFAULT_GOAL := all
+
+# ========= Directories =========
+dirs:
+	@$(call MKDIR,$(BUILD_DIR))
+	@$(call MKDIR,$(TEST_BUILD))
+	@$(call MKDIR,$(UT_BUILD))
+
+# ========= Build qc =========
+build: dirs
+ifeq ($(MODE_L),debug)
+	@echo ------ Debug build qc ------
+	$(CC) $(CFLAGS) $(MAIN_C) $(SRCS) $(LDFLAGS) -g -ggdb -DEBUG -o $(BUILD_DIR)/$(QC)
+else
+	@echo ------ Release build qc ------
+	$(CC) $(CFLAGS) $(MAIN_C) $(SRCS) $(LDFLAGS) -O2 -o $(BUILD_DIR)/$(QC)
+endif
+	@$(COPY) $(BUILD_DIR)/$(QC) $(OUT)
+
+# ========= Default =========
+all: build test-c
+
+# ========= qk tests =========
+test:
+	@echo ------ qk tests ------
+	@$(call MKDIR,$(TEST_BUILD))
+
+ifeq ($(PLATFORM),windows)
+	@if not "$(TEST_QK)"=="" ( \
+		for %%f in ($(TEST_QK)) do ( \
+			$(OUT) %%f -o $(TEST_BUILD)\%%~nf.c -l "$(CURDIR)" && \
+			$(CC) $(CFLAGS) -g $(TEST_BUILD)\%%~nf.c -o $(TEST_BUILD)\%%~nf$(EXE) \
+		) \
+	) else ( \
+		echo No .qk tests found \
+	)
+else
+	@set -e; \
+	if [ -n "$(TEST_QK)" ]; then \
+		for f in $(TEST_QK); do \
+			base=$$(basename $$f .qk); \
+			$(OUT) "$$f" -o "$(TEST_BUILD)/$$base.c" -l "$(CURDIR)"; \
+			$(CC) $(CFLAGS) -g "$(TEST_BUILD)/$$base.c" -o "$(TEST_BUILD)/$$base$(EXE)"; \
+		done; \
+	else \
+		echo "No .qk tests found"; \
+	fi
+endif
+
+# ========= unit-tests =========
+build-test-c: dirs
+	$(CC) $(CFLAGS) -g $(UT_SRCS) $(SRCS) $(LDFLAGS) -o $(UT_BUILD)/unit-tests$(EXE)
+
+test-c: build-test-c
+	@echo ------ unit-tests ------
+	@$(UT_BUILD)/unit-tests$(EXE)
+
+# ========= Presets =========
+release:
+	$(MAKE) build MODE=release
+	$(MAKE) test-c
+
+debug:
+	$(MAKE) build MODE=debug
+	$(MAKE) test-c
+
+# ========= Clean =========
 clean:
-	rm $(OUT)
+	@$(call RM_RF,$(BUILD_DIR))
+	@$(call RM_F,$(OUT))
+

README.md

@@ -9,26 +9,25 @@
 > sure to use the [latest release](https://github.com/quark-programming/quark/releases) You can see and submit issues
 > on the repository's [issues page](https://github.com/quark-programming/quark/issues)
 
-> [!CAUTION]
-> The main branch is currently being worked through an issue, download the more stable release,
-> [0.3.0](https://github.com/quark-programming/quark/releases/tag/0.3.0), instead of cloning
-
 ## Building the Compiler
 
 To build the Compiler:
 
 ```sh
-make build # or specify output with `OUT` (defaults to `qc`)
-make build OUT=/path/to/executable
+make # or specify executable name
+make QC=my_executable
 
 ./qc -h
 ```
 
 ## Compiling a Source File to C:
 
 ```sh
-$ ./qc -h
-$ ./qc <path> -o <out-path>
+export QUARK_ROOT=/path/to/quark
+export PATH=$PATH:$QUARK_ROOT
+
+qc -h
+qc /path/to/input.qk -o /path/to/output.c -l $QUARK_ROOT
 ```
 
 ## Learn More

SECURITY.md

@@ -2,12 +2,13 @@
 
 ## Supported Versions
 
-Currently this repository does not have any secure versions (see table)
+Currently, this repository does not have any secure versions (see table)
 
 | Version | Supported          |
 | ------- | ------------------ |
 | 0.x.x   | :x:                |
 
 ## Reporting a Vulnerability
 
-Reporting a vulnerability works like finding an issue. You can create an [issue](https://github.com/quark-programming/quark/issues), or submit a [pull request](https://github.com/quark-programming/quark/pulls) to fix an vulnerability you find.
+Reporting a vulnerability works like finding an issue. You can create an [issue](https://github.com/quark-programming/quark/issues), or submit a [pull request](https://github.com/quark-programming/quark/pulls)
+to fix a vulnerability you find.

main

@@ -29,7 +29,7 @@ void comp_StructLiteral(void* void_self, String* line, Compiler* compiler) {
     compile(self->type, line, compiler);
     strf(line, ") {");
 
-    for(size_t i = 0; i < self->field_names.size; i++) {
+    for(size_t i = 0; i < self->field_values.size; i++) {
         strf(line, i ? ", " : " ");
         if(self->field_names.data[i].size) {
             strf(line, ".%.*s = ", PRINT(self->field_names.data[i]));

src/compiler/literal/literals.c

@@ -40,9 +40,9 @@ void comp_Surround(void* void_self, String* line, Compiler* compiler) {
     Wrapper* const self = void_self;
     const bool applied_action = apply_action(self->action, 0);
 
-    strf(line, self->Surround.no_parenthesis_wrap ? "%.*s" : "(%.*s", PRINT(self->Surround.prefix));
+    strf(line, "%.*s", PRINT(self->Surround.prefix));
     compile(self->Surround.child, line, compiler);
-    strf(line, self->Surround.no_parenthesis_wrap ? "%.*s" : "%.*s)", PRINT(self->Surround.postfix));
+    strf(line, "%.*s", PRINT(self->Surround.postfix));
 
     if(applied_action) remove_action(self->action, 0);
 }

src/compiler/literal/wrapper.c

@@ -11,7 +11,8 @@ void compile_identifier(const Identifier identifier, String* line) {
         }
 
         if(identifier.parent_scope && identifier.parent_scope->id == NodeStructType
-           && identifier.parent_declaration->id != NodeVariableDeclaration) {
+           && !(identifier.parent_declaration->id == NodeVariableDeclaration
+                && !(identifier.parent_declaration->type->flags & fType))) {
             const Identifier parent_ident = ((StructType*) (void*) identifier.parent_scope)->parent->identifier;
             compile_identifier(parent_ident, line);
             strf(line, "__");
@@ -21,8 +22,7 @@ void compile_identifier(const Identifier identifier, String* line) {
     // TODO: change `PRINT` macro to `FMT` or `STRFMT`
     strf(line, "%.*s", PRINT(identifier.base));
 
-    if(identifier.parent_declaration && identifier.parent_declaration->generics.base_type_arguments.size
-       && identifier.parent_declaration->generics.type_arguments_stack.size && !identifier.is_external) {
+    if(identifier.parent_declaration->generics.type_arguments_stack.size && !identifier.is_external) {
         stringify_generics(line, last(identifier.parent_declaration->generics.type_arguments_stack),
                            StringifyAlphaNumeric);
     }

src/compiler/righthand/declaration/identifier.c

@@ -3,11 +3,15 @@
 void comp_BinaryOperation(void* void_self, String* line, Compiler* compiler) {
     BinaryOperation* const self = void_self;
 
-    strf(line, "(");
     compile(self->left, line, compiler);
-    strf(line, " %.*s ", (int) self->operator.size, self->operator.data);
+
+    strf(line,
+         self->operator.data[0] == '.' || (self->operator.data[0] == '-' && self->operator.data[1] == '>')
+             ? "%.*s"
+             : " %.*s ",
+         (int) self->operator.size, self->operator.data);
+
     compile(self->right, line, compiler);
-    strf(line, ")");
 }
 
 void comp_FunctionCall(void* void_self, String* line, Compiler* compiler) {
@@ -21,4 +25,3 @@ void comp_FunctionCall(void* void_self, String* line, Compiler* compiler) {
     }
     strf(line, ")");
 }
-

src/compiler/righthand/righthand.c

@@ -9,7 +9,7 @@
 #include "vector.h"
 #include "helpers.h"
 
-typedef Vector(char) String;
+typedef Vector(char, String) String;
 
 typedef Vector(String) StringVector;