Move nullptr check earlier for #107

snitch-org · Jul 11, 2023 · e8c7dad · e8c7dad
1 parent a1439d5
commit e8c7dad
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/include/snitch/snitch_append.hpp b/include/snitch/snitch_append.hpp
@@ -323,15 +323,15 @@ namespace snitch {
 
 template<typename T>
 [[nodiscard]] constexpr bool append(small_string_span ss, T* ptr) noexcept {
+    if (ptr == nullptr) {
+        return append(ss, nullptr);
+    }
+
     if constexpr (std::is_same_v<std::remove_cv_t<T>, char>) {
         return append(ss, std::string_view(ptr));
     } else if constexpr (std::is_function_v<T>) {
-        if (ptr != nullptr) {
-            constexpr std::string_view function_ptr_str = "0x????????";
-            return append(ss, function_ptr_str);
-        } else {
-            return append(ss, nullptr);
-        }
+        constexpr std::string_view function_ptr_str = "0x????????";
+        return append(ss, function_ptr_str);
     } else {
         return append(ss, static_cast<const void*>(ptr));
     }

diff --git a/tests/runtime_tests/string_utility.cpp b/tests/runtime_tests/string_utility.cpp
@@ -161,6 +161,14 @@ TEST_CASE("append misc", "[utility]") {
         CONSTEXPR_CHECK(a(nullptr) == ae{"nul"sv, false});
     }
 
+    SECTION("nullptr const char*") {
+        constexpr auto a = [](const char* value) constexpr {
+            return append_test::to_string<3, true>(value);
+        };
+
+        CONSTEXPR_CHECK(a(nullptr) == ae{"nul"sv, false});
+    }
+
     SECTION("pointers do fit") {
         constexpr auto a = [](const auto& value) constexpr {
             return append_test::to_string<21, true>(static_cast<void*>(value));