Add `tests` target to makefile

2 files changed, 33 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index b6419fd..5af466c 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,10 @@
 # Source code location and files to watch for changes.
 SRC_DIR     := src
 BUILD_DIR   := build
+TESTS_DIR   := tests
+TEST_FILES  := $(wildcard $(TESTS_DIR)/*.bad)
 SRC_MAIN    := $(SRC_DIR)/main.c
-SRC_BAD     := tests/conditionals.bad
+SRC_RUN     := tests/conditionals.bad
 WATCH_SRC   := $(shell find $(SRC_DIR) -name "*.c" -or -name "*.s" -or -name "*.h")
 INC_DIRS    := $(shell find $(SRC_DIR) -type d)
 INC_FLAGS   := $(addprefix -I,$(INC_DIRS))
@@ -45,7 +47,7 @@ endif
 
 main: $(BIN)
 
-$(BIN): $(SRC_MAIN) $(WATCH_SRC) $(BUILD_DIR)
+$(BIN): $(SRC_MAIN) $(WATCH_SRC) | $(BUILD_DIR)
         $(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN) $(SRC_MAIN) $(LDLIBS)
 
 # Create build directory if needed.
@@ -53,22 +55,28 @@ $(BUILD_DIR):
         mkdir -p $(BUILD_DIR)
 
 run: $(BIN)
-        $(BIN) $(SRC_BAD)
+        $(BIN) $(SRC_RUN)
 
 graph-tokens: $(BIN)
-        $(BIN) -pl $(SRC_BAD)
+        $(BIN) -pl $(SRC_RUN)
 
 graph-parse: $(BIN)
-        @echo "parsing tree for: '$(SRC_BAD)'"
-        @$(BIN) -pp $(SRC_BAD) | $(DOT)
+        @echo "parsing tree for: '$(SRC_RUN)'"
+        @$(BIN) -pp $(SRC_RUN) | $(DOT)
 
 graph-semantic: $(BIN)
-        @echo "semantic tree for: '$(SRC_BAD)'"
-        @$(BIN) -ps $(SRC_BAD) | $(DOT)
+        @echo "semantic tree for: '$(SRC_RUN)'"
+        @$(BIN) -ps $(SRC_RUN) | $(DOT)
 
 graph-symbols: $(BIN)
-        @echo "symbol table for: '$(SRC_BAD)'"
-        @$(BIN) -pt $(SRC_BAD) | $(DOT)
+        @echo "symbol table for: '$(SRC_RUN)'"
+        @$(BIN) -pt $(SRC_RUN) | $(DOT)
+
+tests: $(BIN)
+        @for name in $(TEST_FILES); do\
+                printf "$${name}\r" ;\
+                $(BIN) $${name} && printf "$${name}\tOK!\n";\
+        done
 
 # Remove build directory.
 clean:
diff --git a/src/main.c b/src/main.c
index 68ad857..1c0d2e1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -80,6 +80,8 @@ typedef enum NodeKind {
     NODE_CASE,
     NODE_COND,
     NODE_ENUM,
+    NODE_BREAK,
+    NODE_CONTINUE,
     // Helpers.
     NODE_SYMBOL_IDX,
     NODE_TYPE,
@@ -131,6 +133,8 @@ Str node_str[] = {
     [NODE_CASE] = cstr("CASE"),
     [NODE_COND] = cstr("COND"),
     [NODE_ENUM] = cstr("ENUM"),
+    [NODE_BREAK] = cstr("BREAK"),
+    [NODE_CONTINUE] = cstr("CONTINUE"),
     // Helpers.
     [NODE_TYPE] = cstr("TYPE"),
     [NODE_ARR_TYPE] = cstr("TYPE (ARR)"),
@@ -663,6 +667,14 @@ parse_keyword(Parser *parser) {
                 array_push(node->match_cases, tmp, parser->storage);
             }
         } break;
+        case TOK_BREAK: {
+            node = node_alloc(parser, NODE_BREAK, prev);
+            if (!node) return;
+        } break;
+        case TOK_CONTINUE: {
+            node = node_alloc(parser, NODE_CONTINUE, prev);
+            if (!node) return;
+        } break;
         default: return;  // Unreachable.
     }
     array_push(parser->nodes, node, parser->storage);
@@ -966,7 +978,7 @@ process_file(Str path) {
     FileContents file = platform_read_file(path, &lexer_arena);
     if (file.err) {
         eprintln("%s: error: %s", path, cstr("WOT"));
-        return;
+        exit(EXIT_FAILURE);
     }
     sz errors = 0;
 
@@ -986,7 +998,7 @@ process_file(Str path) {
     }
     // Only proceed if there are no errors.
     if (errors) {
-        goto stop;
+        exit(EXIT_FAILURE);
     }
     if (mode == PRINT_LEX) {
         print_tokens(path, tokens);
@@ -1011,7 +1023,7 @@ process_file(Str path) {
         }
     }
     if (parser.err) {
-        goto stop;
+        exit(EXIT_FAILURE);
     }
     if (mode == PRINT_PARSE) {
         graph_ast(parser.nodes);