a

1 files changed, 29 insertions, 10 deletions

diff --git a/compat/debug.hpp b/compat/debug.hpp
index 0009ce52..56db4b0f 100644
--- a/compat/debug.hpp
+++ b/compat/debug.hpp
@@ -1,31 +1,50 @@
 #pragma once
 #include <Corrade/Utility/Debug.h>
-#include <Corrade/Utility/Move.h>
 #include <Corrade/Containers/Containers.h>
+#include <concepts>
+
+namespace floormat {
+
+template<typename T>
+concept DebugPrintable = requires(Debug& dbg, const T& value) {
+    { dbg << value } -> std::convertible_to<Debug&>;
+};
+
+} // namespace floormat
 
 namespace floormat::detail::corrade_debug {
 
-struct ErrorString final { int value; };
+// ***** colon *****
+struct Colon {};
+Debug& operator<<(Debug& dbg, Colon box);
+
+// ***** error string *****
+struct ErrorString { int value; };
 Debug& operator<<(Debug& dbg, ErrorString box);
 
-template<typename T> struct Quoted final { const T& value; };
-Debug::Flags debug1(Debug& dbg, char c);
-Debug& debug2(Debug& dbg, Debug::Flags flags, char c);
+// ***** quoted *****
+template<typename T> struct Quoted { const T& value; };
+Debug::Flags quoted_begin(Debug& dbg, char c);
+Debug& quoted_end(Debug& dbg, Debug::Flags flags, char c);
 
 template<typename T> Debug& operator<<(Debug& dbg, Quoted<T> box)
 {
-    Debug::Flags flags = debug1(dbg, '\'');
+    Debug::Flags flags = quoted_begin(dbg, '\'');
     dbg << box.value;
-    return debug2(dbg, flags, '\'');
+    return quoted_end(dbg, flags, '\'');
 }
 
-extern template struct Quoted<StringView>;
-
 } // namespace floormat::detail::corrade_debug
 
+// ***** api *****
+
+// ***** functions *****
+
 namespace floormat {
 
+floormat::detail::corrade_debug::Colon colon();
 floormat::detail::corrade_debug::ErrorString error_string(int error);
-template<typename T> floormat::detail::corrade_debug::Quoted<T> quoted(const T& value) { return { value }; }
+floormat::detail::corrade_debug::ErrorString error_string();
+template<DebugPrintable T> floormat::detail::corrade_debug::Quoted<T> quoted(const T& value) { return { value }; }
 
 } // namespace floormat