Skip to content

gh-106799: Pick another example method for Argument Clinic How-To #106800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
littlebutt wants to merge 11 commits into from
Closed

gh-106799: Pick another example method for Argument Clinic How-To #106800

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2442d02
gh-104469 Convert_testcapi/vectorcall.c to use AC
littlebutt Jul 9, 2023
291f92f
fix method names
littlebutt Jul 9, 2023
fcf998f
Update Modules/_testcapi/vectorcall.c
littlebutt Jul 9, 2023
5ee06e7
run ``build.bat --regen`` to fix CI
littlebutt Jul 9, 2023
92d897b
Merge branch 'python:main' into main
littlebutt Jul 9, 2023
24dd765
Merge branch 'main' into main
littlebutt Jul 9, 2023
ed29f9e
Merge branch 'python:main' into main
littlebutt Jul 14, 2023
4aedea8
Merge branch 'python:main' into main
littlebutt Jul 16, 2023
cf11d8d
gh-106799: pick another method to illustrate AC
littlebutt Jul 16, 2023
e1a05cc
modify the example function to fit all cases
littlebutt Jul 18, 2023
9fbc42b
Merge branch 'main' into change_an_example_for_clinic
littlebutt Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
gh-104469 Convert_testcapi/vectorcall.c to use AC
  • Loading branch information
@littlebutt
littlebutt committed Jul 9, 2023
commit 2442d0236dfef71dbb93b2fcb9b78ace91c60f6e
110 changes: 109 additions & 1 deletion Modules/_testcapi/clinic/vectorcall.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

65 changes: 41 additions & 24 deletions Modules/_testcapi/vectorcall.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
#include "structmember.h" // PyMemberDef
#include <stddef.h> // offsetof

/*[clinic input]
module _testcapi
[clinic start generated code]*/
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=6361033e795369fc]*/

/* Test PEP 590 - Vectorcall */

Expand All @@ -25,18 +29,23 @@ fastcall_args(PyObject *args, PyObject ***stack, Py_ssize_t *nargs)
return 0;
}

/*[clinic input]
_testcapi.test_pyobject_fastcalldict
func: object
func_args: object
kwargs: object
/
[clinic start generated code]*/

static PyObject *
test_pyobject_fastcalldict(PyObject *self, PyObject *args)
_testcapi_test_pyobject_fastcalldict_impl(PyObject *module, PyObject *func,
PyObject *func_args,
PyObject *kwargs)
/*[clinic end generated code: output=a39da56b27d27212 input=94464574e929fbe5]*/
{
PyObject *func, *func_args, *kwargs;
PyObject **stack;
Py_ssize_t nargs;

if (!PyArg_ParseTuple(args, "OOO", &func, &func_args, &kwargs)) {
return NULL;
}

if (fastcall_args(func_args, &stack, &nargs) < 0) {
return NULL;
}
Expand All @@ -52,17 +61,23 @@ test_pyobject_fastcalldict(PyObject *self, PyObject *args)
return PyObject_VectorcallDict(func, stack, nargs, kwargs);
}

/*[clinic input]
_testcapi.test_pyobject_vectorcall
func: object
func_args: object
kwnames: object = NULL
/
[clinic start generated code]*/

static PyObject *
test_pyobject_vectorcall(PyObject *self, PyObject *args)
_testcapi_test_pyobject_vectorcall_impl(PyObject *module, PyObject *func,
PyObject *func_args,
PyObject *kwnames)
/*[clinic end generated code: output=bb25a5410142b848 input=14dd1f8bbc465b49]*/
{
PyObject *func, *func_args, *kwnames = NULL;
PyObject **stack;
Py_ssize_t nargs, nkw;

if (!PyArg_ParseTuple(args, "OOO", &func, &func_args, &kwnames)) {
return NULL;
}

if (fastcall_args(func_args, &stack, &nargs) < 0) {
return NULL;
}
Expand Down Expand Up @@ -103,17 +118,19 @@ function_setvectorcall(PyObject *self, PyObject *func)
Py_RETURN_NONE;
}

/*[clinic input]
_testcapi.test_pyvectorcall_call
func: object
argstuple: object
kwargs: object = NULL
/
[clinic start generated code]*/

static PyObject *
test_pyvectorcall_call(PyObject *self, PyObject *args)
_testcapi_test_pyvectorcall_call_impl(PyObject *module, PyObject *func,
PyObject *argstuple, PyObject *kwargs)
/*[clinic end generated code: output=f9f5cbdfe90dd6d6 input=4cc647aa0c81365a]*/
{
PyObject *func;
PyObject *argstuple;
PyObject *kwargs = NULL;

if (!PyArg_ParseTuple(args, "OO|O", &func, &argstuple, &kwargs)) {
return NULL;
}

if (!PyTuple_Check(argstuple)) {
PyErr_SetString(PyExc_TypeError, "args must be a tuple");
return NULL;
Expand Down Expand Up @@ -242,10 +259,10 @@ _testcapi_has_vectorcall_flag_impl(PyObject *module, PyTypeObject *type)
}

static PyMethodDef TestMethods[] = {
{"pyobject_fastcalldict", test_pyobject_fastcalldict, METH_VARARGS},
{"pyobject_vectorcall", test_pyobject_vectorcall, METH_VARARGS},
_TESTCAPI_TEST_PYOBJECT_FASTCALLDICT_METHODDEF
_TESTCAPI_TEST_PYOBJECT_VECTORCALL_METHODDEF
{"function_setvectorcall", function_setvectorcall, METH_O},
{"pyvectorcall_call", test_pyvectorcall_call, METH_VARARGS},
_TESTCAPI_TEST_PYVECTORCALL_CALL_METHODDEF
_TESTCAPI_MAKE_VECTORCALL_CLASS_METHODDEF
_TESTCAPI_HAS_VECTORCALL_FLAG_METHODDEF
{NULL},
Expand Down