Revert "build: removing src/utils and replacing with squareball"

This reverts commit 950e6c9148eca244a89d18a21d4ae4e5c3d1c646.

1 files changed, 71 insertions, 71 deletions

diff --git a/tests/check_source_parser.c b/tests/check_source_parser.c
index 686a228..4d8518e 100644
--- a/tests/check_source_parser.c
+++ b/tests/check_source_parser.c
@@ -17,7 +17,7 @@
 #include <string.h>
 #include "../src/source-parser.h"
 #include "../src/error.h"
-#include <squareball.h>
+#include "../src/utils/utils.h"
 
 
 static void
@@ -31,23 +31,23 @@ test_source_parse(void **state)
         "\n"
         "bola\n";
     blogc_error_t *err = NULL;
-    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(err);
     assert_non_null(source);
-    assert_int_equal(sb_trie_size(source), 5);
-    assert_string_equal(sb_trie_lookup(source, "VAR1"), "asd asd");
-    assert_string_equal(sb_trie_lookup(source, "VAR2"), "123chunda");
-    assert_string_equal(sb_trie_lookup(source, "EXCERPT"),
+    assert_int_equal(b_trie_size(source), 5);
+    assert_string_equal(b_trie_lookup(source, "VAR1"), "asd asd");
+    assert_string_equal(b_trie_lookup(source, "VAR2"), "123chunda");
+    assert_string_equal(b_trie_lookup(source, "EXCERPT"),
         "<h1 id=\"this-is-a-test\">This is a test</h1>\n"
         "<p>bola</p>\n");
-    assert_string_equal(sb_trie_lookup(source, "CONTENT"),
+    assert_string_equal(b_trie_lookup(source, "CONTENT"),
         "<h1 id=\"this-is-a-test\">This is a test</h1>\n"
         "<p>bola</p>\n");
-    assert_string_equal(sb_trie_lookup(source, "RAW_CONTENT"),
+    assert_string_equal(b_trie_lookup(source, "RAW_CONTENT"),
         "# This is a test\n"
         "\n"
         "bola\n");
-    sb_trie_free(source);
+    b_trie_free(source);
 }
 
 
@@ -62,23 +62,23 @@ test_source_parse_crlf(void **state)
         "\r\n"
         "bola\r\n";
     blogc_error_t *err = NULL;
-    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(err);
     assert_non_null(source);
-    assert_int_equal(sb_trie_size(source), 5);
-    assert_string_equal(sb_trie_lookup(source, "VAR1"), "asd asd");
-    assert_string_equal(sb_trie_lookup(source, "VAR2"), "123chunda");
-    assert_string_equal(sb_trie_lookup(source, "EXCERPT"),
+    assert_int_equal(b_trie_size(source), 5);
+    assert_string_equal(b_trie_lookup(source, "VAR1"), "asd asd");
+    assert_string_equal(b_trie_lookup(source, "VAR2"), "123chunda");
+    assert_string_equal(b_trie_lookup(source, "EXCERPT"),
         "<h1 id=\"this-is-a-test\">This is a test</h1>\r\n"
         "<p>bola</p>\r\n");
-    assert_string_equal(sb_trie_lookup(source, "CONTENT"),
+    assert_string_equal(b_trie_lookup(source, "CONTENT"),
         "<h1 id=\"this-is-a-test\">This is a test</h1>\r\n"
         "<p>bola</p>\r\n");
-    assert_string_equal(sb_trie_lookup(source, "RAW_CONTENT"),
+    assert_string_equal(b_trie_lookup(source, "RAW_CONTENT"),
         "# This is a test\r\n"
         "\r\n"
         "bola\r\n");
-    sb_trie_free(source);
+    b_trie_free(source);
 }
 
 
@@ -95,23 +95,23 @@ test_source_parse_with_spaces(void **state)
         "\n"
         "bola\n";
     blogc_error_t *err = NULL;
-    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(err);
     assert_non_null(source);
-    assert_int_equal(sb_trie_size(source), 5);
-    assert_string_equal(sb_trie_lookup(source, "VAR1"), "chunda");
-    assert_string_equal(sb_trie_lookup(source, "BOLA"), "guda");
-    assert_string_equal(sb_trie_lookup(source, "EXCERPT"),
+    assert_int_equal(b_trie_size(source), 5);
+    assert_string_equal(b_trie_lookup(source, "VAR1"), "chunda");
+    assert_string_equal(b_trie_lookup(source, "BOLA"), "guda");
+    assert_string_equal(b_trie_lookup(source, "EXCERPT"),
         "<h1 id=\"this-is-a-test\">This is a test</h1>\n"
         "<p>bola</p>\n");
-    assert_string_equal(sb_trie_lookup(source, "CONTENT"),
+    assert_string_equal(b_trie_lookup(source, "CONTENT"),
         "<h1 id=\"this-is-a-test\">This is a test</h1>\n"
         "<p>bola</p>\n");
-    assert_string_equal(sb_trie_lookup(source, "RAW_CONTENT"),
+    assert_string_equal(b_trie_lookup(source, "RAW_CONTENT"),
         "# This is a test\n"
         "\n"
         "bola\n");
-    sb_trie_free(source);
+    b_trie_free(source);
 }
 
 
@@ -131,21 +131,21 @@ test_source_parse_with_excerpt(void **state)
         "guda\n"
         "yay";
     blogc_error_t *err = NULL;
-    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(err);
     assert_non_null(source);
-    assert_int_equal(sb_trie_size(source), 5);
-    assert_string_equal(sb_trie_lookup(source, "VAR1"), "asd asd");
-    assert_string_equal(sb_trie_lookup(source, "VAR2"), "123chunda");
-    assert_string_equal(sb_trie_lookup(source, "EXCERPT"),
+    assert_int_equal(b_trie_size(source), 5);
+    assert_string_equal(b_trie_lookup(source, "VAR1"), "asd asd");
+    assert_string_equal(b_trie_lookup(source, "VAR2"), "123chunda");
+    assert_string_equal(b_trie_lookup(source, "EXCERPT"),
         "<h1 id=\"this-is-a-test\">This is a test</h1>\n"
         "<p>bola</p>\n");
-    assert_string_equal(sb_trie_lookup(source, "CONTENT"),
+    assert_string_equal(b_trie_lookup(source, "CONTENT"),
         "<h1 id=\"this-is-a-test\">This is a test</h1>\n"
         "<p>bola</p>\n"
         "<p>guda\n"
         "yay</p>\n");
-    assert_string_equal(sb_trie_lookup(source, "RAW_CONTENT"),
+    assert_string_equal(b_trie_lookup(source, "RAW_CONTENT"),
         "# This is a test\n"
         "\n"
         "bola\n"
@@ -154,7 +154,7 @@ test_source_parse_with_excerpt(void **state)
         "\n"
         "guda\n"
         "yay");
-    sb_trie_free(source);
+    b_trie_free(source);
 }
 
 
@@ -163,13 +163,13 @@ test_source_parse_config_empty(void **state)
 {
     const char *a = "";
     blogc_error_t *err = NULL;
-    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
     assert_string_equal(err->msg, "Your source file is empty.");
     blogc_error_free(err);
-    sb_trie_free(source);
+    b_trie_free(source);
 }
 
 
@@ -178,14 +178,14 @@ test_source_parse_config_invalid_key(void **state)
 {
     const char *a = "bola: guda";
     blogc_error_t *err = NULL;
-    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
     assert_string_equal(err->msg,
         "Can't find a configuration key or the content separator.\n"
         "Error occurred near line 1, position 1: bola: guda");
     blogc_error_free(err);
-    sb_trie_free(source);
+    b_trie_free(source);
 }
 
 
@@ -194,14 +194,14 @@ test_source_parse_config_no_key(void **state)
 {
     const char *a = "BOLa";
     blogc_error_t *err = NULL;
-    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
     assert_string_equal(err->msg,
         "Invalid configuration key.\n"
         "Error occurred near line 1, position 4: BOLa");
     blogc_error_free(err);
-    sb_trie_free(source);
+    b_trie_free(source);
 }
 
 
@@ -210,14 +210,14 @@ test_source_parse_config_no_key2(void **state)
 {
     const char *a = "BOLA";
     blogc_error_t *err = NULL;
-    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
     assert_string_equal(err->msg,
         "Your last configuration key is missing ':' and the value\n"
         "Error occurred near line 1, position 5: BOLA");
     blogc_error_free(err);
-    sb_trie_free(source);
+    b_trie_free(source);
 }
 
 
@@ -226,7 +226,7 @@ test_source_parse_config_no_value(void **state)
 {
     const char *a = "BOLA:\r\n";
     blogc_error_t *err = NULL;
-    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -234,7 +234,7 @@ test_source_parse_config_no_value(void **state)
         "Configuration value not provided for 'BOLA'.\n"
         "Error occurred near line 1, position 6: BOLA:");
     blogc_error_free(err);
-    sb_trie_free(source);
+    b_trie_free(source);
 }
 
 
@@ -243,7 +243,7 @@ test_source_parse_config_no_value2(void **state)
 {
     const char *a = "BOLA:";
     blogc_error_t *err = NULL;
-    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -251,7 +251,7 @@ test_source_parse_config_no_value2(void **state)
         "Configuration value not provided for 'BOLA'.\n"
         "Error occurred near line 1, position 6: BOLA:");
     blogc_error_free(err);
-    sb_trie_free(source);
+    b_trie_free(source);
 }
 
 
@@ -260,7 +260,7 @@ test_source_parse_config_reserved_name(void **state)
 {
     const char *a = "FILENAME: asd\r\n";
     blogc_error_t *err = NULL;
-    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -268,7 +268,7 @@ test_source_parse_config_reserved_name(void **state)
         "'FILENAME' variable is forbidden in source files. It will be set "
         "for you by the compiler.");
     blogc_error_free(err);
-    sb_trie_free(source);
+    b_trie_free(source);
 }
 
 
@@ -277,7 +277,7 @@ test_source_parse_config_reserved_name2(void **state)
 {
     const char *a = "CONTENT: asd\r\n";
     blogc_error_t *err = NULL;
-    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -285,7 +285,7 @@ test_source_parse_config_reserved_name2(void **state)
         "'CONTENT' variable is forbidden in source files. It will be set "
         "for you by the compiler.");
     blogc_error_free(err);
-    sb_trie_free(source);
+    b_trie_free(source);
 }
 
 
@@ -294,7 +294,7 @@ test_source_parse_config_reserved_name3(void **state)
 {
     const char *a = "DATE_FORMATTED: asd\r\n";
     blogc_error_t *err = NULL;
-    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -302,7 +302,7 @@ test_source_parse_config_reserved_name3(void **state)
         "'DATE_FORMATTED' variable is forbidden in source files. It will be set "
         "for you by the compiler.");
     blogc_error_free(err);
-    sb_trie_free(source);
+    b_trie_free(source);
 }
 
 
@@ -311,7 +311,7 @@ test_source_parse_config_reserved_name4(void **state)
 {
     const char *a = "DATE_FIRST_FORMATTED: asd\r\n";
     blogc_error_t *err = NULL;
-    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -319,7 +319,7 @@ test_source_parse_config_reserved_name4(void **state)
         "'DATE_FIRST_FORMATTED' variable is forbidden in source files. It will be set "
         "for you by the compiler.");
     blogc_error_free(err);
-    sb_trie_free(source);
+    b_trie_free(source);
 }
 
 
@@ -328,7 +328,7 @@ test_source_parse_config_reserved_name5(void **state)
 {
     const char *a = "DATE_LAST_FORMATTED: asd\r\n";
     blogc_error_t *err = NULL;
-    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -336,7 +336,7 @@ test_source_parse_config_reserved_name5(void **state)
         "'DATE_LAST_FORMATTED' variable is forbidden in source files. It will be set "
         "for you by the compiler.");
     blogc_error_free(err);
-    sb_trie_free(source);
+    b_trie_free(source);
 }
 
 
@@ -345,7 +345,7 @@ test_source_parse_config_reserved_name6(void **state)
 {
     const char *a = "PAGE_FIRST: asd\r\n";
     blogc_error_t *err = NULL;
-    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -353,7 +353,7 @@ test_source_parse_config_reserved_name6(void **state)
         "'PAGE_FIRST' variable is forbidden in source files. It will be set "
         "for you by the compiler.");
     blogc_error_free(err);
-    sb_trie_free(source);
+    b_trie_free(source);
 }
 
 
