docs: grammar traits are aliases

boostorg · May 27, 2024 · d717525 · d717525
1 parent 363a457
commit d717525
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 34 deletions.
diff --git a/doc/modules/ROOT/pages/reference.adoc b/doc/modules/ROOT/pages/reference.adoc
@@ -229,9 +229,9 @@ xref:reference:boost/urls/grammar/variant_rule.adoc[`variant_rule`]
 
 **Type Traits**
 
-xref:reference:boost/urls/grammar/is_charset-0c.adoc[`is_charset`]
+xref:reference:boost/urls/grammar/is_charset.adoc[`is_charset`]
 
-xref:reference:boost/urls/grammar/is_rule-0a.adoc[`is_rule`]
+xref:reference:boost/urls/grammar/is_rule.adoc[`is_rule`]
 
 | **Types**
 

diff --git a/include/boost/url/detail/config.hpp b/include/boost/url/detail/config.hpp
@@ -139,6 +139,12 @@
 #define BOOST_URL_IMPLEMENTATION_DEFINED(Type) __implementation_defined__
 #endif
 
+#ifndef BOOST_URL_DOCS
+#define BOOST_URL_SEE_BELOW(Type) Type
+#else
+#define BOOST_URL_SEE_BELOW(Type) __see_below__
+#endif
+
 
 
 // avoid Boost.TypeTraits for these traits

diff --git a/include/boost/url/grammar/charset.hpp b/include/boost/url/grammar/charset.hpp
@@ -21,6 +21,22 @@ namespace boost {
 namespace urls {
 namespace grammar {
 
+namespace detail
+{
+template<class T, class = void>
+struct is_charset : std::false_type {};
+
+template<class T>
+struct is_charset<T, void_t<
+    decltype(
+    std::declval<bool&>() =
+        std::declval<T const&>().operator()(
+            std::declval<char>())
+            ) > > : std::true_type
+{
+};
+}
+
 /** Alias for `std::true_type` if T satisfies <em>CharSet</em>.
 
     This metafunction determines if the
@@ -43,23 +59,8 @@ namespace grammar {
 
     @tparam T the type to check.
 */
-#ifdef BOOST_URL_DOCS
-template<class T>
-using is_charset = __see_below__;
-#else
-template<class T, class = void>
-struct is_charset : std::false_type {};
-
 template<class T>
-struct is_charset<T, void_t<
-    decltype(
-    std::declval<bool&>() =
-        std::declval<T const&>().operator()(
-            std::declval<char>())
-            ) > > : std::true_type
-{
-};
-#endif
+using is_charset = BOOST_URL_SEE_BELOW(detail::is_charset<T>);
 
 //------------------------------------------------
 

diff --git a/include/boost/url/grammar/type_traits.hpp b/include/boost/url/grammar/type_traits.hpp
@@ -18,6 +18,22 @@ namespace boost {
 namespace urls {
 namespace grammar {
 
+namespace detail
+{
+template<class T, class = void>
+struct is_rule : std::false_type {};
+
+template<class T>
+struct is_rule<T, void_t<decltype(
+    std::declval<system::result<typename T::value_type>&>() =
+        std::declval<T const&>().parse(
+            std::declval<char const*&>(),
+            std::declval<char const*>())
+    )>> : std::is_nothrow_copy_constructible<T>
+{
+};
+}
+
 /** Determine if T meets the requirements of Rule
 
     This is an alias for `std::true_type` if
@@ -43,23 +59,8 @@ namespace grammar {
     @see
         @ref parse.
 */
-#ifdef BOOST_URL_DOCS
 template<class T>
-using is_rule = __see_below__;
-#else
-template<class T, class = void>
-struct is_rule : std::false_type {};
-
-template<class T>
-struct is_rule<T, void_t<decltype(
-    std::declval<system::result<typename T::value_type>&>() =
-        std::declval<T const&>().parse(
-            std::declval<char const*&>(),
-            std::declval<char const*>())
-    )>> : std::is_nothrow_copy_constructible<T>
-{
-};
-#endif
+using is_rule = BOOST_URL_SEE_BELOW(detail::is_rule<T>);
 
 } // grammar
 } // urls