Fix tests, simulator, and formatting

Author: Dewb

simulator/Makefile

@@ -1,6 +1,6 @@
 .PHONY: clean
 CFLAGS=-std=c99 -g -Wall -fno-common -DSIM -I. -I../src -I../libavr32/src
-DEPS =
+DEPS = ../src/gen/op_enum.h
 OBJ = tt.o ../src/teletype.o ../src/command.o ../src/helpers.o ../src/drum_helpers.o \
 	../src/every.o ../src/gen/match_token.o ../src/gen/scanner.o \
 	../src/scale.o ../src/scene_serialization.o \

src/ops/grid_ops.c

@@ -616,7 +616,7 @@ static void op_G_BTN_X_set(const void *NOTUSED(data), scene_state_t *ss,
     s16 y = GBC.y;
     s16 w = GBC.w;
     s16 h = GBC.h;
-    CLAMP_X_Y_W_H(return );
+    CLAMP_X_Y_W_H(return);
 
     GBC.x = x;
     GBC.y = y;
@@ -640,7 +640,7 @@ static void op_G_BTN_Y_set(const void *NOTUSED(data), scene_state_t *ss,
     s16 x = GBC.x;
     s16 w = GBC.w;
     s16 h = GBC.h;
-    CLAMP_X_Y_W_H(return );
+    CLAMP_X_Y_W_H(return);
 
     GBC.x = x;
     GBC.y = y;
@@ -691,7 +691,7 @@ static void op_G_BTNX_set(const void *NOTUSED(data), scene_state_t *ss,
     s16 y = GBC.y;
     s16 w = GBC.w;
     s16 h = GBC.h;
-    CLAMP_X_Y_W_H(return );
+    CLAMP_X_Y_W_H(return);
 
     GBC.x = x;
     GBC.y = y;
@@ -713,7 +713,7 @@ static void op_G_BTNY_set(const void *NOTUSED(data), scene_state_t *ss,
     s16 x = GBC.x;
     s16 w = GBC.w;
     s16 h = GBC.h;
-    CLAMP_X_Y_W_H(return );
+    CLAMP_X_Y_W_H(return);
 
     GBC.x = x;
     GBC.y = y;
@@ -1138,7 +1138,7 @@ static void op_G_FDR_X_set(const void *NOTUSED(data), scene_state_t *ss,
     s16 y = GFC.y;
     s16 w = GFC.w;
     s16 h = GFC.h;
-    CLAMP_X_Y_W_H(return );
+    CLAMP_X_Y_W_H(return);
 
     GFC.x = x;
     GFC.y = y;
@@ -1162,7 +1162,7 @@ static void op_G_FDR_Y_set(const void *NOTUSED(data), scene_state_t *ss,
     s16 x = GFC.x;
     s16 w = GFC.w;
     s16 h = GFC.h;
-    CLAMP_X_Y_W_H(return );
+    CLAMP_X_Y_W_H(return);
 
     GFC.x = x;
     GFC.y = y;
@@ -1252,7 +1252,7 @@ static void op_G_FDRX_set(const void *NOTUSED(data), scene_state_t *ss,
     s16 y = GFC.y;
     s16 w = GFC.w;
     s16 h = GFC.h;
-    CLAMP_X_Y_W_H(return );
+    CLAMP_X_Y_W_H(return);
 
     GFC.x = x;
     GFC.y = y;
@@ -1274,7 +1274,7 @@ static void op_G_FDRY_set(const void *NOTUSED(data), scene_state_t *ss,
     s16 x = GFC.x;
     s16 w = GFC.w;
     s16 h = GFC.h;
-    CLAMP_X_Y_W_H(return );
+    CLAMP_X_Y_W_H(return);
 
     GFC.x = x;
     GFC.y = y;
@@ -1398,7 +1398,7 @@ static void op_G_XYP_get(const void *NOTUSED(data), scene_state_t *ss,
 
     if (i < (s16)0 || i >= (s16)GRID_XYPAD_COUNT) return;
     if (script < 0 || script > INIT_SCRIPT) script = -1;
-    CLAMP_X_Y_W_H(return );
+    CLAMP_X_Y_W_H(return);
 
     GXYC.enabled = true;
     GXYC.group = SG.current_group;

tests/Makefile

@@ -1,7 +1,9 @@
 .PHONY: clean test
 CFLAGS = -std=c99 -g -Wall -fno-common -DSIM -I../src -I../libavr32/src
 
-tests: main.o \
+DEPS = ../src/gen/op_enum.h
+
+OBJ = main.o \
 	log.o \
 	match_token_tests.o op_mod_tests.o \
 	parser_tests.o process_tests.o \
@@ -28,8 +30,14 @@ tests: main.o \
 	../libavr32/src/euclidean/data.o ../libavr32/src/euclidean/euclidean.o \
 	../libavr32/src/music.o ../libavr32/src/util.o ../libavr32/src/random.o
 
+
+%.o: %.c $(DEPS)
+	$(CC) -c -o $@ $< $(CFLAGS)
+
+tests: $(OBJ)
 	$(CC) -o $@ $^ $(CFLAGS)
 
+
 include ../codegen.mk
 
 test: tests

tests/match_token_tests.c

@@ -2,10 +2,10 @@
 
 #include <string.h>
 
+#include "gen/op_enum.h"
 #include "greatest/greatest.h"
 #include "match_token.h"
 #include "ops/op.h"
-#include "gen/op_enum.h"
 
 // This test asserts that match_token always returns the correct op, it does
 // this by starting with the op in question, extracting the name and running

tests/parser_tests.c

@@ -1,8 +1,8 @@
 #include "parser_tests.h"
 
+#include "gen/op_enum.h"
 #include "greatest/greatest.h"
 #include "ops/op.h"
-#include "gen/op_enum.h"
 #include "teletype.h"
 
 #define CORPUS_COUNT 141

tests/serialize_scene_tests.c

@@ -3,9 +3,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "gen/op_enum.h"
 #include "greatest/greatest.h"
 #include "log.h"
-#include "gen/op_enum.h"
 #include "scene_serialization.h"
 #include "serializer.h"
 #include "state.h"