@@ -362,7 +362,7 @@ test_source_parse_config_reserved_name7(void **state)
 {
     const char *a = "PAGE_PREVIOUS: asd\r\n";
     blogc_error_t *err = NULL;
-    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -370,7 +370,7 @@ test_source_parse_config_reserved_name7(void **state)
         "'PAGE_PREVIOUS' variable is forbidden in source files. It will be set "
         "for you by the compiler.");
     blogc_error_free(err);
-    sb_trie_free(source);
+    b_trie_free(source);
 }
 
 
@@ -379,7 +379,7 @@ test_source_parse_config_reserved_name8(void **state)
 {
     const char *a = "PAGE_CURRENT: asd\r\n";
     blogc_error_t *err = NULL;
-    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -387,7 +387,7 @@ test_source_parse_config_reserved_name8(void **state)
         "'PAGE_CURRENT' variable is forbidden in source files. It will be set "
         "for you by the compiler.");
     blogc_error_free(err);
-    sb_trie_free(source);
+    b_trie_free(source);
 }
 
 
@@ -396,7 +396,7 @@ test_source_parse_config_reserved_name9(void **state)
 {
     const char *a = "PAGE_NEXT: asd\r\n";
     blogc_error_t *err = NULL;
-    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -404,7 +404,7 @@ test_source_parse_config_reserved_name9(void **state)
         "'PAGE_NEXT' variable is forbidden in source files. It will be set "
         "for you by the compiler.");
     blogc_error_free(err);
