02_macros/vec.inc

@@ -1,9 +1,14 @@
 #include "../aliases.h"
-#include "../helper_macros.h"
 #include <stdio.h>
 #include <math.h>
 
+#define obj(o, m) o.m
+#define stringify(x) #x
 #define printf_spec(PI) stringify(PI)
+#define typename_concat(C, I) vec##C##I##_t
+#define typename(C, I) typename_concat(C, I)
+#define funcname_concat(B, C, I) vec_##B##_vec##C##I##_t
+#define funcname(B, C, I) funcname_concat(B, C, I)
 
 typedef struct {
 	T x;

03_xmacros/vec.inc

@@ -1,10 +1,14 @@
 #include "../aliases.h"
-#include "../helper_macros.h"
 #include <stdio.h>
 #include <math.h>
 
 #define obj(o, m) o.m
+#define stringify(x) #x
 #define printf_spec(PI) "%" stringify(PI) ", "
+#define typename_concat(C, I) vec##C##I##_t
+#define typename(C, I) typename_concat(C, I)
+#define funcname_concat(B, C, I) vec_##B##_vec##C##I##_t
+#define funcname(B, C, I) funcname_concat(B, C, I)
 
 typedef struct {
 	#define VEC(type, name) type name;

README.md

@@ -6,7 +6,7 @@ Exploring different ideas for implementing generics in C.
 
 [02_macros](./02_macros) is an implementation that uses simple macros to define 2D and 3D vectors for different data types.
 
-[03_xmacros](./03_xmacros) is an implementation that relies on X macros to allow for defining any N-dimensional vector for different data types. In this case, only 2D and 3D vectors were defined, but it can be easily expanded to other dimensions.
+[03_xmacros](./03_xmacros) is an implementation that relies on X macros to allow for defining any N-dimensional vector for different data types. In this case, it is only 2D and 3D vectors, but it can be easily expanded to other dimensions.
 
 ## General assessment of the different techniques
 

helper_macros.h

@@ -1,10 +0,0 @@
-#ifndef HELPER_MACROS_H
-#define HELPER_MACROS_H
-
-#define stringify(x) #x
-#define typename_concat(C, I) vec##C##I##_t
-#define typename(C, I) typename_concat(C, I)
-#define funcname_concat(B, C, I) vec_##B##_vec##C##I##_t
-#define funcname(B, C, I) funcname_concat(B, C, I)
-
-#endif // !HELPER_MACROS_H