1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vgetargskeywords:

Browse Source 
+ Got rid of now-redundant dict typecheck.
+ Renamed nkwds to nkwlist.  Now all the "counting" vrbls have names
  related to the things they're counting in an obvious way.
This commit is contained in:
Tim Peters 2001-10-27 04:45:34 +00:00
parent 6fb2635f25
commit b0872fc8a6
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Python/getargs.c
View File

@ -1034,7 +1034,7 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
char *formatsave; char *formatsave;
int i, len, nargs, nkeywords; int i, len, nargs, nkeywords;
char *msg, *ks, **p; char *msg, *ks, **p;
int nkwds, pos, match, converted; int nkwlist, pos, match, converted;
PyObject *key, *value; PyObject *key, *value;
assert(args != NULL && PyTuple_Check(args)); assert(args != NULL && PyTuple_Check(args));
@ -1080,24 +1080,11 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
format = formatsave; format = formatsave;
nargs = PyTuple_GET_SIZE(args); nargs = PyTuple_GET_SIZE(args);
nkeywords = keywords == NULL ? 0 : PyDict_Size(keywords);
/* do a cursory check of the keywords just to see how many we got */
nkeywords = 0;
if (keywords) {
if (!PyDict_Check(keywords)) {
PyErr_Format(PyExc_SystemError,
"%s received when keyword dictionary expected",
keywords->ob_type->tp_name);
return 0;
}
nkeywords = PyDict_Size(keywords);
}
/* make sure there are no duplicate values for an argument; /* make sure there are no duplicate values for an argument;
its not clear when to use the term "keyword argument vs. its not clear when to use the term "keyword argument vs.
keyword parameter in messages */ keyword parameter in messages */
if (keywords) { if (keywords) {
for (i = 0; i < nargs; i++) { for (i = 0; i < nargs; i++) {
char *thiskw = kwlist[i]; char *thiskw = kwlist[i];
@ -1175,14 +1162,14 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
/* make sure the number of keywords in the keyword list matches the /* make sure the number of keywords in the keyword list matches the
number of items in the format string */ number of items in the format string */
nkwds = 0; nkwlist = 0;
p = kwlist; p = kwlist;
for (;;) { for (;;) {
if (!*(p++)) break; if (!*(p++)) break;
nkwds++; nkwlist++;
} }
if (nkwds != max) { if (nkwlist != max) {
PyErr_SetString(PyExc_SystemError, PyErr_SetString(PyExc_SystemError,
"number of items in format string and keyword list do not match"); "number of items in format string and keyword list do not match");
return 0; return 0;
@ -1192,7 +1179,7 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
string where it was left after processing args */ string where it was left after processing args */
converted = 0; converted = 0;
for (i = nargs; i < nkwds; i++) { for (i = nargs; i < nkwlist; i++) {
PyObject *item; PyObject *item;
if (*format == '|') if (*format == '|')
format++; format++;
@ -1223,7 +1210,7 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
while (PyDict_Next(keywords, &pos, &key, &value)) { while (PyDict_Next(keywords, &pos, &key, &value)) {
match = 0; match = 0;
ks = PyString_AsString(key); ks = PyString_AsString(key);
for (i = 0; i < nkwds; i++) { for (i = 0; i < nkwlist; i++) {
if (!strcmp(ks, kwlist[i])) { if (!strcmp(ks, kwlist[i])) {
match = 1; match = 1;
break; break;