From 4fc99f76a50e6aa19c731d76e98b84619ce31fd6 Mon Sep 17 00:00:00 2001
From: Abdelrahman <said.abdelrahman89@gmail.com>
Date: Sun, 16 Jun 2024 23:17:54 +0100
Subject: [PATCH] Move termcolour to shell

---
 src/common/{ => shell}/termcolour/termcolour.c |  8 ++++----
 src/common/{ => shell}/termcolour/termcolour.h | 16 ++++++++++++----
 src/tester/tester.c                            |  6 +++---
 3 files changed, 19 insertions(+), 11 deletions(-)
 rename src/common/{ => shell}/termcolour/termcolour.c (92%)
 rename src/common/{ => shell}/termcolour/termcolour.h (75%)

diff --git a/src/common/termcolour/termcolour.c b/src/common/shell/termcolour/termcolour.c
similarity index 92%
rename from src/common/termcolour/termcolour.c
rename to src/common/shell/termcolour/termcolour.c
index 6ed6e28..9c5cdb1 100644
--- a/src/common/termcolour/termcolour.c
+++ b/src/common/shell/termcolour/termcolour.c
@@ -54,7 +54,7 @@ internal const char *colours[COUNT_TERM_COLOUR] = {
 };
 #endif /* ifdef WAPP_PLATFORM_WINDOWS */
 
-TerminalColourist wapp_termcolour_get_colourist(void) {
+TerminalColourist wapp_shell_termcolour_get_colourist(void) {
   TerminalColourist colourist;
 
 #ifdef WAPP_PLATFORM_WINDOWS
@@ -74,8 +74,8 @@ TerminalColourist wapp_termcolour_get_colourist(void) {
   return colourist;
 }
 
-void wapp_termcolour_print_text(TerminalColourist *colourist, const char *text,
-                                TerminalColour colour) {
+void wapp_shell_termcolour_print_text(TerminalColourist *colourist,
+                                      const char *text, TerminalColour colour) {
   if (colour < WAPP_TERM_COLOUR_FG_BLACK ||
       colour > WAPP_TERM_COLOUR_FG_BR_WHITE) {
     return;
@@ -85,7 +85,7 @@ void wapp_termcolour_print_text(TerminalColourist *colourist, const char *text,
   print_coloured_text(colourist, text);
 }
 
-void wapp_termcolour_clear_colour(TerminalColourist *colourist) {
+void wapp_shell_termcolour_clear_colour(TerminalColourist *colourist) {
   colourist->current_colour = colourist->default_colour;
   print_coloured_text(colourist, "");
 }
diff --git a/src/common/termcolour/termcolour.h b/src/common/shell/termcolour/termcolour.h
similarity index 75%
rename from src/common/termcolour/termcolour.h
rename to src/common/shell/termcolour/termcolour.h
index 238e672..6e4c52e 100644
--- a/src/common/termcolour/termcolour.h
+++ b/src/common/shell/termcolour/termcolour.h
@@ -5,6 +5,10 @@
 #include "misc_utils.h"
 #include "platform.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
 typedef enum {
   WAPP_TERM_COLOUR_FG_BLACK,
   WAPP_TERM_COLOUR_FG_RED,
@@ -48,9 +52,13 @@ struct terminal_colourist {
 #endif // WAPP_PLATFORM_WINDOWS
 // clang-format on
 
-TerminalColourist wapp_termcolour_get_colourist(void);
-void wapp_termcolour_print_text(TerminalColourist *colourist, const char *text,
-                                TerminalColour colour);
-void wapp_termcolour_clear_colour(TerminalColourist *colourist);
+TerminalColourist wapp_shell_termcolour_get_colourist(void);
+void wapp_shell_termcolour_print_text(TerminalColourist *colourist,
+                                      const char *text, TerminalColour colour);
+void wapp_shell_termcolour_clear_colour(TerminalColourist *colourist);
+
+#ifdef __cplusplus
+}
+#endif // __cplusplus
 
 #endif // !TERM_COLOUR_H
diff --git a/src/tester/tester.c b/src/tester/tester.c
index 0d51668..ee69c8c 100644
--- a/src/tester/tester.c
+++ b/src/tester/tester.c
@@ -10,7 +10,7 @@ internal void handle_test_result(TerminalColourist *colourist,
                                  TestFuncResult result);
 
 void run_tests(TestFunc *func1, ...) {
-  TerminalColourist colourist = wapp_termcolour_get_colourist();
+  TerminalColourist colourist = wapp_shell_termcolour_get_colourist();
 
   printf("\n");
 
@@ -47,8 +47,8 @@ internal void handle_test_result(TerminalColourist *colourist,
   }
 
   printf("[");
-  wapp_termcolour_print_text(colourist, result_text, colour);
-  wapp_termcolour_clear_colour(colourist);
+  wapp_shell_termcolour_print_text(colourist, result_text, colour);
+  wapp_shell_termcolour_clear_colour(colourist);
   printf("] %s\n", result.name);
 
   if (!result.passed) {