-    sb_trie_free(source);
+    b_trie_free(source);
 }
 
 
@@ -413,7 +413,7 @@ test_source_parse_config_reserved_name10(void **state)
 {
     const char *a = "PAGE_LAST: asd\r\n";
     blogc_error_t *err = NULL;
-    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -421,7 +421,7 @@ test_source_parse_config_reserved_name10(void **state)
         "'PAGE_LAST' variable is forbidden in source files. It will be set "
         "for you by the compiler.");
     blogc_error_free(err);
-    sb_trie_free(source);
+    b_trie_free(source);
 }
 
 
@@ -430,7 +430,7 @@ test_source_parse_config_reserved_name11(void **state)
 {
     const char *a = "BLOGC_VERSION: 1.0\r\n";
     blogc_error_t *err = NULL;
-    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -438,7 +438,7 @@ test_source_parse_config_reserved_name11(void **state)
         "'BLOGC_VERSION' variable is forbidden in source files. It will be set "
         "for you by the compiler.");
     blogc_error_free(err);
-    sb_trie_free(source);
+    b_trie_free(source);
 }
 
 
@@ -447,7 +447,7 @@ test_source_parse_config_value_no_line_ending(void **state)
 {
     const char *a = "BOLA: asd";
     blogc_error_t *err = NULL;
-    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -455,7 +455,7 @@ test_source_parse_config_value_no_line_ending(void **state)
         "No line ending after the configuration value for 'BOLA'.\n"
         "Error occurred near line 1, position 10: BOLA: asd");
     blogc_error_free(err);
-    sb_trie_free(source);
+    b_trie_free(source);
 }
 
 
@@ -464,7 +464,7 @@ test_source_parse_invalid_separator(void **state)
 {
     const char *a = "BOLA: asd\n---#";
     blogc_error_t *err = NULL;
-    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -472,7 +472,7 @@ test_source_parse_invalid_separator(void **state)
         "Invalid content separator. Must be more than one '-' characters.\n"
         "Error occurred near line 2, position 4: ---#");
     blogc_error_free(err);
-    sb_trie_free(source);
+    b_trie_free(source);
 }