it compiles

diff --git a/source/main.c b/source/main.c
index 5027f930bae4c2e3d49854087228a566c9b775cc..7a7390e3b74f3ddf32e7612fe1c3ddcd9a01f3d2 100644 (file)
--- a/source/main.c
+++ b/source/main.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include "hl.h"
+#include "terminal_hl.h"
 
 #define ALLOCATION_CHUNK (10UL)
 
@@ -36,7 +36,7 @@ int main(int      argc,
        // Highlight init
        terminal_hl_init();
        //
-       #include "hl_c.inc";
+       #include "hl_c.inc"
        //
        render_string(buffer, "cterm");
        putchar('\n');

diff --git a/source/regex.c b/source/regex.c
index e59e14f83fc6def52849ea5d6cef829d9b426296..cef41ad44f995393c8a99d174cde7d3b6b9652fd 100644 (file)
--- a/source/regex.c
+++ b/source/regex.c
@@ -19,12 +19,12 @@ typedef struct {
 #define HOOK_ALL(from, str, to) do {                   \
        for (char * s = str; *s != '\00'; s++) {           \
                vector_push(&regex->delta_table,               \
-                       (delta_t *){state + from, *s, state + to}  \
+                       &(delta_t){state + from, *s, state + to}   \
                );                                             \
        }                                                  \
        if (do_catch) {                                    \
                vector_push(&regex->catch_table,               \
-                       (offshoot_t *){state + from, state + to}   \
+                       &(offshoot_t){state + from, state + to}    \
                );                                             \
        }                                                  \
 } while (0)

diff --git a/source/terminal_hl.h b/source/terminal_hl.h
index 5d4e2c77583ef8939000872f57c6f79a8186c48e..19e6b0ff4b3ea374f6f056886cdde8ebc58f8c9c 100644 (file)
--- a/source/terminal_hl.h
+++ b/source/terminal_hl.h
@@ -1,3 +1,5 @@
+#include "hl.h"
+
 typedef struct {
        char * attribute;
        char * foreground_color;
@@ -38,7 +40,7 @@ int terminal_hl_init(void){
                .foreground_color = TERMINAL_COLOR_FG_GREEN,
                .background_color = NULL
        };
-       keyword_hl = (hl_group_t) {
+       keyword_hl = &(hl_group_t) {
                .link = NULL,
                .attributes = (void*)&terminal_keyword_hl
        };
@@ -48,7 +50,7 @@ int terminal_hl_init(void){
                .foreground_color = TERMINAL_COLOR_FG_BLUE,
                .background_color = NULL
        };
-       preprocessor_hl = (hl_group_t) {
+       preprocessor_hl = &(hl_group_t) {
                .link = NULL,
                .attributes = (void*)&terminal_preprocessor_hl
        };
@@ -58,7 +60,7 @@ int terminal_hl_init(void){
                .foreground_color = TERMINAL_COLOR_FG_YELLOW,
                .background_color = NULL
        };
-       symbol_hl = (hl_group_t) {
+       symbol_hl = &(hl_group_t) {
                .link = NULL,
                .attributes = (void*)&terminal_symbol_hl
        };

diff --git a/source/vector.c b/source/vector.c
new file mode 100644 (file)
index 0000000..8713e35
--- /dev/null
+++ b/source/vector.c
@@ -0,0 +1,69 @@
+#include "vector.h"
+
+void vector_init(vector_t * vector,
+                 size_t     element_size,
+                 size_t     element_count) {
+       vector->data          = NULL;
+       vector->element_size  = element_size;
+       vector->element_count = element_count;
+
+       vector->data = malloc(vector->element_size * vector->element_count);
+
+       if ((! vector->data) && (vector->element_count)) {
+               puts("vector_init");
+               exit(EXIT_FAILURE);
+       }
+
+       memset(vector->data,
+              0,
+              vector->element_size * vector->element_count);
+}
+
+void vector_push(vector_t * vector,
+                 void     * data) {
+       ++vector->element_count;
+
+       vector->data = realloc(vector->data,
+                              vector->element_size * vector->element_count);
+
+       if (! vector->data) {
+               puts("vector_push");
+               exit(EXIT_FAILURE);
+       }
+
+       memcpy(&vector->data[(vector->element_count - 1) * vector->element_size],
+              data,
+              vector->element_size);
+}
+
+void vector_pop(vector_t * vector) {
+       (void) vector;
+}
+
+void * vector_get(const vector_t * const vector,
+                  const size_t           element) {
+       if (element >= vector->element_count) {
+               puts("vector_get");
+               exit(EXIT_FAILURE);
+       }
+
+       return &vector->data[vector->element_size * element];
+}
+
+void vector_set(vector_t * vector,
+                void     * data,
+                size_t     element) {
+       if (element >= vector->element_count) {
+               puts("vector_set");
+               exit(EXIT_FAILURE);
+       }
+
+       memcpy(&vector->data[vector->element_size * element],
+              data,
+              vector->element_size);
+}
+
+void vector_free(vector_t * vector) {
+       free(vector->data);
+}
+

diff --git a/source/vector.h b/source/vector.h
index 3e9740bcfeccd5f00f334a7ced6d7b263d718228..bb2e100bab04be090c9ee54ccb028cc5f9ee849d 100644 (file)
--- a/source/vector.h
+++ b/source/vector.h
@@ -31,72 +31,4 @@ extern void vector_set(vector_t * vector,
                        size_t     element);
 
 extern void vector_free(vector_t * vector);
-
-void vector_init(vector_t * vector,
-                 size_t     element_size,
-                 size_t     element_count) {
-       vector->data          = NULL;
-       vector->element_size  = element_size;
-       vector->element_count = element_count;
-
-       vector->data = malloc(vector->element_size * vector->element_count);
-
-       if ((! vector->data) && (vector->element_count)) {
-               puts("vector_init");
-               exit(EXIT_FAILURE);
-       }
-
-       memset(vector->data,
-              0,
-              vector->element_size * vector->element_count);
-}
-
-void vector_push(vector_t * vector,
-                 void     * data) {
-       ++vector->element_count;
-
-       vector->data = realloc(vector->data,
-                              vector->element_size * vector->element_count);
-
-       if (! vector->data) {
-               puts("vector_push");
-               exit(EXIT_FAILURE);
-       }
-
-       memcpy(&vector->data[(vector->element_count - 1) * vector->element_size],
-              data,
-              vector->element_size);
-}
-
-void vector_pop(vector_t * vector) {
-       (void) vector;
-}
-
-void * vector_get(const vector_t * const vector,
-                  const size_t           element) {
-       if (element >= vector->element_count) {
-               puts("vector_get");
-               exit(EXIT_FAILURE);
-       }
-
-       return &vector->data[vector->element_size * element];
-}
-
-void vector_set(vector_t * vector,
-                void     * data,
-                size_t     element) {
-       if (element >= vector->element_count) {
-               puts("vector_set");
-               exit(EXIT_FAILURE);
-       }
-
-       memcpy(&vector->data[vector->element_size * element],
-              data,
-              vector->element_size);
-}
-
-void vector_free(vector_t * vector) {
-       free(vector->data);
-}
-
 #endif