From c121e976d6866c8300877d37d26c823bce85f59e Mon Sep 17 00:00:00 2001
From: Juan Cruz Viotti <jv@jviotti.com>
Date: Wed, 9 Oct 2024 15:06:36 -0400
Subject: [PATCH] Upgrade JSON Toolkit to
 `9abbaee71e9e00e95632858d29c7ebe5c2a723b0` (#175)

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
---
 DEPENDENCIES                                  |  2 +-
 .../jsontoolkit/src/evaluator/CMakeLists.txt  |  4 ++++
 vendor/jsontoolkit/src/json/stringify.h       | 24 ++++++++++++++-----
 .../noa/cmake/noa/compiler/options.cmake      | 22 ++++++++++++++++-
 4 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/DEPENDENCIES b/DEPENDENCIES
index 59f083c..a476071 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -1,6 +1,6 @@
 vendorpull https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4
 noa https://github.com/sourcemeta/noa 517e88aef5981b88ac6bb8caff15d17dffcb4320
-jsontoolkit https://github.com/sourcemeta/jsontoolkit b5c8f63fbc4b4b7a9cd4bdd71774d89db6ee2a99
+jsontoolkit https://github.com/sourcemeta/jsontoolkit 9abbaee71e9e00e95632858d29c7ebe5c2a723b0
 hydra https://github.com/sourcemeta/hydra 3c53d3fdef79e9ba603d48470a508cc45472a0dc
 alterschema https://github.com/sourcemeta/alterschema 358df64771979da64e043a416cf340d83a5382ca
 jsonbinpack https://github.com/sourcemeta/jsonbinpack 3046d0b9820b7da7f10645ca5fae6b0ffb749422
diff --git a/vendor/jsontoolkit/src/evaluator/CMakeLists.txt b/vendor/jsontoolkit/src/evaluator/CMakeLists.txt
index 075dadc..1140bc9 100644
--- a/vendor/jsontoolkit/src/evaluator/CMakeLists.txt
+++ b/vendor/jsontoolkit/src/evaluator/CMakeLists.txt
@@ -7,6 +7,10 @@ if(JSONTOOLKIT_INSTALL)
   noa_library_install(NAMESPACE sourcemeta PROJECT jsontoolkit NAME evaluator)
 endif()
 
+if(PROJECT_IS_TOP_LEVEL)
+  noa_add_vectorization_diagnostics(sourcemeta_jsontoolkit_evaluator)
+endif()
+
 target_link_libraries(sourcemeta_jsontoolkit_evaluator PUBLIC
   sourcemeta::jsontoolkit::json)
 target_link_libraries(sourcemeta_jsontoolkit_evaluator PUBLIC
diff --git a/vendor/jsontoolkit/src/json/stringify.h b/vendor/jsontoolkit/src/json/stringify.h
index eec7cf2..2acb9bc 100644
--- a/vendor/jsontoolkit/src/json/stringify.h
+++ b/vendor/jsontoolkit/src/json/stringify.h
@@ -6,7 +6,8 @@
 #include <sourcemeta/jsontoolkit/json.h>
 
 #include <algorithm> // std::transform, std::sort
-#include <ios>       // std::showpoint, std::noshowpoint
+#include <iomanip>   // std::setprecision
+#include <ios>       // std::noshowpoint, std::fixed
 #include <iterator>  // std::next, std::cbegin, std::cend, std::back_inserter
 #include <ostream>   // std::basic_ostream
 #include <string>    // std::to_string
@@ -64,14 +65,23 @@ auto stringify(
 
 template <template <typename T> typename Allocator>
 auto stringify(
-    const double value,
+    const double value, const bool is_integer_real,
     std::basic_ostream<typename JSON::Char, typename JSON::CharTraits> &stream)
     -> void {
   if (value == static_cast<double>(0.0)) {
     stream.write("0.0", 3);
+  } else if (is_integer_real) {
+    const auto flags{stream.flags()};
+    const auto precision{stream.precision()};
+    stream << std::fixed << std::setprecision(1) << value;
+    stream.flags(flags);
+    stream.precision(precision);
   } else {
-    // TODO: use .put() etc instead of formatted output
-    stream << std::noshowpoint << value << std::showpoint;
+    const auto flags{stream.flags()};
+    const auto precision{stream.precision()};
+    stream << std::noshowpoint << value;
+    stream.flags(flags);
+    stream.precision(precision);
   }
 }
 
@@ -534,7 +544,8 @@ auto stringify(
       stringify<Allocator>(document.to_integer(), stream);
       break;
     case JSON::Type::Real:
-      stringify<Allocator>(document.to_real(), stream);
+      stringify<Allocator>(document.to_real(), document.is_integer_real(),
+                           stream);
       break;
     case JSON::Type::String:
       stringify<Allocator>(document.to_string(), stream);
@@ -566,7 +577,8 @@ auto prettify(
       stringify<Allocator>(document.to_integer(), stream);
       break;
     case JSON::Type::Real:
-      stringify<Allocator>(document.to_real(), stream);
+      stringify<Allocator>(document.to_real(), document.is_integer_real(),
+                           stream);
       break;
     case JSON::Type::String:
       stringify<Allocator>(document.to_string(), stream);
diff --git a/vendor/jsontoolkit/vendor/noa/cmake/noa/compiler/options.cmake b/vendor/jsontoolkit/vendor/noa/cmake/noa/compiler/options.cmake
index b1fc6e5..a368c0f 100644
--- a/vendor/jsontoolkit/vendor/noa/cmake/noa/compiler/options.cmake
+++ b/vendor/jsontoolkit/vendor/noa/cmake/noa/compiler/options.cmake
@@ -42,6 +42,10 @@ function(noa_add_default_options visibility target)
       -Winvalid-offsetof
       -funroll-loops
       -fstrict-aliasing
+      -ftree-vectorize
+
+      # To improve how much GCC/Clang will vectorize
+      -fno-math-errno
 
       # Assume that signed arithmetic overflow of addition, subtraction and
       # multiplication wraps around using twos-complement representation
@@ -78,10 +82,26 @@ function(noa_add_default_options visibility target)
       -fslp-vectorize)
   elseif(NOA_COMPILER_GCC)
     target_compile_options("${target}" ${visibility}
+      -fno-trapping-math
       # Newer versions of GCC (i.e. 14) seem to print a lot of false-positives here
       -Wno-dangling-reference
-
       # Disables runtime type information
       -fno-rtti)
   endif()
 endfunction()
+
+# For studying failed vectorization results
+# - On Clang , seems to only take effect on release shared builds
+# - On GCC, seems to only take effect on release shared builds
+function(noa_add_vectorization_diagnostics target)
+  if(NOA_COMPILER_LLVM)
+    # See https://llvm.org/docs/Vectorizers.html#id6
+    target_compile_options("${target}" PRIVATE
+      -Rpass-analysis=loop-vectorize
+      -Rpass-missed=loop-vectorize)
+  elseif(NOA_COMPILER_GCC)
+    target_compile_options("${target}" PRIVATE
+      -fopt-info-vec-missed
+      -fopt-info-loop-missed)
+  endif()
+endfunction()