Minor fixes

Author: Atari2

include/GenericView.hpp

@@ -129,12 +129,11 @@ class IteratorView {
         for (auto it = m_begin; it != m_end; ++it) { collector.append(*it); }
         return collector;
     }
-    template <typename NewCont, Constructible<IteratorOutputType<Iter>> JoinObj>
-    requires Pushable<NewCont, IteratorOutputType<Iter>>
+    template <typename NewCont, Constructible<OutputType> JoinObj>
+    requires Pushable<NewCont, OutputType>
     NewCont join_with(JoinObj obj) {
-        using Ot = IteratorOutputType<Iter>;
         --m_end;    // move end one before
-        auto joiner = Ot{ Forward<JoinObj>(obj) };
+        OutputType joiner{ Forward<JoinObj>(obj) };
         NewCont collector{};
         for (auto it = m_begin; it != m_end; ++it) {
             collector.append(*it);

include/Result.hpp

@@ -15,7 +15,7 @@ class ErrorBase {
     public:
     bool operator==(const ErrorBase& other) const { return error_string() == other.error_string(); }
     virtual StringView error_string() const = 0;
-    virtual ~ErrorBase()                       = default;
+    virtual ~ErrorBase()                    = default;
 };
 class Error : public ErrorBase {
     protected:
@@ -113,7 +113,6 @@ class Result {
     Result(OtherET&& val)
     requires(DerivedFrom<OtherET, ErrorBase>)
         : m_err{ new OtherET{ move(val) } }, m_type{ CurrType::Err } {}
-
     // the following overloads may look very confusing
     // which is why they're commented
 
@@ -126,7 +125,6 @@ class Result {
     Result(UniquePtr<OtherET>&& err) : m_type{ CurrType::Err } {
         new (&m_err) UniquePtr<ErrorBase>{ err.release() };
     }
-
     // this overload activates when OtherET can be converted to ErrorType
     // *but* is not a derived type, this means that we don't care about object slicing
     // and we should instead just create a new error.
@@ -135,7 +133,6 @@ class Result {
     Result(UniquePtr<OtherET>&& err) : m_type{ CurrType::Err } {
         new (&m_err) UniquePtr<ErrorBase>{ new ErrorType{ move(*err) } };
     }
-
     // this overload activates when OtherET is unrelated to ErrorType but the IntoError "interface"
     // can be used to convert from a type to the other
     template <typename OtherET>
@@ -295,9 +292,10 @@ class Result {
     }
     auto must() {
         if (is_error()) {
-            ASSERT_NOT_REACHED_FMT(
-            "%s::must() failed \"%s\"", TYPENAME_TO_STRING(*this), print_conditional(to_error()).data()
-            );
+            with_type_of(*this, [&](const char* name) {
+                String error_name = print_conditional(to_error());
+                ASSERT_NOT_REACHED_FMT("%s::must() failed \"%s\"", name, error_name.data());
+            });
         }
         return to_ok();
     }
@@ -356,11 +354,9 @@ struct PrintInfo<Result<T, Err>> {
 
 #define TRY_SET(val, expression) TRY_SET_IMPL(val, CONCAT_TOKENS(__tr_, __COUNTER__), expression)
 
-#define TRY_RET(expression)                                                                                            \
-    { TRY_RET_IMPL(CONCAT_TOKENS(__tr_, __COUNTER__), expression) }
+#define TRY_RET(expression) { TRY_RET_IMPL(CONCAT_TOKENS(__tr_, __COUNTER__), expression) }
 
-#define TRY(expression)                                                                                                \
-    { TRY_IMPL(CONCAT_TOKENS(__tr_, __COUNTER__), expression) }
+#define TRY(expression) { TRY_IMPL(CONCAT_TOKENS(__tr_, __COUNTER__), expression) }
 
 #define MUST(expression)                                                                                               \
     [](auto&& tr) {                                                                                                    \

include/String.hpp

@@ -481,6 +481,14 @@ class String {
         char* buf = get_buf_internal();
         for (size_t i = 0; i < m_size; i++) { buf[i] = tolower(buf[i]); }
     }
+    [[nodiscard]] String quoted(char quote_char = '"') const { 
+        String ret{};
+        ret.reserve(size() + 2);
+        ret.append(quote_char);
+        ret.append(*this);
+        ret.append(quote_char);
+        return ret;
+    }
     [[nodiscard]] String upper() const& {
         String str(*this);
         str.iupper();

include/TypeInfo.hpp

@@ -22,6 +22,19 @@ template <typename T>
 auto demangled_info_for() {
     return DemangledInfo{ typeid(T) };
 }
+
+template <typename T,typename Func>
+void with_typename(Func&& func) {
+    DemangledInfo info{ typeid(T) };
+    func(info.name());
+}
+
+template <typename T, typename Func>
+void with_type_of(T& value, Func&& func) {
+    DemangledInfo info{ typeid(T) };
+    func(info.name());
+}
+
 }    // namespace ARLib
 #define MANGLED_TYPENAME_TO_STRING(type) typeid(type).name()
 

source/ArgParser.cpp

@@ -186,9 +186,8 @@ ArgParser::ParseResult ArgParser::parse() {
     for (const auto& arg : m_arguments) { m_unmatched_arguments.append(String{ arg }); }
     if (m_unmatched_arguments.size() > m_leftover_args_needed) {
         String s{ "Argument parsing error: Unrecognized options found: " };
-        for (const auto& unm : m_unmatched_arguments) { s += "\""_s + unm + "\", "_s; }
-        s += '\n';
-        return move(s);
+        s += m_unmatched_arguments.iter().map([](auto&& o) { return o.quoted(); }).join_with<String>(", "_s);
+        return s;
     }
     return DefaultOk{};
 }