fix other unit test failures for ci_test_diagnotic_positions

Signed-off-by: Harinath Nampally <[email protected]>
nlohmann · Jan 6, 2025 · fab4d58 · fab4d58
1 parent 777bae3
commit fab4d58
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/include/nlohmann/detail/exceptions.hpp b/include/nlohmann/detail/exceptions.hpp
@@ -131,14 +131,19 @@ class exception : public std::exception
             return concat(a, '/', detail::escape(b));
         });
 #if JSON_DIAGNOSTIC_POSITIONS
-        str += ((leaf_element->start_pos() == std::string::npos) || (leaf_element->end_pos() == std::string::npos)) ? "" :
-               '(' + "byte " + std::to_string(leaf_element->start_pos()) + "-" + std::to_string(leaf_element->end_pos()) + ')';
+        if ((leaf_element->start_pos() != std::string::npos) && (leaf_element->end_pos() != std::string::npos))
+        {
+            str += ", byte " + std::to_string(leaf_element->start_pos()) + "-" + std::to_string(leaf_element->end_pos());
+            return concat('(', str, ") ");
+        }
 #endif
-        return str;
 #elif JSON_DIAGNOSTIC_POSITIONS
-        auto str = ((leaf_element->start_pos() == std::string::npos) || (leaf_element->end_pos() == std::string::npos)) ? "" :
-                   '(' + "byte " + std::to_string(leaf_element->start_pos()) + "-" + std::to_string(leaf_element->end_pos()) + ')';
-        return str;
+        if ((leaf_element->start_pos() != std::string::npos) && (leaf_element->end_pos() != std::string::npos))
+        {
+            auto str = concat("byte ", std::to_string(leaf_element->start_pos()), "-", std::to_string(leaf_element->end_pos()));
+            return concat('(', str, ") ");
+        }
+        return "";
 #else
         static_cast<void>(leaf_element);
         return "";

diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
@@ -4534,14 +4534,19 @@ class exception : public std::exception
             return concat(a, '/', detail::escape(b));
         });
 #if JSON_DIAGNOSTIC_POSITIONS
-        str += ((leaf_element->start_pos() == std::string::npos) || (leaf_element->end_pos() == std::string::npos)) ? "" :
-               '(' + "byte " + std::to_string(leaf_element->start_pos()) + "-" + std::to_string(leaf_element->end_pos()) + ')';
+        if ((leaf_element->start_pos() != std::string::npos) && (leaf_element->end_pos() != std::string::npos))
+        {
+            str += ", byte " + std::to_string(leaf_element->start_pos()) + "-" + std::to_string(leaf_element->end_pos());
+            return concat('(', str, ") ");
+        }
 #endif
-        return str;
 #elif JSON_DIAGNOSTIC_POSITIONS
-        auto str = ((leaf_element->start_pos() == std::string::npos) || (leaf_element->end_pos() == std::string::npos)) ? "" :
-                   '(' + "byte " + std::to_string(leaf_element->start_pos()) + "-" + std::to_string(leaf_element->end_pos()) + ')';
-        return str;
+        if ((leaf_element->start_pos() != std::string::npos) && (leaf_element->end_pos() != std::string::npos))
+        {
+            auto str = concat("byte ", std::to_string(leaf_element->start_pos()), "-", std::to_string(leaf_element->end_pos()));
+            return concat('(', str, ") ");
+        }
+        return "";
 #else
         static_cast<void>(leaf_element);
         return "";