summaryrefslogtreecommitdiffstats
path: root/Objects/abstract.c
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-08-22 20:48:54 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2016-08-22 20:48:54 (GMT)
commit559bb6a71399af3b1b2a0ba97230d2bcc649e993 (patch)
tree94927374ac025ae249aa487ce4a17df99c3df2d8 /Objects/abstract.c
parentc98afb7a26ac611a4544c5b8dd445d8ea05e6360 (diff)
downloadcpython-559bb6a71399af3b1b2a0ba97230d2bcc649e993.zip
cpython-559bb6a71399af3b1b2a0ba97230d2bcc649e993.tar.gz
cpython-559bb6a71399af3b1b2a0ba97230d2bcc649e993.tar.bz2
Rename _PyObject_FastCall() to _PyObject_FastCallDict()
Issue #27809: * Rename _PyObject_FastCall() function to _PyObject_FastCallDict() * Add _PyObject_FastCall(), _PyObject_CallNoArg() and _PyObject_CallArg1() macros calling _PyObject_FastCallDict()
Diffstat (limited to 'Objects/abstract.c')
-rw-r--r--Objects/abstract.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c
index 32d4575..2ce7f32 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -2255,12 +2255,12 @@ _PyStack_AsTuple(PyObject **stack, Py_ssize_t nargs)
}
PyObject *
-_PyObject_FastCall(PyObject *func, PyObject **args, int nargs, PyObject *kwargs)
+_PyObject_FastCallDict(PyObject *func, PyObject **args, int nargs, PyObject *kwargs)
{
ternaryfunc call;
PyObject *result = NULL;
- /* _PyObject_FastCall() must not be called with an exception set,
+ /* _PyObject_FastCallDict() must not be called with an exception set,
because it may clear it (directly or indirectly) and so the
caller loses its exception */
assert(!PyErr_Occurred());
@@ -2318,7 +2318,7 @@ call_function_tail(PyObject *callable, PyObject *args)
assert(args != NULL);
if (!PyTuple_Check(args)) {
- result = _PyObject_FastCall(callable, &args, 1, NULL);
+ result = _PyObject_CallArg1(callable, args);
}
else {
result = PyObject_Call(callable, args, NULL);
@@ -2338,7 +2338,7 @@ PyObject_CallFunction(PyObject *callable, const char *format, ...)
}
if (!format || !*format) {
- return _PyObject_FastCall(callable, NULL, 0, NULL);
+ return _PyObject_CallNoArg(callable);
}
va_start(va, format);
@@ -2364,7 +2364,7 @@ _PyObject_CallFunction_SizeT(PyObject *callable, const char *format, ...)
}
if (!format || !*format) {
- return _PyObject_FastCall(callable, NULL, 0, NULL);
+ return _PyObject_CallNoArg(callable);
}
va_start(va, format);
@@ -2392,7 +2392,7 @@ callmethod(PyObject* func, const char *format, va_list va, int is_size_t)
}
if (!format || !*format) {
- return _PyObject_FastCall(func, NULL, 0, NULL);
+ return _PyObject_CallNoArg(func);
}
if (is_size_t) {