@micro-os-plus/micro-test-plus 3.3.1 → 4.1.0

package/include/micro-os-plus/micro-test-plus/function-comparators.h

@@ -24,10 +24,10 @@
  * This header provides the declarations for the function comparator templates
  * and logical operators used within the µTest++ framework. It defines the
  * interfaces for generic and pointer-based comparison functions, including
- * equality, non-equality, greater than, less than, and their respective
- * logical variants. Additionally, it declares logical combinators such as
- * conjunction (`_and`), disjunction (`_or`), and negation (`_not`), as well as
- * a utility for safely removing constness from objects.
+ * equality, non-equality, greater than, less than, greater than or equal,
+ * and less than or equal. Additionally, it declares logical combinators such
+ * as conjunction (`_and`), disjunction (`_or`), and negation (`_not`), as
+ * well as a utility for safely removing constness from objects.
  *
  * These comparators and logical operators enable expressive and type-safe test
  * expectations and assertions, supporting both value and pointer semantics.
@@ -62,10 +62,13 @@
 #pragma GCC diagnostic ignored "-Waggregate-return"
 #if defined(__clang__)
 #pragma clang diagnostic ignored "-Wc++98-compat"
+#pragma clang diagnostic ignored "-Wpre-c++17-compat"
 #pragma clang diagnostic ignored "-Wunknown-warning-option"
 #endif
 #endif
 
+// ===========================================================================
+
 namespace micro_os_plus::micro_test_plus
 {
   // --------------------------------------------------------------------------
@@ -315,17 +318,22 @@ namespace micro_os_plus::micro_test_plus
   [[nodiscard]] constexpr auto
   mut (const T& t) noexcept -> T&;
 
+  // --------------------------------------------------------------------------
+} // namespace micro_os_plus::micro_test_plus
+
 #if defined(__GNUC__)
 #pragma GCC diagnostic pop
 #endif
 
-  // --------------------------------------------------------------------------
-} // namespace micro_os_plus::micro_test_plus
-
 // ----------------------------------------------------------------------------
 
 #endif // __cplusplus
 
+// ============================================================================
+// Templates & constexpr implementations.
+
+#include "inlines/function-comparators-inlines.h"
+
 // ----------------------------------------------------------------------------
 
 #endif // MICRO_TEST_PLUS_FUNCTION_COMPARATORS_H_

package/include/micro-os-plus/micro-test-plus/inlines/{details-inlines.h → deferred-reporter-inlines.h}

@@ -42,8 +42,8 @@
  * should not be included directly by user code.
  */
 
-#ifndef MICRO_TEST_PLUS_DETAILS_INLINES_H_
-#define MICRO_TEST_PLUS_DETAILS_INLINES_H_
+#ifndef MICRO_TEST_PLUS_DEFERRED_REPORTER_INLINES_H_
+#define MICRO_TEST_PLUS_DEFERRED_REPORTER_INLINES_H_
 
 // ----------------------------------------------------------------------------
 
@@ -51,9 +51,12 @@
 
 // ----------------------------------------------------------------------------
 
-#include <stdio.h>
-#include <cstring>
-// #include "test-reporter.h"
+#include <charconv>
+#include <cstdio>
+
+#if defined(MICRO_OS_PLUS_TRACE)
+#include <micro-os-plus/diag/trace.h>
+#endif // MICRO_OS_PLUS_TRACE
 
 // ----------------------------------------------------------------------------
 
@@ -66,12 +69,26 @@
 #endif
 #endif
 
