refactor: move detail headers to src

boostorg · Jan 19, 2024 · 8a82041 · 8a82041
1 parent fcb5f58
commit 8a82041
Show file tree

Hide file tree

Showing 60 changed files with 167 additions and 149 deletions.
diff --git a/include/boost/url/detail/vformat.hpp b/include/boost/url/detail/vformat.hpp
@@ -11,24 +11,19 @@
 #define BOOST_URL_DETAIL_FORMAT_HPP
 
 #include <boost/url/detail/format_args.hpp>
-#include <boost/url/detail/pattern.hpp>
 #include <boost/core/detail/string_view.hpp>
 #include <boost/url/url.hpp>
 
 namespace boost {
 namespace urls {
 namespace detail {
 
-inline
+BOOST_URL_DECL
 void
 vformat_to(
     url_base& u,
     core::string_view fmt,
-    detail::format_args args)
-{
-    parse_pattern(fmt)
-        .value().apply(u, args);
-}
+    detail::format_args args);
 
 inline
 url

diff --git a/include/boost/url/rfc/detail/path_rules.hpp b/include/boost/url/rfc/detail/path_rules.hpp
@@ -10,11 +10,11 @@
 #ifndef BOOST_URL_RFC_DETAIL_PATH_RULES_HPP
 #define BOOST_URL_RFC_DETAIL_PATH_RULES_HPP
 
-#include <boost/url/rfc/pchars.hpp>
-#include <boost/url/rfc/pct_encoded_rule.hpp>
-#include <boost/url/grammar/delim_rule.hpp>
-#include <boost/url/grammar/range_rule.hpp>
-#include <boost/url/grammar/tuple_rule.hpp>
+#include "boost/url/rfc/pchars.hpp"
+#include "boost/url/rfc/pct_encoded_rule.hpp"
+#include "boost/url/grammar/delim_rule.hpp"
+#include "boost/url/grammar/range_rule.hpp"
+#include "boost/url/grammar/tuple_rule.hpp"
 
 namespace boost {
 namespace urls {

diff --git a/src/authority_view.cpp b/src/authority_view.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/url/detail/config.hpp>
 #include <boost/url/authority_view.hpp>
-#include <boost/url/detail/normalize.hpp>
+#include "detail/normalize.hpp"
 #include <boost/url/grammar/parse.hpp>
 #include <boost/url/rfc/authority_rule.hpp>
 #include <boost/url/rfc/pct_encoded_rule.hpp>

diff --git a/src/detail/any_params_iter.cpp b/src/detail/any_params_iter.cpp
@@ -14,7 +14,7 @@
 #include <boost/url/detail/any_params_iter.hpp>
 #include <boost/url/encode.hpp>
 #include <boost/core/detail/string_view.hpp>
-#include <boost/url/rfc/detail/charsets.hpp>
+#include "../rfc/detail/charsets.hpp"
 
 namespace boost {
 namespace urls {

diff --git a/src/detail/any_segments_iter.cpp b/src/detail/any_segments_iter.cpp
@@ -11,7 +11,7 @@
 #define BOOST_URL_DETAIL_IMPL_ANY_SEGMENTS_ITER_IPP
 
 #include <boost/url/detail/config.hpp>
-#include <boost/url/rfc/detail/charsets.hpp>
+#include "../rfc/detail/charsets.hpp"
 #include <boost/url/detail/any_segments_iter.hpp>
 #include <boost/core/detail/string_view.hpp>
 #include <boost/url/encode.hpp>

diff --git a/src/detail/decode.cpp b/src/detail/decode.cpp
@@ -11,7 +11,7 @@
 #define BOOST_URL_DETAIL_IMPL_DECODE_IPP
 
 #include <boost/url/detail/config.hpp>
-#include <boost/url/detail/decode.hpp>
+#include "decode.hpp"
 #include <boost/url/grammar/charset.hpp>
 #include <boost/url/grammar/hexdig_chars.hpp>
 #include <memory>

diff --git a/include/boost/url/detail/decode.hpp → src/detail/decode.hpp b/include/boost/url/detail/decode.hpp → src/detail/decode.hpp
@@ -11,7 +11,7 @@
 #ifndef BOOST_URL_DETAIL_DECODE_HPP
 #define BOOST_URL_DETAIL_DECODE_HPP
 
-#include <boost/url/encoding_opts.hpp>
+#include "boost/url/encoding_opts.hpp"
 #include <boost/core/detail/string_view.hpp>
 #include <cstdlib>
 

diff --git a/src/detail/format_args.cpp b/src/detail/format_args.cpp
@@ -13,7 +13,7 @@
 #include <boost/url/detail/config.hpp>
 #include <boost/url/encode.hpp>
 #include <boost/url/detail/format_args.hpp>
-#include <boost/url/detail/replacement_field_rule.hpp>
+#include "boost/url/detail/replacement_field_rule.hpp"
 #include <boost/url/grammar/delim_rule.hpp>
 #include <boost/url/grammar/optional_rule.hpp>
 #include <boost/url/grammar/parse.hpp>

diff --git a/include/boost/url/detail/move_chars.hpp → src/detail/move_chars.hpp b/include/boost/url/detail/move_chars.hpp → src/detail/move_chars.hpp
diff --git a/src/detail/normalize.cpp b/src/detail/normalize.cpp
@@ -13,13 +13,13 @@
 
 #include <boost/url/detail/config.hpp>
 #include <boost/url/decode_view.hpp>
-#include <boost/url/detail/decode.hpp>
+#include "decode.hpp"
 #include <boost/url/segments_encoded_view.hpp>
-#include <boost/url/detail/normalize.hpp>
 #include <boost/url/grammar/ci_string.hpp>
 #include <boost/assert.hpp>
 #include <boost/core/ignore_unused.hpp>
 #include <cstring>
+#include "normalize.hpp"
 
 namespace boost {
 namespace urls {

diff --git a/include/boost/url/detail/normalize.hpp → src/detail/normalize.hpp b/include/boost/url/detail/normalize.hpp → src/detail/normalize.hpp
@@ -12,8 +12,7 @@
 #define BOOST_URL_DETAIL_NORMALIZED_HPP
 
 #include <boost/core/detail/string_view.hpp>
-#include <boost/url/segments_encoded_view.hpp>
-#include <boost/url/detail/normalize.hpp>
+#include "boost/url/segments_encoded_view.hpp"
 
 namespace boost {
 namespace urls {

diff --git a/include/boost/url/detail/over_allocator.hpp → src/detail/over_allocator.hpp b/include/boost/url/detail/over_allocator.hpp → src/detail/over_allocator.hpp
diff --git a/include/boost/url/detail/path.hpp → src/detail/path.hpp b/include/boost/url/detail/path.hpp → src/detail/path.hpp
diff --git a/src/detail/pattern.cpp b/src/detail/pattern.cpp
@@ -11,17 +11,17 @@
 #define BOOST_URL_DETAIL_IMPL_PATTERN_IPP
 
 #include <boost/url/detail/config.hpp>
-#include <boost/url/detail/pattern.hpp>
-#include <boost/url/detail/pct_format.hpp>
-#include <boost/url/detail/replacement_field_rule.hpp>
+#include "pattern.hpp"
+#include "pct_format.hpp"
+#include "boost/url/detail/replacement_field_rule.hpp"
 #include <boost/url/grammar/alpha_chars.hpp>
 #include <boost/url/grammar/optional_rule.hpp>
 #include <boost/url/grammar/token_rule.hpp>
-#include <boost/url/rfc/detail/charsets.hpp>
-#include <boost/url/rfc/detail/host_rule.hpp>
-#include <boost/url/rfc/detail/path_rules.hpp>
-#include <boost/url/rfc/detail/port_rule.hpp>
-#include <boost/url/rfc/detail/scheme_rule.hpp>
+#include "../rfc/detail/charsets.hpp"
+#include "../rfc/detail/host_rule.hpp"
+#include "boost/url/rfc/detail/path_rules.hpp"
+#include "../rfc/detail/port_rule.hpp"
+#include "../rfc/detail/scheme_rule.hpp"
 
 namespace boost {
 namespace urls {

diff --git a/include/boost/url/detail/pattern.hpp → src/detail/pattern.hpp b/include/boost/url/detail/pattern.hpp → src/detail/pattern.hpp
@@ -10,8 +10,8 @@
 #ifndef BOOST_URL_DETAIL_PATTERN_HPP
 #define BOOST_URL_DETAIL_PATTERN_HPP
 
-#include <boost/url/error_types.hpp>
-#include <boost/url/url_base.hpp>
+#include "boost/url/error_types.hpp"
+#include "boost/url/url_base.hpp"
 #include <boost/core/detail/string_view.hpp>
 
 // This file includes functions and classes

diff --git a/src/detail/pct_format.cpp b/src/detail/pct_format.cpp
@@ -11,7 +11,7 @@
 #define BOOST_URL_DETAIL_IMPL_PCT_FORMAT_IPP
 
 #include <boost/url/detail/config.hpp>
-#include <boost/url/detail/pct_format.hpp>
+#include "pct_format.hpp"
 #include <boost/url/grammar/parse.hpp>
 #include <boost/url/grammar/unsigned_rule.hpp>
 

diff --git a/include/boost/url/detail/pct_format.hpp → src/detail/pct_format.hpp b/include/boost/url/detail/pct_format.hpp → src/detail/pct_format.hpp
@@ -11,9 +11,9 @@
 #define BOOST_URL_DETAIL_PCT_FORMAT_HPP
 
 #include <boost/core/detail/string_view.hpp>
-#include <boost/url/url.hpp>
-#include <boost/url/grammar/lut_chars.hpp>
-#include <boost/url/detail/format_args.hpp>
+#include "boost/url/url.hpp"
+#include "boost/url/grammar/lut_chars.hpp"
+#include "boost/url/detail/format_args.hpp"
 
 namespace boost {
 namespace urls {

diff --git a/include/boost/url/detail/print.hpp → src/detail/print.hpp b/include/boost/url/detail/print.hpp → src/detail/print.hpp
diff --git a/src/detail/replacement_field_rule.cpp b/src/detail/replacement_field_rule.cpp
@@ -11,7 +11,7 @@
 #define BOOST_URL_DETAIL_IMPL_REPLACEMENT_FIELD_RULE_IPP
 
 #include <boost/url/detail/config.hpp>
-#include <boost/url/detail/replacement_field_rule.hpp>
+#include "boost/url/detail/replacement_field_rule.hpp"
 #include <boost/url/grammar/alnum_chars.hpp>
 #include <boost/url/grammar/alpha_chars.hpp>
 #include <boost/url/grammar/delim_rule.hpp>

diff --git a/src/detail/segments_iter_impl.cpp b/src/detail/segments_iter_impl.cpp
@@ -12,9 +12,9 @@
 #define BOOST_URL_DETAIL_IMPL_SEGMENTS_ITER_IMPL_IPP
 
 #include <boost/url/detail/config.hpp>
-#include <boost/url/detail/path.hpp>
+#include "path.hpp"
 #include <boost/url/detail/segments_iter_impl.hpp>
-#include <boost/url/rfc/detail/path_rules.hpp>
+#include "boost/url/rfc/detail/path_rules.hpp"
 #include <boost/assert.hpp>
 
 namespace boost {

diff --git a/src/detail/url_impl.cpp b/src/detail/url_impl.cpp
@@ -11,7 +11,7 @@
 #define BOOST_URL_DETAIL_IMPL_URL_IMPL_IPP
 
 #include <boost/url/detail/config.hpp>
-#include <boost/url/detail/path.hpp>
+#include "path.hpp"
 #include <boost/url/detail/url_impl.hpp>
 #include <boost/url/authority_view.hpp>
 #include <boost/assert.hpp>

diff --git a/src/detail/vformat.cpp b/src/detail/vformat.cpp
@@ -0,0 +1,36 @@
+//
+// Copyright (c) 2022 Alan de Freitas ([email protected])
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/url
+//
+
+#ifndef BOOST_URL_DETAIL_VFORMAT_IPP
+#define BOOST_URL_DETAIL_VFORMAT_IPP
+
+#include <boost/url/detail/config.hpp>
+#include <boost/url/detail/vformat.hpp>
+#include "pattern.hpp"
+
+namespace boost {
+namespace urls {
+namespace detail {
+
+void
+vformat_to(
+    url_base& u,
+    core::string_view fmt,
+    detail::format_args args)
+{
+    parse_pattern(fmt)
+        .value().apply(u, args);
+}
+
+
+} // detail
+} // urls
+} // boost
+
+#endif
diff --git a/src/parse_path.cpp b/src/parse_path.cpp
@@ -14,9 +14,9 @@
 #include <boost/url/detail/config.hpp>
 #include <boost/url/parse_path.hpp>
 #include <boost/url/error.hpp>
-#include <boost/url/detail/path.hpp>
+#include "detail/path.hpp"
 #include <boost/url/grammar/parse.hpp>
-#include <boost/url/rfc/detail/path_rules.hpp>
+#include "boost/url/rfc/detail/path_rules.hpp"
 
 namespace boost {
 namespace urls {

diff --git a/src/pct_string_view.cpp b/src/pct_string_view.cpp
@@ -13,7 +13,7 @@
 #include <boost/url/detail/config.hpp>
 #include <boost/url/error.hpp>
 #include <boost/url/pct_string_view.hpp>
-#include <boost/url/detail/decode.hpp>
+#include "detail/decode.hpp"
 #include <boost/url/grammar/hexdig_chars.hpp>
 #include <boost/url/detail/except.hpp>
 

diff --git a/src/rfc/absolute_uri_rule.cpp b/src/rfc/absolute_uri_rule.cpp
@@ -16,9 +16,9 @@
 #include <boost/url/grammar/tuple_rule.hpp>
 #include <boost/url/grammar/optional_rule.hpp>
 #include <boost/url/grammar/parse.hpp>
-#include <boost/url/rfc/detail/hier_part_rule.hpp>
-#include <boost/url/rfc/detail/query_part_rule.hpp>
-#include <boost/url/rfc/detail/scheme_rule.hpp>
+#include "detail/hier_part_rule.hpp"
+#include "detail/query_part_rule.hpp"
+#include "detail/scheme_rule.hpp"
 #include <utility>
 
 namespace boost {

diff --git a/src/rfc/authority_rule.cpp b/src/rfc/authority_rule.cpp
@@ -16,9 +16,9 @@
 #include <boost/url/grammar/optional_rule.hpp>
 #include <boost/url/grammar/parse.hpp>
 #include <boost/url/grammar/tuple_rule.hpp>
-#include <boost/url/rfc/detail/host_rule.hpp>
-#include <boost/url/rfc/detail/port_rule.hpp>
-#include <boost/url/rfc/detail/userinfo_rule.hpp>
+#include "detail/host_rule.hpp"
+#include "detail/port_rule.hpp"
+#include "detail/userinfo_rule.hpp"
 
 namespace boost {
 namespace urls {

diff --git a/include/boost/url/rfc/detail/charsets.hpp → src/rfc/detail/charsets.hpp b/include/boost/url/rfc/detail/charsets.hpp → src/rfc/detail/charsets.hpp
@@ -10,9 +10,9 @@
 #ifndef BOOST_URL_RFC_DETAIL_CHARSETS_HPP
 #define BOOST_URL_RFC_DETAIL_CHARSETS_HPP
 
-#include <boost/url/rfc/pchars.hpp>
-#include <boost/url/rfc/sub_delim_chars.hpp>
-#include <boost/url/rfc/unreserved_chars.hpp>
+#include "boost/url/rfc/pchars.hpp"
+#include "boost/url/rfc/sub_delim_chars.hpp"
+#include "boost/url/rfc/unreserved_chars.hpp"
 
 namespace boost {
 namespace urls {

diff --git a/...ost/url/rfc/detail/fragment_part_rule.hpp → src/rfc/detail/fragment_part_rule.hpp b/...ost/url/rfc/detail/fragment_part_rule.hpp → src/rfc/detail/fragment_part_rule.hpp
@@ -10,9 +10,9 @@
 #ifndef BOOST_URL_RFC_DETAIL_FRAGMENT_PART_RULE_HPP
 #define BOOST_URL_RFC_DETAIL_FRAGMENT_PART_RULE_HPP
 
-#include <boost/url/rfc/pct_encoded_rule.hpp>
-#include <boost/url/rfc/detail/charsets.hpp>
-#include <boost/url/grammar/parse.hpp>
+#include "boost/url/rfc/pct_encoded_rule.hpp"
+#include "charsets.hpp"
+#include "boost/url/grammar/parse.hpp"
 
 namespace boost {
 namespace urls {

diff --git a/src/rfc/detail/h16_rule.cpp b/src/rfc/detail/h16_rule.cpp
@@ -11,7 +11,7 @@
 #define BOOST_URL_RFC_DETAIL_IMPL_H16_RULE_HPP
 
 #include <boost/url/detail/config.hpp>
-#include <boost/url/rfc/detail/h16_rule.hpp>
+#include "h16_rule.hpp"
 #include <boost/url/grammar/charset.hpp>
 #include <boost/url/grammar/error.hpp>
 #include <boost/url/grammar/hexdig_chars.hpp>

diff --git a/include/boost/url/rfc/detail/h16_rule.hpp → src/rfc/detail/h16_rule.hpp b/include/boost/url/rfc/detail/h16_rule.hpp → src/rfc/detail/h16_rule.hpp
@@ -10,8 +10,8 @@
 #ifndef BOOST_URL_RFC_DETAIL_H16_RULE_HPP
 #define BOOST_URL_RFC_DETAIL_H16_RULE_HPP
 
-#include <boost/url/detail/config.hpp>
-#include <boost/url/error_types.hpp>
+#include "boost/url/detail/config.hpp"
+#include "boost/url/error_types.hpp"
 #include <cstdint>
 
 namespace boost {

diff --git a/src/rfc/detail/hier_part_rule.cpp b/src/rfc/detail/hier_part_rule.cpp
@@ -11,8 +11,8 @@
 #define BOOST_URL_RFC_DETAIL_IMPL_HIER_PART_RULE_IPP
 
 #include <boost/url/detail/config.hpp>
-#include <boost/url/rfc/detail/hier_part_rule.hpp>
-#include <boost/url/rfc/detail/path_rules.hpp>
+#include "hier_part_rule.hpp"
+#include "boost/url/rfc/detail/path_rules.hpp"
 #include <boost/url/grammar/parse.hpp>
 #include <boost/url/grammar/parse.hpp>
 

diff --git a/...e/boost/url/rfc/detail/hier_part_rule.hpp → src/rfc/detail/hier_part_rule.hpp b/...e/boost/url/rfc/detail/hier_part_rule.hpp → src/rfc/detail/hier_part_rule.hpp
@@ -10,9 +10,9 @@
 #ifndef BOOST_URL_RFC_DETAIL_HIER_PART_RULE_HPP
 #define BOOST_URL_RFC_DETAIL_HIER_PART_RULE_HPP
 
-#include <boost/url/detail/config.hpp>
-#include <boost/url/pct_string_view.hpp>
-#include <boost/url/rfc/authority_rule.hpp>
+#include "boost/url/detail/config.hpp"
+#include "boost/url/pct_string_view.hpp"
+#include "boost/url/rfc/authority_rule.hpp"
 #include <cstdlib>
 
 namespace boost {

diff --git a/src/rfc/detail/host_rule.cpp b/src/rfc/detail/host_rule.cpp
@@ -12,9 +12,9 @@
 
 #include <boost/url/detail/config.hpp>
 #include <boost/url/rfc/ipv4_address_rule.hpp>
-#include <boost/url/rfc/detail/host_rule.hpp>
-#include <boost/url/rfc/detail/ip_literal_rule.hpp>
-#include <boost/url/rfc/detail/reg_name_rule.hpp>
+#include "host_rule.hpp"
+#include "ip_literal_rule.hpp"
+#include "reg_name_rule.hpp"
 #include <boost/url/grammar/parse.hpp>
 
 namespace boost {

diff --git a/include/boost/url/rfc/detail/host_rule.hpp → src/rfc/detail/host_rule.hpp b/include/boost/url/rfc/detail/host_rule.hpp → src/rfc/detail/host_rule.hpp
@@ -10,11 +10,11 @@
 #ifndef BOOST_URL_RFC_DETAIL_HOST_RULE_HPP
 #define BOOST_URL_RFC_DETAIL_HOST_RULE_HPP
 
-#include <boost/url/host_type.hpp>
-#include <boost/url/error_types.hpp>
-#include <boost/url/pct_string_view.hpp>
-#include <boost/url/ipv4_address.hpp>
-#include <boost/url/ipv6_address.hpp>
+#include "boost/url/host_type.hpp"
+#include "boost/url/error_types.hpp"
+#include "boost/url/pct_string_view.hpp"
+#include "boost/url/ipv4_address.hpp"
+#include "boost/url/ipv6_address.hpp"
 
 namespace boost {
 namespace urls {