Rename arg_literal to arg_base

Author: rwgk

include/pybind11/attr.h

@@ -482,7 +482,7 @@ struct process_attribute<arg> : process_attribute_default<arg> {
     }
 };
 template <>
-struct process_attribute<detail::arg_literal> : process_attribute<arg> {};
+struct process_attribute<detail::arg_base> : process_attribute<arg> {};
 
 /// Process a keyword argument attribute (*with* a default value)
 template <>
@@ -687,7 +687,7 @@ using extract_guard_t = typename exactly_one_t<is_call_guard, call_guard<>, Extr
 
 /// Check the number of named arguments at compile time
 template <typename... Extra,
-          size_t named = constexpr_sum(std::is_base_of<arg_literal, Extra>::value...),
+          size_t named = constexpr_sum(std::is_base_of<arg_base, Extra>::value...),
           size_t self = constexpr_sum(std::is_same<is_method, Extra>::value...)>
 constexpr bool expected_num_args(size_t nargs, bool has_args, bool has_kwargs) {
     PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(nargs, has_args, has_kwargs);

include/pybind11/cast.h

@@ -1314,21 +1314,21 @@ PYBIND11_NAMESPACE_BEGIN(detail)
 
 /// \ingroup annotations
 /// Annotation for arguments
-struct arg_literal {
+struct arg_base {
     /// Constructs an argument with the name of the argument; if null or omitted, this is a
     /// positional argument.
-    constexpr explicit arg_literal(const char *name = nullptr)
+    constexpr explicit arg_base(const char *name = nullptr)
         : name(name), flag_noconvert(false), flag_none(true) {}
 
     /// Assign a value to this argument
     template <typename T>
     arg_v operator=(T &&value) const;
 
     /// Indicate that the type should not be converted in the type caster
-    arg_literal &noconvert(bool flag = true);
+    arg_base &noconvert(bool flag = true);
 
     /// Indicates that the argument should/shouldn't allow None (e.g. for nullable pointer args)
-    arg_literal &none(bool flag = true);
+    arg_base &none(bool flag = true);
 
     const char *name;        ///< If non-null, this is a named kwargs argument
     bool flag_noconvert : 1; ///< If set, do not allow conversion (requires a supporting type
@@ -1338,11 +1338,11 @@ struct arg_literal {
 
 PYBIND11_NAMESPACE_END(detail)
 
-struct arg : detail::arg_literal {
+struct arg : detail::arg_base {
     // NOLINTNEXTLINE(google-explicit-constructor)
-    arg(const detail::arg_literal &arg_l) : detail::arg_literal{arg_l} {}
+    arg(const detail::arg_base &arg_b) : detail::arg_base{arg_b} {}
 
-    explicit arg(const char *name = nullptr) : detail::arg_literal{name} {}
+    explicit arg(const char *name = nullptr) : detail::arg_base{name} {}
 
     /// Assign a value to this argument
     template <typename T>
@@ -1364,7 +1364,7 @@ struct arg_v : arg {
     // cannot access private member declared in class 'pybind11::arg_v'
 private:
 #endif
-    friend struct arg_literal;
+    friend struct arg_base;
     template <typename T>
     arg_v(arg &&base, T &&x, const char *descr = nullptr)
         : arg(base), value(reinterpret_steal<object>(detail::make_caster<T>::cast(
@@ -1429,16 +1429,16 @@ struct pos_only {};
 PYBIND11_NAMESPACE_BEGIN(detail)
 
 template <typename T>
-arg_v arg_literal::operator=(T &&value) const {
+arg_v arg_base::operator=(T &&value) const {
     return {*this, std::forward<T>(value)};
 }
 
-inline arg_literal &arg_literal::noconvert(bool flag) {
+inline arg_base &arg_base::noconvert(bool flag) {
     flag_noconvert = flag;
     return *this;
 }
 
-inline arg_literal &arg_literal::none(bool flag) {
+inline arg_base &arg_base::none(bool flag) {
     flag_none = flag;
     return *this;
 }
@@ -1458,8 +1458,8 @@ inline namespace literals {
 /** \rst
     String literal version of `arg`
  \endrst */
-constexpr detail::arg_literal operator"" _a(const char *name, size_t) {
-    return detail::arg_literal(name);
+constexpr detail::arg_base operator"" _a(const char *name, size_t) {
+    return detail::arg_base(name);
 }
 } // namespace literals
 

include/pybind11/pytypes.h

@@ -45,7 +45,7 @@ struct arg;
 struct arg_v;
 
 PYBIND11_NAMESPACE_BEGIN(detail)
-struct arg_literal;
+struct arg_base;
 class args_proxy;
 bool isinstance_generic(handle obj, const std::type_info &tp);
 
@@ -1280,7 +1280,7 @@ class args_proxy : public handle {
 
 /// Python argument categories (using PEP 448 terms)
 template <typename T>
-using is_keyword = std::is_base_of<detail::arg_literal, T>;
+using is_keyword = std::is_base_of<detail::arg_base, T>;
 template <typename T>
 using is_s_unpacking = std::is_same<args_proxy, T>; // * unpacking
 template <typename T>