Commit de5dbaa0 authored by Stefan Behnel's avatar Stefan Behnel

GetStarArgs: separate out keyword handling, generate specific code for...

GetStarArgs: separate out keyword handling, generate specific code for functions with or without any combination of *args and **kwargs
parent 27ee73c4
...@@ -930,15 +930,19 @@ class DefNode(FuncDefNode): ...@@ -930,15 +930,19 @@ class DefNode(FuncDefNode):
assmt = None assmt = None
num_kwonly_args = 0 num_kwonly_args = 0
num_required_kw_args = 0
reqd_kw_flags_cname = "0" reqd_kw_flags_cname = "0"
def __init__(self, pos, **kwds): def __init__(self, pos, **kwds):
FuncDefNode.__init__(self, pos, **kwds) FuncDefNode.__init__(self, pos, **kwds)
n = 0 n = r = 0
for arg in self.args: for arg in self.args:
if arg.kw_only: if arg.kw_only:
n += 1 n += 1
if not arg.default:
r += 1
self.num_kwonly_args = n self.num_kwonly_args = n
self.num_required_kw_args = r
def analyse_declarations(self, env): def analyse_declarations(self, env):
for arg in self.args: for arg in self.args:
...@@ -963,6 +967,7 @@ class DefNode(FuncDefNode): ...@@ -963,6 +967,7 @@ class DefNode(FuncDefNode):
if self.star_arg or self.starstar_arg or self.num_kwonly_args > 0: if self.star_arg or self.starstar_arg or self.num_kwonly_args > 0:
env.use_utility_code(get_stararg_utility_code) env.use_utility_code(get_stararg_utility_code)
env.use_utility_code(get_splitkeywords_utility_code) env.use_utility_code(get_splitkeywords_utility_code)
env.use_utility_code(get_checkkeywords_utility_code)
def analyse_signature(self, env): def analyse_signature(self, env):
any_type_tests_needed = 0 any_type_tests_needed = 0
...@@ -1246,9 +1251,8 @@ class DefNode(FuncDefNode): ...@@ -1246,9 +1251,8 @@ class DefNode(FuncDefNode):
pt_argstring) pt_argstring)
if has_star_or_kw_args: if has_star_or_kw_args:
code.putln("{") code.putln("{")
code.put_xdecref(Naming.args_cname, py_object_type) self.put_stararg_decrefs(code)
code.put_xdecref(Naming.kwds_cname, py_object_type) self.generate_arg_decref(self.star_arg, code)
self.generate_arg_xdecref(self.star_arg, code)
self.generate_arg_xdecref(self.starstar_arg, code) self.generate_arg_xdecref(self.starstar_arg, code)
code.putln(error_return_code) code.putln(error_return_code)
code.putln("}") code.putln("}")
...@@ -1256,14 +1260,19 @@ class DefNode(FuncDefNode): ...@@ -1256,14 +1260,19 @@ class DefNode(FuncDefNode):
code.putln(error_return_code) code.putln(error_return_code)
def put_stararg_decrefs(self, code): def put_stararg_decrefs(self, code):
if self.star_arg or self.starstar_arg or self.num_kwonly_args > 0: if self.star_arg:
code.put_xdecref(Naming.args_cname, py_object_type) code.put_decref(Naming.args_cname, py_object_type)
if self.starstar_arg:
code.put_xdecref(Naming.kwds_cname, py_object_type) code.put_xdecref(Naming.kwds_cname, py_object_type)
def generate_arg_xdecref(self, arg, code): def generate_arg_xdecref(self, arg, code):
if arg: if arg:
code.put_var_xdecref(arg.entry) code.put_var_xdecref(arg.entry)
def generate_arg_decref(self, arg, code):
if arg:
code.put_var_decref(arg.entry)
def arg_address(self, arg): def arg_address(self, arg):
if arg: if arg:
return "&%s" % arg.entry.cname return "&%s" % arg.entry.cname
...@@ -1271,9 +1280,11 @@ class DefNode(FuncDefNode): ...@@ -1271,9 +1280,11 @@ class DefNode(FuncDefNode):
return 0 return 0
def generate_stararg_getting_code(self, code): def generate_stararg_getting_code(self, code):
error_return = "return %s;" % self.error_value()
num_kwonly = self.num_kwonly_args num_kwonly = self.num_kwonly_args
fixed_args = self.entry.signature.num_fixed_args() fixed_args = self.entry.signature.num_fixed_args()
nargs = len(self.args) - num_kwonly - fixed_args nargs = len(self.args) - num_kwonly - fixed_args
if self.star_arg: if self.star_arg:
star_arg_addr = self.arg_address(self.star_arg) star_arg_addr = self.arg_address(self.star_arg)
code.putln( code.putln(
...@@ -1290,17 +1301,34 @@ class DefNode(FuncDefNode): ...@@ -1290,17 +1301,34 @@ class DefNode(FuncDefNode):
error_message = "function takes at most %d positional arguments (%d given)" error_message = "function takes at most %d positional arguments (%d given)"
code.putln("PyErr_Format(PyExc_TypeError, \"%s\", %d, PyTuple_GET_SIZE(%s));" % ( code.putln("PyErr_Format(PyExc_TypeError, \"%s\", %d, PyTuple_GET_SIZE(%s));" % (
error_message, nargs, Naming.args_cname)) error_message, nargs, Naming.args_cname))
code.putln("return %s;" % self.error_value()) code.putln(error_return)
code.putln("}") code.putln("}")
if self.starstar_arg or num_kwonly:
starstar_arg_addr = self.arg_address(self.starstar_arg) handle_error = 0
code.putln( if self.starstar_arg:
"if (unlikely(__Pyx_SplitKeywords(&%s, %s, %s, %s) < 0)) return %s;" % ( handle_error = 1
code.put(
"if (unlikely(__Pyx_SplitKeywords(&%s, %s, %s, %s) < 0)) " % (
Naming.kwds_cname, Naming.kwds_cname,
Naming.kwdlist_cname, Naming.kwdlist_cname,
starstar_arg_addr, self.arg_address(self.starstar_arg),
self.reqd_kw_flags_cname, self.reqd_kw_flags_cname))
self.error_value())) elif self.num_required_kw_args:
handle_error = 1
code.put("if (unlikely(__Pyx_CheckRequiredKeywords(%s, %s, %s) < 0)) " % (
Naming.kwds_cname,
Naming.kwdlist_cname,
self.reqd_kw_flags_cname))
if handle_error:
if self.star_arg:
code.putln("{")
code.put_decref(Naming.args_cname, py_object_type)
code.put_decref(self.star_arg.entry.cname, py_object_type)
code.putln(error_return)
code.putln("}")
else:
code.putln(error_return)
def generate_argument_conversion_code(self, code): def generate_argument_conversion_code(self, code):
# Generate code to convert arguments from # Generate code to convert arguments from
...@@ -3344,17 +3372,12 @@ static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed ...@@ -3344,17 +3372,12 @@ static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed
# reference *args with references to a new tuple, and passes back a # reference *args with references to a new tuple, and passes back a
# new reference in *args2. Does not touch any of its arguments on # new reference in *args2. Does not touch any of its arguments on
# failure. # failure.
#
# If rqd_kwds is not 0, it is an array of booleans corresponding to the
# names in kwd_list, indicating required keyword arguments. If any of
# these are not present in kwds, an exception is raised.
#
get_stararg_utility_code = [ get_stararg_utility_code = [
""" """
static int __Pyx_GetStarArg(PyObject **args, Py_ssize_t nargs, PyObject **args2); /*proto*/ static INLINE int __Pyx_GetStarArg(PyObject **args, Py_ssize_t nargs, PyObject **args2); /*proto*/
""",""" ""","""
static int __Pyx_GetStarArg( static INLINE int __Pyx_GetStarArg(
PyObject **args, PyObject **args,
Py_ssize_t nargs, Py_ssize_t nargs,
PyObject **args2) PyObject **args2)
...@@ -3364,19 +3387,14 @@ static int __Pyx_GetStarArg( ...@@ -3364,19 +3387,14 @@ static int __Pyx_GetStarArg(
*args2 = 0; *args2 = 0;
args1 = PyTuple_GetSlice(*args, 0, nargs); args1 = PyTuple_GetSlice(*args, 0, nargs);
if (!args1) if (!args1)
goto bad; return -1;
*args2 = PyTuple_GetSlice(*args, nargs, PyTuple_GET_SIZE(*args)); *args2 = PyTuple_GetSlice(*args, nargs, PyTuple_GET_SIZE(*args));
if (!*args2) if (!*args2) {
goto bad; Py_DECREF(args1);
return -1;
}
*args = args1; *args = args1;
return 0; return 0;
bad:
Py_XDECREF(args1);
if (args2) {
Py_XDECREF(*args2);
}
return -1;
} }
"""] """]
...@@ -3413,11 +3431,7 @@ static int __Pyx_SplitKeywords( ...@@ -3413,11 +3431,7 @@ static int __Pyx_SplitKeywords(
int i; int i;
char **p; char **p;
if (kwds2)
*kwds2 = 0;
if (*kwds) { if (*kwds) {
if (kwds2) {
kwds1 = PyDict_New(); kwds1 = PyDict_New();
if (!kwds1) if (!kwds1)
goto bad; goto bad;
...@@ -3439,28 +3453,16 @@ static int __Pyx_SplitKeywords( ...@@ -3439,28 +3453,16 @@ static int __Pyx_SplitKeywords(
} }
s = 0; s = 0;
} }
else {
kwds1 = *kwds;
Py_INCREF(kwds1);
if (rqd_kwds) {
for (i = 0, p = kwd_list; *p; i++, p++)
if (rqd_kwds[i] && !PyDict_GetItemString(kwds1, *p))
goto missing_kwarg;
}
}
}
else { else {
if (rqd_kwds) { if (rqd_kwds) {
for (i = 0, p = kwd_list; *p; i++, p++) for (i = 0, p = kwd_list; *p; i++, p++)
if (rqd_kwds[i]) if (rqd_kwds[i])
goto missing_kwarg; goto missing_kwarg;
} }
if (kwds2) {
*kwds2 = PyDict_New(); *kwds2 = PyDict_New();
if (!*kwds2) if (!*kwds2)
goto bad; goto bad;
} }
}
*kwds = kwds1; *kwds = kwds1;
return 0; return 0;
...@@ -3470,9 +3472,39 @@ missing_kwarg: ...@@ -3470,9 +3472,39 @@ missing_kwarg:
bad: bad:
Py_XDECREF(s); Py_XDECREF(s);
Py_XDECREF(kwds1); Py_XDECREF(kwds1);
if (kwds2) {
Py_XDECREF(*kwds2); Py_XDECREF(*kwds2);
return -1;
}
"""]
get_checkkeywords_utility_code = [
"""
static INLINE int __Pyx_CheckRequiredKeywords(PyObject *kwds, char *kwd_list[],
char rqd_kwds[]); /*proto*/
""","""
static INLINE int __Pyx_CheckRequiredKeywords(
PyObject *kwds,
char *kwd_list[],
char rqd_kwds[])
{
int i;
char **p;
if (kwds) {
for (i = 0, p = kwd_list; *p; i++, p++)
if (rqd_kwds[i] && !PyDict_GetItemString(kwds, *p))
goto missing_kwarg;
} }
else {
for (i = 0, p = kwd_list; *p; i++, p++)
if (rqd_kwds[i])
goto missing_kwarg;
}
return 0;
missing_kwarg:
PyErr_Format(PyExc_TypeError,
"required keyword argument '%s' is missing", *p);
return -1; return -1;
} }
"""] """]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment