[WIP] Optimise try_at in JSON

Signed-off-by: Juan Cruz Viotti <[email protected]>
sourcemeta · Jan 21, 2025 · 7abd899 · 7abd899
1 parent d3436cf
commit 7abd899
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/DEPENDENCIES b/DEPENDENCIES
@@ -1,5 +1,5 @@
 vendorpull https://github.com/sourcemeta/vendorpull 70342aaf458e6cb80baeb5b718901075fc42ede6
-noa https://github.com/sourcemeta/noa dee6c859895baf918fe3ecca22e4e7a262c5d500
+noa https://github.com/sourcemeta/noa ee488bdc06f5587dc132012b6aabcdaea98c973e
 jsontestsuite https://github.com/nst/JSONTestSuite d64aefb55228d9584d3e5b2433f720ea8fd00c82
 jsonschema-2020-12 https://github.com/json-schema-org/json-schema-spec 769daad75a9553562333a8937a187741cb708c72
 jsonschema-2019-09 https://github.com/json-schema-org/json-schema-spec 41014ea723120ce70b314d72f863c6929d9f3cfd

diff --git a/src/json/json_value.cc b/src/json/json_value.cc
@@ -668,8 +668,7 @@ JSON::at(const String &key,
 [[nodiscard]] auto JSON::try_at(const JSON::String &key) const -> const JSON * {
   assert(this->is_object());
   const auto &object{this->data_object};
-  const auto value{object.data.find(key, object.data.hash(key))};
-  return value == object.data.cend() ? nullptr : &value->second;
+  return object.data.try_at(key, object.data.hash(key));
 }
 
 [[nodiscard]] auto
@@ -678,8 +677,7 @@ JSON::try_at(const String &key,
     -> const JSON * {
   assert(this->is_object());
   const auto &object{this->data_object};
-  const auto value{object.data.find(key, hash)};
-  return value == object.data.cend() ? nullptr : &value->second;
+  return object.data.try_at(key, hash);
 }
 
 [[nodiscard]] auto JSON::defines(const JSON::String &key) const -> bool {

diff --git a/vendor/noa/src/flat_map/include/sourcemeta/noa/flat_map.h b/vendor/noa/src/flat_map/include/sourcemeta/noa/flat_map.h