Merge pull request #62 from urbytes21/dev_branch_3

id 1778259501

Author: urbytes21

docs/README.md

@@ -1,6 +1,7 @@
 # CPP Lab Docs
 
-## Core
+---
+## 1. Core
 
 1. [Basic](../src/core/basics/README.md)
 2. [Class](../src/core/class/README.md)
@@ -12,18 +13,22 @@
 8. [File handle](../src/core/filehandle/README.md)
 9. [Smart pointer](../src/core/smart_pointer/README.md)
 10. [String](../src/core/string/README.md)
+11. [Utilities library](../src/core/utils/README.md)
 
-## Design Patterns
+---
+## 2. Design Patterns
 
-11. [Behavioral](../src/dp/behavioral/README.md)
-12. [Structural](../src/dp/structural/README.md)
-13. [Creational](../src/dp/creational/README.md)
+1. [Behavioral](../src/dp/behavioral/README.md)
+2. [Structural](../src/dp/structural/README.md)
+3. [Creational](../src/dp/creational/README.md)
 
-## Architecture Patterns
+---
+## 3. Architecture Patterns
 
-14. [MVC/MVVM](../src/ap/README.md)
+1. [MVC/MVVM](../src/ap/README.md)
 
-## Other
+---
+## 4. Other
 
-15. [Socket](../src/socket/README.md)
-16. [Google Test](../tests/README.md)
+1. [Socket](../src/socket/README.md)
+2. [Google Test](../tests/README.md)

include/ExampleRegistry.h

@@ -4,15 +4,17 @@
 #include <unordered_map>
 #include "IExample.h"
 
-#define REGISTER_EXAMPLE(CLASS, GROUP, NAME)                        \
-  namespace {                                                       \
-  struct CLASS##Registrar {                                         \
-    CLASS##Registrar() {                                            \
-      ExampleRegistry::instance().registerExample(                  \
-          GROUP, NAME, []() { return std::make_unique<CLASS>(); }); \
-    }                                                               \
-  };                                                                \
-  static CLASS##Registrar global_##CLASS##Registrar;                \
+#define REGISTER_EXAMPLE(CLASS)                        \
+  namespace {                                          \
+  struct CLASS##Registrar {                            \
+    CLASS##Registrar() {                               \
+      auto obj = std::make_unique<CLASS>();            \
+      ExampleRegistry::instance().registerExample(     \
+          obj->group(), obj->name(),                   \
+          []() { return std::make_unique<CLASS>(); }); \
+    }                                                  \
+  };                                                   \
+  static CLASS##Registrar global_##CLASS##Registrar;   \
   }
 
 class ExampleRegistry {

include/Logger.h

@@ -2,6 +2,7 @@
 #define LOGGER_H_
 
 #include <iostream>
+#include <sstream>
 
 #ifndef NDEBUG
 #include <mutex>
@@ -35,9 +36,12 @@ class Logger {
     char time_buf[9];
     std::strftime(time_buf, sizeof(time_buf), "%H:%M:%S", &tm);
 
+    constexpr const char* kGreen = "\033[32m";
+    constexpr const char* kReset = "\033[0m";
+
     std::cout << "[" << time_buf << "]" << "[" << level << "]" << "[" << file
               << ":" << loc.line() << "]" << "[" << loc.function_name() << "] "
-              << msg << '\n';
+              << kGreen << msg << kReset << '\n';
   }
 
   // Prevent copies
@@ -51,11 +55,35 @@ class Logger {
 
 #define LOG(msg) Logger::instance().log(msg)
 
+#define LOG_S(expr)                       \
+  do {                                    \
+    std::ostringstream oss_;              \
+    oss_ << expr;                         \
+    std::string s_ = oss_.str();          \
+    if (!s_.empty() && s_.back() == '\n') \
+      s_.pop_back();                      \
+    Logger::instance().log(s_);           \
+  } while (0)
+
 #else
 
 inline void LOG(const std::string& msg) {
   std::cout << msg << '\n';
 }
 
+inline void LOG_S_IMPL(std::ostringstream& oss) {
+  std::string s = oss.str();
+  if (!s.empty() && s.back() == '\n')
+    s.pop_back();
+  std::cout << s << '\n';
+}
+
+#define LOG_S(expr)          \
+  do {                       \
+    std::ostringstream oss_; \
+    oss_ << expr;            \
+    LOG_S_IMPL(oss_);        \
+  } while (0)
+
 #endif
 #endif

src/controller/pid/PIDSim.cpp

@@ -25,4 +25,4 @@ class PIDSim : public IExample {
   void execute() override { run(); }
 };
 
-REGISTER_EXAMPLE(PIDSim, "controller", "PIDSim");
+REGISTER_EXAMPLE(PIDSim);

src/core/CMakeLists.txt

@@ -56,6 +56,7 @@ set(CORE_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/filehandle/Directory.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/filehandle/OutputFormatting.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/filehandle/BinaryFileHandling.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/filehandle/TerminalColor.cpp
 
     # STL containers and expressions
     ${CMAKE_CURRENT_SOURCE_DIR}/container/sequence/Array.cpp
@@ -98,8 +99,11 @@ set(CORE_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/concurrency/FuturePromise.cpp
 
     # Utils
-    ${CMAKE_CURRENT_SOURCE_DIR}/utils/StdAlgorithm.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/utils/Algorithm.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/utils/TypeTrait.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/utils/Optional.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/utils/Variadic.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/utils/Regex.cpp
 )
 
 # Export CORE_SOURCES to the parent CMakeLists.txt

src/core/basics/ControlFlow.cpp

@@ -132,4 +132,4 @@ class ControlFlow : public IExample {
   }
 };
 
-REGISTER_EXAMPLE(ControlFlow, "core", "ControlFlow");
+REGISTER_EXAMPLE(ControlFlow);

src/core/basics/InitializeVariable.cpp

@@ -13,7 +13,7 @@ class InitializeVariable : public IExample {
   void execute() override { initialize_variable(); }
 };
 
-REGISTER_EXAMPLE(InitializeVariable, "core", "InitializeVariable");
+REGISTER_EXAMPLE(InitializeVariable);
 
 struct Foo {
   Foo() { std::cout << "Default constructor/ default init\n"; }

src/core/basics/Operations.cpp

@@ -19,7 +19,7 @@ class Operations : public IExample {
   }
 };
 
-REGISTER_EXAMPLE(Operations, "core", "Operations");
+REGISTER_EXAMPLE(Operations);
 
 void arithmeticOperator() {
   std::cout << "\n--- ArithmeticOperator Examples ---\n";

src/core/basics/TypeQualifier.cpp

@@ -40,4 +40,4 @@ class TypeQualifier : public IExample {
   void execute() override { Constant::run(); }
 };
 
-REGISTER_EXAMPLE(TypeQualifier, "core", "TypeQualifier");
+REGISTER_EXAMPLE(TypeQualifier);

src/core/class/Binding.cpp

@@ -69,6 +69,7 @@ void run() {
 }  // namespace
 
 class Binding : public IExample {
+ public:
   std::string group() const override { return "core/class"; };
 
   std::string name() const override { return "Binding"; };
@@ -80,4 +81,4 @@ class Binding : public IExample {
   };
 };
 
-REGISTER_EXAMPLE(Binding, "core/class", "Binding");
+REGISTER_EXAMPLE(Binding);