Initial work on refactoring and breaking logic up into separate files

CMakeLists.txt

@@ -68,6 +68,8 @@ target_sources(
     ${target_name} PRIVATE
     # src
     src/assert.cpp
+    src/analysis.cpp
+    src/utils.cpp
 )
 
 # link dependencies

include/assert/assert.hpp

@@ -1411,15 +1411,6 @@ using libassert::ASSERTION;
 
 #define VERIFY(expr, ...) ASSERT_INVOKE(expr, true, true, "VERIFY", verification, , __VA_ARGS__)
 
-#ifndef LIBASSERT_IS_CPP // keep macros for the .cpp
- #undef LIBASSERT_IS_CLANG
- #undef LIBASSERT_IS_GCC
- #undef LIBASSERT_IS_MSVC
- #undef LIBASSERT_ATTR_COLD
- #undef LIBASSERT_ATTR_NOINLINE
- #undef LIBASSERT_PRIMITIVE_ASSERT
-#endif
-
 #endif
 
 // Intentionally done outside the include guard. Libc++ leaks `assert` (among other things), so the include for

src/analysis.hpp

@@ -0,0 +1,40 @@
+#ifndef ANALYSIS_HPP
+#define ANALYSIS_HPP
+
+#include <string>
+#include <string_view>
+
+#include <assert/assert.hpp>
+
+namespace libassert::detail {
+    struct highlight_block {
+        std::string_view color;
+        std::string content;
+    };
+
+    LIBASSERT_ATTR_COLD
+    std::string prettify_type(std::string type);
+
+    LIBASSERT_ATTR_COLD
+    std::string highlight(const std::string& expression);
+
+    LIBASSERT_ATTR_COLD
+    std::vector<highlight_block> highlight_blocks(const std::string& expression);
+
+    LIBASSERT_ATTR_COLD
+    std::vector<highlight_block> highlight_blocks(const std::string& expression);
+
+    LIBASSERT_ATTR_COLD literal_format get_literal_format(const std::string& expression);
+
+    LIBASSERT_ATTR_COLD std::string trim_suffix(const std::string& expression);
+
+    LIBASSERT_ATTR_COLD bool is_bitwise(std::string_view op);
+
+    LIBASSERT_ATTR_COLD
+    std::pair<std::string, std::string> decompose_expression(
+        const std::string& expression,
+        const std::string_view target_op
+    );
+}
+
+#endif