+// ============================================================================
+
 namespace micro_os_plus::micro_test_plus
 {
   // --------------------------------------------------------------------------
 
   namespace detail
   {
+    // ========================================================================
+
+    /**
+     * @details
+     * Returns the result value stored in `value_`.
+     */
+    inline bool
+    deferred_reporter_base::value () const
+    {
+      return value_;
+    }
+
     // ------------------------------------------------------------------------
 
     /**
@@ -80,22 +97,45 @@ namespace micro_os_plus::micro_test_plus
      * expectation messages by appending the provided value to the internal
      * message string.
      *
-     * If the argument is of an arithmetic type, it is first converted to a
-     * string using `std::to_string` before being appended. For all other
-     * types, the value is appended directly. This ensures that both numeric
-     * and string-like messages are handled appropriately and consistently.
+     * If the argument is a `char`, it is appended directly as a character.
+     * If the argument is of another arithmetic type, it is converted to a
+     * string using a fixed-size buffer and `std::to_chars` to avoid dynamic
+     * memory allocation. For all other types, the value is appended directly.
      */
     template <class T>
+      requires type_traits::printable<T>
     auto&
     deferred_reporter_base::operator<< (const T& msg)
     {
-      if constexpr (std::is_arithmetic_v<T>)
+      if constexpr (std::is_same_v<T, char>)
         {
-          message_.append (std::to_string (msg));
+          deferred_output_.push_back (msg);
+        }
+      else if constexpr (std::is_arithmetic_v<T>)
+        {
+          // Optimise to avoid dynamic memory allocation in std::to_string by
+          // using a fixed-size buffer and std::to_chars.
+#if defined(__GNUC__)
+#pragma GCC diagnostic push
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
+#endif
+#endif
+          char buf[64];
+          // 64 bytes is sufficient for the longest decimal representation
+          // of any standard arithmetic type (long double ~45 chars).
+          static_assert (sizeof (buf) >= 50,
+                         "buf must be large enough for any arithmetic type");
+          auto [ptr, ec] = std::to_chars (buf, buf + sizeof (buf), msg);
+          if (ec == std::errc{})
+            deferred_output_.append (buf, ptr);
+#if defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif
         }
       else
         {
-          message_.append (msg);
+          deferred_output_.append (msg);
         }
       return *this;
     }
@@ -114,41 +154,23 @@ namespace micro_os_plus::micro_test_plus
      * contextual information for reporting purposes.
      */
     template <class Expr_T>
-    constexpr deferred_reporter<Expr_T>::deferred_reporter (
+    deferred_reporter::deferred_reporter (
         const Expr_T& expr, bool abort,
-        const reflection::source_location& location)
-        : deferred_reporter_base{ static_cast<bool> (expr), location },
-          expr_{ expr }
+        const reflection::source_location& location, subtest& subtest,
+        expression_formatter& expression)
+        : deferred_reporter_base{ static_cast<bool> (expr), location, subtest }
+
     {
-#if 0 // defined(MICRO_OS_PLUS_TRACE_MICRO_TEST_PLUS)
-      printf ("%s\n", __PRETTY_FUNCTION__);
-#endif // MICRO_OS_PLUS_TRACE_MICRO_TEST_PLUS
+#if defined(MICRO_OS_PLUS_TRACE) \
+    && defined(MICRO_OS_PLUS_TRACE_MICRO_TEST_PLUS_CONSTRUCTORS)
+      trace::printf ("%s\n", __PRETTY_FUNCTION__);
+#endif // MICRO_OS_PLUS_TRACE_MICRO_TEST_PLUS_CONSTRUCTORS
       abort_ = abort;
-    }
+      has_expression_ = type_traits::is_op<Expr_T>;
 
-    /**
-     * @details
-     * The destructor finalises the deferred reporting process for a test
-     * expression. If the evaluated expression is true, the reporter records a
-     * successful outcome along with any accumulated message. If the expression
-     * is false, the reporter records a failure, including the abort status,
-     * message, and source location for comprehensive reporting.
-     *
-     * This mechanism ensures that all relevant information about the test
-     * outcome is captured and reported accurately when the deferred reporter
-     * goes out of scope.
-     */
-    template <class Expr_T>
-    deferred_reporter<Expr_T>::~deferred_reporter ()
-    {
-      if (value_)
-        {
-          reporter->pass (expr_, message_);
-        }
-      else
-        {
-          reporter->fail (expr_, abort_, message_, location_);
-        }
+      expression.clear ();
+
+      expression << expr;
     }
 
     // ------------------------------------------------------------------------
@@ -167,6 +189,6 @@ namespace micro_os_plus::micro_test_plus
 
 // ----------------------------------------------------------------------------
 
-#endif // MICRO_TEST_PLUS_DETAILS_INLINES_H_
+#endif // MICRO_TEST_PLUS_DEFERRED_REPORTER_INLINES_H_
 
 // ----------------------------------------------------------------------------