being more restrictive with the ADA_INCLUDE_URL_PATTERN guards (#944)

Author: lemire

include/ada.h

@@ -30,13 +30,11 @@
 #include "ada/url_search_params.h"
 #include "ada/url_search_params-inl.h"
 
-#if ADA_INCLUDE_URL_PATTERN
 #include "ada/url_pattern.h"
 #include "ada/url_pattern-inl.h"
 #include "ada/url_pattern_helpers.h"
 #include "ada/url_pattern_helpers-inl.h"
 #include "ada/url_pattern_regex.h"
-#endif  // ADA_INCLUDE_URL_PATTERN
 
 // Public API
 #include "ada/ada_version.h"

include/ada/implementation-inl.h

@@ -4,9 +4,7 @@
 #ifndef ADA_IMPLEMENTATION_INL_H
 #define ADA_IMPLEMENTATION_INL_H
 
-#if ADA_INCLUDE_URL_PATTERN
 #include "ada/url_pattern_regex.h"
-#endif  // ADA_INCLUDE_URL_PATTERN
 
 #include "ada/expected.h"
 #include "ada/implementation.h"

include/ada/implementation.h

@@ -13,10 +13,7 @@
 #include "ada/url.h"
 #include "ada/common_defs.h"
 #include "ada/errors.h"
-
-#if ADA_INCLUDE_URL_PATTERN
 #include "ada/url_pattern_init.h"
-#endif  // ADA_INCLUDE_URL_PATTERN
 
 namespace ada {
 

include/ada/parser-inl.h

@@ -5,10 +5,8 @@
 #define ADA_PARSER_INL_H
 
 #include "ada/expected.h"
-#if ADA_INCLUDE_URL_PATTERN
 #include "ada/url_pattern.h"
 #include "ada/url_pattern_helpers.h"
-#endif  // ADA_INCLUDE_URL_PATTERN
 #include "ada/parser.h"
 
 #include <string>

include/ada/parser.h

@@ -10,10 +10,8 @@
 
 #include "ada/expected.h"
 
-#if ADA_INCLUDE_URL_PATTERN
 #include "ada/url_pattern_regex.h"
 #include "ada/url_pattern_init.h"
-#endif  // ADA_INCLUDE_URL_PATTERN
 
 /**
  * @private

include/ada/url_pattern-inl.h

@@ -13,6 +13,7 @@
 #include <string_view>
 #include <utility>
 
+#if ADA_INCLUDE_URL_PATTERN
 namespace ada {
 
 inline bool url_pattern_init::operator==(const url_pattern_init& other) const {
@@ -481,5 +482,5 @@ result<std::optional<url_pattern_result>> url_pattern<regex_provider>::match(
 }
 
 }  // namespace ada
-
+#endif  // ADA_INCLUDE_URL_PATTERN
 #endif

include/ada/url_pattern.h

@@ -21,6 +21,7 @@
 #include <iostream>
 #endif  // ADA_TESTING
 
+#if ADA_INCLUDE_URL_PATTERN
 namespace ada {
 
 enum class url_pattern_part_type : uint8_t {
@@ -353,7 +354,6 @@ class url_pattern {
    */
   bool ignore_case_ = false;
 };
-
 }  // namespace ada
-
+#endif  // ADA_INCLUDE_URL_PATTERN
 #endif

include/ada/url_pattern_helpers-inl.h

@@ -13,6 +13,7 @@
 #include "ada/url_pattern_helpers.h"
 #include "ada/implementation.h"
 
+#if ADA_INCLUDE_URL_PATTERN
 namespace ada::url_pattern_helpers {
 #ifdef ADA_TESTING
 inline std::string to_string(token_type type) {
@@ -1089,5 +1090,5 @@ constructor_string_parser<regex_provider>::parse(std::string_view input) {
 }
 
 }  // namespace ada::url_pattern_helpers
-
+#endif  // ADA_INCLUDE_URL_PATTERN
 #endif

include/ada/url_pattern_helpers.h

@@ -13,6 +13,7 @@
 #include <tuple>
 #include <vector>
 
+#if ADA_INCLUDE_URL_PATTERN
 namespace ada {
 enum class errors : uint8_t;
 }
@@ -344,5 +345,5 @@ std::string generate_segment_wildcard_regexp(
     url_pattern_compile_component_options options);
 
 }  // namespace ada::url_pattern_helpers
-
+#endif  // ADA_INCLUDE_URL_PATTERN
 #endif

include/ada/url_pattern_init.h

@@ -16,6 +16,7 @@
 #include <iostream>
 #endif  // ADA_TESTING
 
+#if ADA_INCLUDE_URL_PATTERN
 namespace ada {
 
 // Important: C++20 allows us to use concept rather than `using` or `typedef
@@ -119,5 +120,5 @@ struct url_pattern_init {
   std::optional<std::string> base_url{};
 };
 }  // namespace ada
-
+#endif  // ADA_INCLUDE_URL_PATTERN
 #endif  // ADA_URL_PATTERN_INIT_H