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

Patch #1115086: support PY_LONGLONG in structmember.

This commit is contained in:
Martin v. Löwis 2005-03-03 23:00:26 +00:00
parent 7e78ade6f9
commit 96d743ec8b
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Include/structmember.h
View File

@ -65,6 +65,10 @@ typedef struct PyMemberDef {
#define T_OBJECT_EX 16 /* Like T_OBJECT, but raises AttributeError
when the value is NULL, instead of
converting to None. */
#ifdef HAVE_LONG_LONG
#define T_LONGLONG 17
#define T_ULONGLONG 18
#endif /* HAVE_LONG_LONG */
/* Flags */
#define READONLY 1

2
Misc/NEWS
View File

@ -10,6 +10,8 @@ What's New in Python 2.5 alpha 1?
Core and builtins
-----------------
- Patch #1115086: Support PY_LONGLONG in structmember.
- Bug #1155938: new style classes did not check that __init__() was
returning None.

32
Python/structmember.c
View File

@ -118,6 +118,14 @@ PyMember_GetOne(char *addr, PyMemberDef *l)
PyErr_SetString(PyExc_AttributeError, l->name);
Py_XINCREF(v);
break;
#ifdef HAVE_LONG_LONG
case T_LONGLONG:
v = PyLong_FromLongLong(*(PY_LONG_LONG *)addr);
break;
case T_ULONGLONG:
v = PyLong_FromUnsignedLongLong(*(unsigned PY_LONG_LONG *)addr);
break;
#endif /* HAVE_LONG_LONG */
default:
PyErr_SetString(PyExc_SystemError, "bad memberdescr type");
v = NULL;
@ -246,6 +254,30 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
return -1;
}
break;
#ifdef HAVE_LONG_LONG
case T_LONGLONG:
if (!PyLong_Check(v)) {
PyErr_BadArgument();
return -1;
} else {
*(PY_LONG_LONG*)addr = PyLong_AsLongLong(v);
if ((*addr == -1) && PyErr_Occurred()) {
return -1;
}
}
break;
case T_ULONGLONG:
if (!PyLong_Check(v)) {
PyErr_BadArgument();
return -1;
} else {
*(unsigned PY_LONG_LONG*)addr = PyLong_AsUnsignedLongLong(v);
if ((*addr == -1) && PyErr_Occurred()) {
return -1;
}
}
break;
#endif /* HAVE_LONG_LONG */
default:
PyErr_Format(PyExc_SystemError,
"bad memberdescr type for %s", l->name);