Skip to content

Commit

Permalink
style: pre-commit fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@pre-commit-ci
pre-commit-ci[bot] committed Sep 29, 2024
1 parent e1e60d2 commit 62ee3fe
Showing 1 changed file with 34 additions and 21 deletions.
55 changes: 34 additions & 21 deletions include/pybind11/pybind11.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,9 @@ class cpp_function : public function {
typename = detail::enable_if_t<detail::is_lambda<Func>::value>>
// NOLINTNEXTLINE(google-explicit-constructor)
cpp_function(Func &&f, Extra &&...extra) {
initialize(
std::forward<Func>(f), (detail::function_signature_t<Func> *) nullptr, std::forward<Extra>(extra)...);
initialize(std::forward<Func>(f),
(detail::function_signature_t<Func> *) nullptr,
std::forward<Extra>(extra)...);
}

/// Construct a cpp_function from a class method (non-const, no ref-qualifier)
Expand Down Expand Up @@ -191,7 +192,7 @@ class cpp_function : public function {

/// Special internal constructor for functors, lambda functions, etc.
template <typename Func, typename Return, typename... Args, typename... Extra>
void initialize(Func &&f, Return (*)(Args...), Extra &&... extra) {
void initialize(Func &&f, Return (*)(Args...), Extra &&...extra) {
using namespace detail;
struct capture {
remove_reference_t<Func> f;
Expand Down Expand Up @@ -1728,7 +1729,11 @@ class class_ : public detail::generic_type {
"def_readwrite() requires a class member (or base class member)");
cpp_function fget([pm](const type &c) -> const D & { return c.*pm; }, is_method(*this)),
fset([pm](type &c, const D &value) { c.*pm = value; }, is_method(*this));
def_property(name, fget, fset, return_value_policy::reference_internal, std::forward<Extra>(extra)...);
def_property(name,
fget,
fset,
return_value_policy::reference_internal,
std::forward<Extra>(extra)...);
return *this;
}

Expand All @@ -1737,22 +1742,25 @@ class class_ : public detail::generic_type {
static_assert(std::is_same<C, type>::value || std::is_base_of<C, type>::value,
"def_readonly() requires a class member (or base class member)");
cpp_function fget([pm](const type &c) -> const D & { return c.*pm; }, is_method(*this));
def_property_readonly(name, fget, return_value_policy::reference_internal, std::forward<Extra>(extra)...);
def_property_readonly(
name, fget, return_value_policy::reference_internal, std::forward<Extra>(extra)...);
return *this;
}

template <typename D, typename... Extra>
class_ &def_readwrite_static(const char *name, D *pm, Extra &&...extra) {
cpp_function fget([pm](const object &) -> const D & { return *pm; }, scope(*this)),
fset([pm](const object &, const D &value) { *pm = value; }, scope(*this));
def_property_static(name, fget, fset, return_value_policy::reference, std::forward<Extra>(extra)...);
def_property_static(
name, fget, fset, return_value_policy::reference, std::forward<Extra>(extra)...);
return *this;
}

template <typename D, typename... Extra>
class_ &def_readonly_static(const char *name, const D *pm, Extra &&...extra) {
cpp_function fget([pm](const object &) -> const D & { return *pm; }, scope(*this));
def_property_readonly_static(name, fget, return_value_policy::reference, std::forward<Extra>(extra)...);
def_property_readonly_static(
name, fget, return_value_policy::reference, std::forward<Extra>(extra)...);
return *this;
}

Expand All @@ -1767,33 +1775,34 @@ class class_ : public detail::generic_type {

/// Uses cpp_function's return_value_policy by default
template <typename... Extra>
class_ &
def_property_readonly(const char *name, const cpp_function &fget, Extra &&...extra) {
class_ &def_property_readonly(const char *name, const cpp_function &fget, Extra &&...extra) {
return def_property(name, fget, nullptr, std::forward<Extra>(extra)...);
}

/// Uses return_value_policy::reference by default
template <typename Getter, typename... Extra>
class_ &
def_property_readonly_static(const char *name, const Getter &fget, Extra &&...extra) {
return def_property_readonly_static(
name, cpp_function(fget), return_value_policy::reference, std::forward<Extra>(extra)...);
class_ &def_property_readonly_static(const char *name, const Getter &fget, Extra &&...extra) {
return def_property_readonly_static(name,
cpp_function(fget),
return_value_policy::reference,
std::forward<Extra>(extra)...);
}

/// Uses cpp_function's return_value_policy by default
template <typename... Extra>
class_ &def_property_readonly_static(const char *name,
const cpp_function &fget,
Extra &&...extra) {
class_ &
def_property_readonly_static(const char *name, const cpp_function &fget, Extra &&...extra) {
return def_property_static(name, fget, nullptr, std::forward<Extra>(extra)...);
}

/// Uses return_value_policy::reference_internal by default
template <typename Getter, typename Setter, typename... Extra>
class_ &
def_property(const char *name, const Getter &fget, const Setter &fset, Extra &&...extra) {
return def_property(
name, fget, cpp_function(method_adaptor<type>(fset), is_setter()), std::forward<Extra>(extra)...);
return def_property(name,
fget,
cpp_function(method_adaptor<type>(fset), is_setter()),
std::forward<Extra>(extra)...);
}
template <typename Getter, typename... Extra>
class_ &def_property(const char *name,
Expand All @@ -1813,7 +1822,8 @@ class class_ : public detail::generic_type {
const cpp_function &fget,
const cpp_function &fset,
Extra &&...extra) {
return def_property_static(name, fget, fset, is_method(*this), std::forward<Extra>(extra)...);
return def_property_static(
name, fget, fset, is_method(*this), std::forward<Extra>(extra)...);
}

/// Uses return_value_policy::reference by default
Expand All @@ -1822,8 +1832,11 @@ class class_ : public detail::generic_type {
const Getter &fget,
const cpp_function &fset,
Extra &&...extra) {
return def_property_static(
name, cpp_function(fget), fset, return_value_policy::reference, std::forward<Extra>(extra)...);
return def_property_static(name,
cpp_function(fget),
fset,
return_value_policy::reference,
std::forward<Extra>(extra)...);
}

/// Uses cpp_function's return_value_policy by default
Expand Down

0 comments on commit 62ee3fe

Please sign in to comment.