Move url_search_params to all-inline

Author: Daniel Lemire

include/ada/url_search_params-inl.h

@@ -54,6 +54,60 @@ inline bool url_search_params::has(const std::string_view key) noexcept {
   return entry != params.end();
 }
 
+inline std::string url_search_params::to_string() {
+  std::string out{};
+  for (size_t i = 0; i < params.size(); i++) {
+    auto [key, value] = params[i];
+
+    if (i != 0) {
+      out += "&";
+    }
+    out.append(key);
+    out += "=";
+    out.append(value);
+  }
+  return out;
+}
+
+inline void url_search_params::set(const std::string_view key,
+                            const std::string_view value) {
+  const auto find = [&key](auto &param) { return param.first == key; };
+
+  auto it = std::find_if(params.begin(), params.end(), find);
+
+  if (it == params.end()) {
+    params.emplace_back(key, value);
+  } else {
+    it->second = value;
+    params.erase(std::remove_if(std::next(it), params.end(), find),
+                 params.end());
+  }
+}
+
+inline void url_search_params::remove(const std::string_view key) {
+  params.erase(
+      std::remove_if(params.begin(), params.end(),
+                     [&key](auto &param) { return param.first == key; }),
+      params.end());
+}
+
+inline void url_search_params::remove(const std::string_view key,
+                               const std::string_view value) {
+  params.erase(std::remove_if(params.begin(), params.end(),
+                              [&key, &value](auto &param) {
+                                return param.first == key &&
+                                       param.second == value;
+                              }),
+               params.end());
+}
+
+inline void url_search_params::sort() {
+  std::stable_sort(params.begin(), params.end(),
+                   [](const key_value_pair &lhs, const key_value_pair &rhs) {
+                     return lhs.first < rhs.first;
+                   });
+}
+
 }  // namespace ada
 
 #endif  // ADA_URL_SEARCH_PARAMS_INL_H

include/ada/url_search_params.h

@@ -5,13 +5,13 @@
 #ifndef ADA_URL_SEARCH_PARAMS_H
 #define ADA_URL_SEARCH_PARAMS_H
 
-namespace ada {
-
 #include <optional>
 #include <string>
 #include <string_view>
 #include <vector>
 
+namespace ada {
+
 /**
  * @see https://url.spec.whatwg.org/#interface-urlsearchparams
  */
@@ -34,8 +34,8 @@ struct url_search_params {
   /**
    * @see https://url.spec.whatwg.org/#dom-urlsearchparams-delete
    */
-  void remove(std::string_view key);
-  void remove(std::string_view key, std::string_view value);
+  inline void remove(std::string_view key);
+  inline void remove(std::string_view key, std::string_view value);
 
   /**
    * @see https://url.spec.whatwg.org/#dom-urlsearchparams-get
@@ -55,17 +55,17 @@ struct url_search_params {
   /**
    * @see https://url.spec.whatwg.org/#dom-urlsearchparams-set
    */
-  void set(std::string_view key, std::string_view value);
+  inline void set(std::string_view key, std::string_view value);
 
   /**
    * @see https://url.spec.whatwg.org/#dom-urlsearchparams-sort
    */
-  void sort();
+  inline void sort();
 
   /**
    * @see https://url.spec.whatwg.org/#urlsearchparams-stringification-behavior
    */
-  std::string to_string();
+  inline std::string to_string();
 
  private:
   typedef std::pair<std::string, std::string> key_value_pair;

src/ada.cpp

@@ -10,5 +10,4 @@
 #include "parser.cpp"
 #include "url_components.cpp"
 #include "url_aggregator.cpp"
-#include "ada_c.cpp"
-#include "url_search_params.cpp"
+#include "ada_c.cpp"