mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-02 23:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

bpo-40147: Move the check for duplicate keywords to the compiler (GH-19289)

Browse source
This commit is contained in:
Pablo Galindo 2020-04-03 20:37:13 +01:00 • committed by GitHub
parent bd6a4c3d72
commit 254ec78341
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Python/compile.c
View file

@ -4049,6 +4049,31 @@ maybe_optimize_method_call(struct compiler *c, expr_ty e)
return 1;
}
static int
validate_keywords(struct compiler *c, asdl_seq* keywords) {
int nkeywords = asdl_seq_LEN(keywords);
for (int i = 0; i < nkeywords; i++) {
keyword_ty key = ((keyword_ty)asdl_seq_GET(keywords, i));
if (key->arg == NULL) {
continue;
}
for (int j = i+1; j < nkeywords; j++) {
keyword_ty other = ((keyword_ty)asdl_seq_GET(keywords, j));
if (other->arg && !PyUnicode_Compare(key->arg, other->arg)) {
PyObject *msg = PyUnicode_FromFormat("keyword argument repeated: %U", key->arg);
if (msg == NULL) {
return -1;
}
c->u->u_col_offset = other->col_offset;
compiler_error(c, PyUnicode_AsUTF8(msg));
Py_DECREF(msg);
return -1;
}
}
}
return 0;
}
static int
compiler_call(struct compiler *c, expr_ty e)
{
@ -4165,6 +4190,10 @@ compiler_call_helper(struct compiler *c,
{
Py_ssize_t i, nseen, nelts, nkwelts;
if (validate_keywords(c, keywords) == -1) {
return 0;
}
nelts = asdl_seq_LEN(args);
nkwelts = asdl_seq_LEN(keywords);