G

meta: Move misc.h into cll

Diffstat

12 files changed, 16 insertions, 15 deletions

diff --git a/src/misc.h b/src/cll/cll.h
similarity index 89%
rename from src/misc.h
rename to src/cll/cll.h
index 89166a1..83a288f 100644
--- a/src/misc.h
+++ b/src/cll/cll.h
@@ -1,12 +1,12 @@
-// misc.h
-// Misc header file for G
+// cll.h
+// cll header file for cll
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.
 

 
-#ifndef OMKOV_G_MISC_H_ZO7IRBJS
-#define OMKOV_G_MISC_H_ZO7IRBJS
+#ifndef OMKOV_CLL_CLL_H_ZO7IRBJS
+#define OMKOV_CLL_CLL_H_ZO7IRBJS
 
 #include <float.h>
 #include <stdbool.h>
@@ -20,6 +20,7 @@ typedef uint16_t  u16;
 typedef uint32_t  u32;
 typedef uint64_t  u64;
 typedef uintptr_t uint_;
+
 #define UINT uint_
 
 typedef int8_t   s8;
@@ -71,6 +72,4 @@ typedef char *str;
 #define IS_DOZ(c) ((c >= '0' && c <= '9') || (c == 'A' || c == 'B'))
 #define IS_HEX(c) ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F'))
 
-typedef struct { UINT fi, fp, ln, cl; } pos;
-
-#endif // OMKOV_G_MISC_H_ZO7IRBJS
+#endif // OMKOV_CLL_CLL_H_ZO7IRBJS
diff --git a/src/compile.c b/src/compile.c
index f4dd99d..43e9c13 100644
--- a/src/compile.c
+++ b/src/compile.c
@@ -7,7 +7,7 @@
 
 #include "compile.h"
 #include "lexer.h"
-#include "misc.h"
+#include "cll/cll.h"
 #include "parser.h"
 #include "util/ast.h"
 
diff --git a/src/compile.h b/src/compile.h
index 7d05b67..bb61672 100644
--- a/src/compile.h
+++ b/src/compile.h
@@ -8,7 +8,7 @@
 #ifndef OMKOV_G_COMPILE_H_DSDZQ0ZM
 #define OMKOV_G_COMPILE_H_DSDZQ0ZM
 
-#include "misc.h"
+#include "cll/cll.h"
 
 extern bool lflag, pflag;
 
diff --git a/src/lexer.h b/src/lexer.h
index fc48e8d..4764282 100644
--- a/src/lexer.h
+++ b/src/lexer.h
@@ -8,7 +8,7 @@
 #ifndef OMKOV_G_LEXER_H_O0ISYNPF
 #define OMKOV_G_LEXER_H_O0ISYNPF
 
-#include "misc.h"
+#include "cll/cll.h"
 
 #define TOK_KS \
 TOK_K(LK_VOID, "NULL") \
diff --git a/src/main.c b/src/main.c
index 75d19a6..27965f2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,7 +6,7 @@
 

 #include "compile.h"
-#include "misc.h"
+#include "cll/cll.h"
 
 #include "cll/error.h"
 #include "cll/optget.h"
diff --git a/src/map.c b/src/map.c
index c4e7e25..0130bae 100644
--- a/src/map.c
+++ b/src/map.c
@@ -6,7 +6,7 @@
 

 #include "map.h"
-#include "misc.h"
+#include "cll/cll.h"
 
 #include "cll/fnv.h"
 
diff --git a/src/map.h b/src/map.h
index 14baf10..477c85f 100644
--- a/src/map.h
+++ b/src/map.h
@@ -8,7 +8,7 @@
 #ifndef OMKOV_G_MAP_H_ISL5XLWM
 #define OMKOV_G_MAP_H_ISL5XLWM
 
-#include "misc.h"
+#include "cll/cll.h"
 #include "type.h"
 
 typedef enum { SK_VOID, } ent_k; /* Entry Kind */
diff --git a/src/parser.c b/src/parser.c
index fd850a9..111fb32 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -6,7 +6,7 @@
 

 #include "lexer.h"
-#include "misc.h"
+#include "cll/cll.h"
 #include "parser.h"
 #include "type.h"
 #include "util/stack.h"
diff --git a/src/parser.h b/src/parser.h
index 29f34de..87209dc 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -9,7 +9,7 @@
 #define OMKOV_G_PARSER_H_1QQ9RNKG
 
 #include "lexer.h"
-#include "misc.h"
+#include "cll/cll.h"
 #include "type.h"
 #include "util/stack.h"
 #include "value.h"
diff --git a/src/type.h b/src/type.h
index 77beb52..9503743 100644
--- a/src/type.h
+++ b/src/type.h
@@ -8,7 +8,7 @@
 #ifndef OMKOV_G_TYPE_H_QHH0TJJQ
 #define OMKOV_G_TYPE_H_QHH0TJJQ
 
-#include "misc.h"
+#include "cll/cll.h"
 
 typedef enum {
 	TK_VOID, TK_PTR, TK_TYPE, TK_ANY,
diff --git a/src/value.c b/src/value.c
index f73355d..7bb75e2 100644
--- a/src/value.c
+++ b/src/value.c
@@ -5,7 +5,7 @@
 

 
-#include "misc.h"
+#include "cll/cll.h"
 #include "value.h"
 
 #include <errno.h>
diff --git a/src/value.h b/src/value.h
index cfe6a3a..625e980 100644
--- a/src/value.h
+++ b/src/value.h
@@ -8,7 +8,7 @@
 #ifndef OMKOV_G_VALUE_H_X2RKXBBA
 #define OMKOV_G_VALUE_H_X2RKXBBA
 
-#include "misc.h"
+#include "cll/cll.h"
 
 typedef enum { VK_NULL, VK_BOOL, VK_INT, VK_FLT } val_k;