Fix StringSet::value_type type trait (#455)

Fixes: #454
Signed-off-by: Juan Cruz Viotti <[email protected]>

Author: jviotti

src/evaluator/evaluator_string_set.cc

@@ -4,7 +4,7 @@
 
 namespace sourcemeta::blaze {
 
-auto StringSet::contains(const value_type &value, const hash_type hash) const
+auto StringSet::contains(const string_type &value, const hash_type hash) const
     -> bool {
   if (this->hasher.is_perfect(hash)) {
     for (const auto &entry : this->data) {
@@ -23,7 +23,7 @@ auto StringSet::contains(const value_type &value, const hash_type hash) const
   return false;
 }
 
-auto StringSet::insert(const value_type &value) -> void {
+auto StringSet::insert(const string_type &value) -> void {
   const auto hash{this->hasher(value)};
   if (!this->contains(value, hash)) {
     this->data.emplace_back(value, hash);
@@ -34,7 +34,7 @@ auto StringSet::insert(const value_type &value) -> void {
   }
 }
 
-auto StringSet::insert(value_type &&value) -> void {
+auto StringSet::insert(string_type &&value) -> void {
   const auto hash{this->hasher(value)};
   if (!this->contains(value, hash)) {
     this->data.emplace_back(std::move(value), hash);

src/evaluator/include/sourcemeta/blaze/evaluator_string_set.h

@@ -17,25 +17,25 @@ class SOURCEMETA_BLAZE_EVALUATOR_EXPORT StringSet {
 public:
   StringSet() = default;
 
-  using value_type = sourcemeta::core::JSON::String;
+  using string_type = sourcemeta::core::JSON::String;
   using hash_type = sourcemeta::core::JSON::Object::Container::hash_type;
-  using underlying_type = std::vector<std::pair<value_type, hash_type>>;
+  using value_type = std::pair<string_type, hash_type>;
+  using underlying_type = std::vector<value_type>;
   using size_type = typename underlying_type::size_type;
   using difference_type = typename underlying_type::difference_type;
   using const_iterator = typename underlying_type::const_iterator;
 
-  auto contains(const value_type &value, const hash_type hash) const -> bool;
-  inline auto contains(const value_type &value) const -> bool {
+  auto contains(const string_type &value, const hash_type hash) const -> bool;
+  inline auto contains(const string_type &value) const -> bool {
     return this->contains(value, this->hasher(value));
   }
 
-  inline auto at(const size_type index) const noexcept
-      -> const std::pair<value_type, hash_type> & {
+  inline auto at(const size_type index) const noexcept -> const value_type & {
     return this->data[index];
   }
 
-  auto insert(const value_type &value) -> void;
-  auto insert(value_type &&value) -> void;
+  auto insert(const string_type &value) -> void;
+  auto insert(string_type &&value) -> void;
 
   inline auto empty() const noexcept -> bool { return this->data.empty(); }
   inline auto size() const noexcept -> size_type { return this->data.size(); }
@@ -54,7 +54,7 @@ class SOURCEMETA_BLAZE_EVALUATOR_EXPORT StringSet {
 #if defined(_MSC_VER)
 #pragma warning(default : 4251 4275)
 #endif
-  sourcemeta::core::PropertyHashJSON<value_type> hasher;
+  sourcemeta::core::PropertyHashJSON<string_type> hasher;
 };
 
 } // namespace sourcemeta::blaze