refactor: flatten src and migrate to meson

17 files changed, 24 insertions, 24 deletions

diff --git a/src/cli/args.c b/src/args.c
index 501406f..b31def5 100644
--- a/src/cli/args.c
+++ b/src/args.c
@@ -2,7 +2,7 @@
 #include <string.h>
 #include <stdbool.h>
 
-#include "cli/args.h"
+#include "args.h"
 
 #define HDASS_VERSION "0.1.0"
 
diff --git a/src/cli/args.h b/src/args.h
index f80b736..f80b736 100644
--- a/src/cli/args.h
+++ b/src/args.h
diff --git a/src/parser/ast.c b/src/ast.c
index 63d8a08..28bb98e 100644
--- a/src/parser/ast.c
+++ b/src/ast.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 
-#include "parser/ast.h"
+#include "ast.h"
 
 void free_expr(struct Expr* expr)
 {
diff --git a/src/parser/ast.h b/src/ast.h
index 288bddf..074c9b2 100644
--- a/src/parser/ast.h
+++ b/src/ast.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "lexer/lexer.h"
+#include "lexer.h"
 
 enum StoreSize
 {
diff --git a/src/diag/diag.c b/src/diag.c
index cc61e89..6962046 100644
--- a/src/diag/diag.c
+++ b/src/diag.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 
-#include "diag/diag.h"
+#include "diag.h"
 
 static bool colored(void)
 {
diff --git a/src/diag/diag.h b/src/diag.h
index 7a99266..e79b465 100644
--- a/src/diag/diag.h
+++ b/src/diag.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "lexer/lexer.h"
+#include "lexer.h"
 
 struct Source
 {
diff --git a/src/io/file.c b/src/file.c
index 3d7083c..a122468 100644
--- a/src/io/file.c
+++ b/src/file.c
@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "diag/diag.h"
-#include "io/file.h"
+#include "diag.h"
+#include "file.h"
 
 static void report_file_error(const char* verb, const char* path)
 {
diff --git a/src/io/file.h b/src/file.h
index 7d15bd0..7d15bd0 100644
--- a/src/io/file.h
+++ b/src/file.h
diff --git a/src/lexer/lexer.c b/src/lexer.c
index 4d468e6..0d26f9a 100644
--- a/src/lexer/lexer.c
+++ b/src/lexer.c
@@ -1,7 +1,7 @@
 #include <string.h>
 #include <stdbool.h>
 
-#include "lexer/lexer.h"
+#include "lexer.h"
 
 static bool is_alpha(char character)
 {
diff --git a/src/lexer/lexer.h b/src/lexer.h
index 73de02f..73de02f 100644
--- a/src/lexer/lexer.h
+++ b/src/lexer.h
diff --git a/src/main.c b/src/main.c
index 71e8918..4153a6e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,12 +1,12 @@
 #include <stdio.h>
 
-#include "io/file.h"
-#include "cli/args.h"
-#include "diag/diag.h"
-#include "sema/sema.h"
-#include "lexer/lexer.h"
-#include "codegen/nasm.h"
-#include "parser/parser.h"
+#include "file.h"
+#include "args.h"
+#include "diag.h"
+#include "sema.h"
+#include "lexer.h"
+#include "nasm.h"
+#include "parser.h"
 
 int main(int argc, char** argv)
 {
diff --git a/src/codegen/nasm.c b/src/nasm.c
index 198cb5c..15f5f01 100644
--- a/src/codegen/nasm.c
+++ b/src/nasm.c
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <stdbool.h>
 
-#include "codegen/nasm.h"
+#include "nasm.h"
 
 static void emit_const_expr(struct Expr* expr, FILE* out)
 {
diff --git a/src/codegen/nasm.h b/src/nasm.h
index b9c2c90..1a93b31 100644
--- a/src/codegen/nasm.h
+++ b/src/nasm.h
@@ -2,6 +2,6 @@
 
 #include <stdio.h>
 
-#include "parser/ast.h"
+#include "ast.h"
 
 void generate_nasm(struct Program* program, FILE* out);
diff --git a/src/parser/parser.c b/src/parser.c
index 97b8569..4c01c86 100644
--- a/src/parser/parser.c
+++ b/src/parser.c
@@ -2,8 +2,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "diag/diag.h"
-#include "parser/parser.h"
+#include "diag.h"
+#include "parser.h"
 
 struct Parser
 {
diff --git a/src/parser/parser.h b/src/parser.h
index 82d306a..82a3019 100644
--- a/src/parser/parser.h
+++ b/src/parser.h
@@ -2,7 +2,7 @@
 
 #include <stdbool.h>
 
-#include "lexer/lexer.h"
-#include "parser/ast.h"
+#include "ast.h"
+#include "lexer.h"
 
 bool parse_program(struct Lexer* lexer, struct Program* out);
diff --git a/src/sema/sema.c b/src/sema.c
index 748ccbe..12f2689 100644
--- a/src/sema/sema.c
+++ b/src/sema.c
@@ -3,7 +3,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "sema/sema.h"
+#include "sema.h"
 
 static bool token_is(struct Token token, const char* text)
 {
diff --git a/src/sema/sema.h b/src/sema.h
index 468d1be..f28c49c 100644
--- a/src/sema/sema.h
+++ b/src/sema.h
@@ -2,7 +2,7 @@
 
 #include <stdbool.h>
 
-#include "diag/diag.h"
-#include "parser/ast.h"
+#include "ast.h"
+#include "diag.h"
 
 bool analyze_program(struct Source source, struct Program* program);