more gcc workarounds

Author: Tsche

include/rsl/_impl/format/fmt_parser.hpp

@@ -19,11 +19,11 @@
 namespace rsl::_format_impl {
 
 struct FormatResult {
-  using join_t = std::string (FormatResult::*)(StyleMap const*) const;
-  join_t join;
+  using join_t = std::string (*)(StyleMap const*);
+  join_t join = nullptr;
 
   template <auto... Args>
-  std::string join_impl(StyleMap const* style_map) const {
+  static std::string join_impl(std::string_view raw, StyleMap const* style_map) {
     static constexpr Style::Tag style_tags[] = {Args...};
 
     std::string result;
@@ -39,24 +39,32 @@ struct FormatResult {
     return result;
   }
 
+  template <auto... Args>
+  constexpr static auto join_impl_ptr = &join_impl<Args...>;
+
   FormatResult(std::string result, join_t joiner) : raw(std::move(result)), join(joiner) {}
 
   std::string raw;
   [[nodiscard]] std::string with_style(StyleMap const& style) const {
-    return (this->*join)(&style);
+    return join(&style);
   }
-  [[nodiscard]] std::string unstyled() const { return (this->*join)(nullptr); }
+  [[nodiscard]] std::string unstyled() const { return join(nullptr); }
   [[nodiscard]] constexpr explicit(false) operator std::string() const { return unstyled(); }
 };
 
-template <rsl::string_view fmt, typename Accessors, std::meta::info Joiner, typename... Args>
+
+
+template <rsl::string_view fmt, typename Accessors, /*auto Joiner,*/ typename... Args>
 FormatResult format_impl(Args&&... args) {
   auto str = [&]<typename... Xs>(AccessorList<Xs...>) {
     return std::format(fmt.data(), Xs::get(std::forward<Args...[Xs::index]>(args...[Xs::index]))...);
   }(Accessors{});
-  return FormatResult(str, extract<FormatResult::join_t>(Joiner));
+  return FormatResult(str, nullptr /*extract<FormatResult::join_t>(Joiner)*/);
 }
 
+template <rsl::string_view fmt, typename Accessors, std::meta::info Joiner, typename... Args>
+constexpr auto format_impl_ptr = &format_impl<fmt, Accessors, /*Joiner,*/ Args...>;
+
 struct FormatString {
   std::string string;
   std::vector<Style> style_tags;
@@ -75,10 +83,10 @@ struct FormatString {
     for (auto const& style : style_tags) {
       join_args.emplace_back(style);
     }
-    args.push_back(reflect_constant(substitute(^^FormatResult::join_impl, join_args)));
+    args.push_back(std::meta::reflect_constant(substitute(^^FormatResult::join_impl_ptr, join_args)));
 
     (args.push_back(^^Args), ...);
-    return extract<format_type<Args...>>(substitute(^^format_impl, args));
+    return extract<format_type<Args...>>(substitute(^^format_impl_ptr, args));
   }
 };
 

include/rsl/_impl/platform/io.hpp

@@ -3,6 +3,7 @@
 
 #if $os_is(LINUX)
 #  include <unistd.h>
+#  include <sys/ioctl.h>
 #elif $os_is(WINDOWS)
 #  define WIN32_LEAN_AND_MEAN
 #  include <windows.h>
@@ -31,4 +32,26 @@ inline bool isatty(int fd) {
 #endif
 }
 
+struct TerminalDimensions {
+  int rows;
+  int columns;
+};
+
+inline TerminalDimensions get_terminal_dimensions() {
+  if (not isatty(STDOUT_FILENO)) {
+    return {-1, -1};
+  }
+#if $os_is(LINUX)
+  struct winsize buffer;
+  ioctl(STDOUT_FILENO, TIOCGWINSZ, &buffer);
+  return {.rows = buffer.ws_row, .columns = buffer.ws_col};
+#elif $os_is(WINDOWS)
+  CONSOLE_SCREEN_BUFFER_INFO csbi;
+
+  GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi);
+  return {.rows    = csbi.srWindow.Bottom - csbi.srWindow.Top + 1,
+          .columns = csbi.srWindow.Right - csbi.srWindow.Left + 1};
+#endif
+}
+
 }  // namespace rsl::_impl_platform

include/rsl/string_util

@@ -0,0 +1,41 @@
+#pragma once
+#include <string>
+#include <string_view>
+
+#include <rsl/_impl/parser.hpp>
+
+
+namespace rsl {
+namespace _indent_impl {
+struct NonEmptyLine {
+  static constexpr bool operator()(std::string_view line) {
+    return std::ranges::any_of(line, [](char c){ return not rsl::_impl::is_whitespace(c); });
+  }
+};
+}
+
+constexpr std::string ltrim(std::string_view str) {
+  return {str};
+}
+
+constexpr std::string rtrim(std::string_view str) {
+  return {str};
+}
+
+constexpr std::string trim(std::string_view str) {
+  return {str};
+}
+
+constexpr std::string dedent(std::string_view str) {
+  return {str};
+}
+
+template <typename F = _indent_impl::NonEmptyLine>
+constexpr std::string indent(std::string_view str, std::string_view prefix, F&& condition = {}) {
+  return {str};
+}
+
+constexpr std::string reflow_text(std::string_view str, size_t columns = 80) {
+  return {str};
+}
+}  // namespace rsl

test/CMakeLists.txt

@@ -12,4 +12,4 @@ add_subdirectory(variant)
 add_subdirectory(tuple)
 
 add_subdirectory(serializer)
-# add_subdirectory(trie)
+add_subdirectory(trie)