pybind/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2026-05-13 09:46:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename args_kw_only to kwonly

Browse Source
This commit is contained in:
Sebastian Koslowski
2020-04-14 13:04:25 +02:00
committed by Wenzel Jakob
parent be0d804523
commit a86ac538f5
6 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/pybind11/attr.h
View File

@@ -138,7 +138,7 @@ struct function_record {
function_record()
: is_constructor(false), is_new_style_constructor(false), is_stateless(false),
is_operator(false), is_method(false),
has_args(false), has_kwargs(false), has_kw_only_args(false) { }
has_args(false), has_kwargs(false), has_kwonly_args(false) { }
/// Function name
char *name = nullptr; /* why no C++ strings? They generate heavier code.. */
@@ -185,8 +185,8 @@ struct function_record {
/// True if the function has a '**kwargs' argument
bool has_kwargs : 1;
/// True once a 'py::args_kw_only' is encountered (any following args are keyword-only)
bool has_kw_only_args : 1;
/// True once a 'py::kwonly' is encountered (any following args are keyword-only)
bool has_kwonly_args : 1;
/// Number of arguments (including py::args and/or py::kwargs, if present)
std::uint16_t nargs;
@@ -368,7 +368,7 @@ template <> struct process_attribute<is_new_style_constructor> : process_attribu
inline void process_kwonly_arg(const arg &a, function_record *r) {
if (!a.name || strlen(a.name) == 0)
pybind11_fail("arg(): cannot specify an unnamed argument after an args_kw_only() annotation");
pybind11_fail("arg(): cannot specify an unnamed argument after an kwonly() annotation");
++r->nargs_kwonly;
}
@@ -379,7 +379,7 @@ template <> struct process_attribute<arg> : process_attribute_default<arg> {
r->args.emplace_back("self", nullptr, handle(), true /*convert*/, false /*none not allowed*/);
r->args.emplace_back(a.name, nullptr, handle(), !a.flag_noconvert, a.flag_none);
if (r->has_kw_only_args) process_kwonly_arg(a, r);
if (r->has_kwonly_args) process_kwonly_arg(a, r);
}
};
@@ -412,14 +412,14 @@ template <> struct process_attribute<arg_v> : process_attribute_default<arg_v> {
}
r->args.emplace_back(a.name, a.descr, a.value.inc_ref(), !a.flag_noconvert, a.flag_none);
if (r->has_kw_only_args) process_kwonly_arg(a, r);
if (r->has_kwonly_args) process_kwonly_arg(a, r);
}
};
/// Process a keyword-only-arguments-follow pseudo argument
template <> struct process_attribute<args_kw_only> : process_attribute_default<args_kw_only> {
static void init(const args_kw_only &, function_record *r) {
r->has_kw_only_args = true;
template <> struct process_attribute<kwonly> : process_attribute_default<kwonly> {
static void init(const kwonly &, function_record *r) {
r->has_kwonly_args = true;
}
};

2
include/pybind11/cast.h
View File

@@ -1890,7 +1890,7 @@ public:
/// \ingroup annotations
/// Annotation indicating that all following arguments are keyword-only; the is the equivalent of an
/// unnamed '*' argument (in Python 3)
struct args_kw_only {};
struct kwonly {};
template <typename T>
arg_v arg::operator=(T &&value) const { return {std::move(*this), std::forward<T>(value)}; }

6
include/pybind11/pybind11.h
View File

@@ -169,11 +169,11 @@ protected:
process_attributes<Extra...>::init(extra..., rec);
{
constexpr bool has_kw_only_args = any_of<std::is_same<args_kw_only, Extra>...>::value,
constexpr bool has_kwonly_args = any_of<std::is_same<kwonly, Extra>...>::value,
has_args = any_of<std::is_same<args, Args>...>::value,
has_arg_annotations = any_of<is_keyword<Extra>...>::value;
static_assert(has_arg_annotations || !has_kw_only_args, "py::args_kw_only requires the use of argument annotations");
static_assert(!(has_args && has_kw_only_args), "py::args_kw_only cannot be combined with a py::args argument");
static_assert(has_arg_annotations || !has_kwonly_args, "py::kwonly requires the use of argument annotations");
static_assert(!(has_args && has_kwonly_args), "py::kwonly cannot be combined with a py::args argument");
}
/* Generate a readable signature describing the function's arguments and return value types */