Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Complete format code support in getargs.c::skipitem(), which is called when 

evaluating keyword arguments.
This commit is contained in:
Georg Brandl 2005-09-14 19:29:53 +00:00
parent 8ee3e5aa93
commit 6dd14619bb
1 changed files with 41 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
Python/getargs.c
View File

@ -453,7 +453,9 @@ float_argument_error(PyObject *arg)
or a string with a message describing the failure. The message is
formatted as "must be <desired type>, not <actual type>".
When failing, an exception may or may not have been raised.
Don't call if a tuple is expected.
Don't call if a tuple is expected.
When you add new format codes, please don't forget poor skipitem() below.
*/
static char *
@ -1406,73 +1408,52 @@ skipitem(char **p_format, va_list *p_va)
char c = *format++;
switch (c) {
/* simple codes
* The individual types (second arg of va_arg) are irrelevant */
case 'b': /* byte -- very short int */
case 'B': /* byte as bitfield */
{
(void) va_arg(*p_va, char *);
break;
}
case 'h': /* short int */
{
(void) va_arg(*p_va, short *);
break;
}
case 'H': /* short int as bitfield */
{
(void) va_arg(*p_va, unsigned short *);
break;
}
case 'i': /* int */
{
(void) va_arg(*p_va, int *);
break;
}
case 'I': /* int sized bitfield */
case 'l': /* long int */
{
(void) va_arg(*p_va, long *);
break;
}
case 'k': /* long int sized bitfield */
#ifdef HAVE_LONG_LONG
case 'L': /* PY_LONG_LONG int */
{
(void) va_arg(*p_va, PY_LONG_LONG *);
break;
}
case 'L': /* PY_LONG_LONG */
case 'K': /* PY_LONG_LONG sized bitfield */
#endif
case 'f': /* float */
{
(void) va_arg(*p_va, float *);
break;
}
case 'd': /* double */
{
(void) va_arg(*p_va, double *);
break;
}
#ifndef WITHOUT_COMPLEX
case 'D': /* complex double */
{
(void) va_arg(*p_va, Py_complex *);
break;
}
#endif /* WITHOUT_COMPLEX */
#endif
case 'c': /* char */
{
(void) va_arg(*p_va, char *);
(void) va_arg(*p_va, void *);
break;
}
/* string codes */
case 'e': /* string with encoding */
{
(void) va_arg(*p_va, const char *);
if (!(*format == 's' || *format == 't'))
/* after 'e', only 's' and 't' is allowed */
goto err;
format++;
/* explicit fallthrough to string cases */
}
case 's': /* string */
case 'z': /* string or None */
#ifdef Py_USING_UNICODE
case 'u': /* unicode string */
#endif
case 't': /* buffer, read-only */
case 'w': /* buffer, read-write */
{
(void) va_arg(*p_va, char **);
if (*format == '#') {
@ -1481,18 +1462,13 @@ skipitem(char **p_format, va_list *p_va)
}
break;
}
case 'z': /* string */
{
(void) va_arg(*p_va, char **);
if (*format == '#') {
(void) va_arg(*p_va, int *);
format++;
}
break;
}
/* object codes */
case 'S': /* string object */
#ifdef Py_USING_UNICODE
case 'U': /* unicode string object */
#endif
{
(void) va_arg(*p_va, PyObject **);
break;
@ -1528,9 +1504,13 @@ skipitem(char **p_format, va_list *p_va)
}
default:
err:
return "impossible<bad format char>";
}
/* The "(...)" format code for tuples is not handled here because
* it is not allowed with keyword args. */
*p_format = format;
return NULL;