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

Add _PyUnicode_HAS_WSTR_MEMORY() macro

This commit is contained in:
Victor Stinner 2011-10-03 23:45:12 +02:00
parent 9ce5a835bb
commit 03490918b7
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Objects/unicodeobject.c
View File

@ -151,6 +151,14 @@ extern "C" {
&& _PyUnicode_UTF8(op) \ && _PyUnicode_UTF8(op) \
&& _PyUnicode_UTF8(op) != PyUnicode_DATA(op))) && _PyUnicode_UTF8(op) != PyUnicode_DATA(op)))
/* true if the Unicode object has an allocated wstr memory block
(not shared with other data) */
#define _PyUnicode_HAS_WSTR_MEMORY(op) \
(assert(_PyUnicode_CHECK(op)), \
(_PyUnicode_WSTR(op) && \
(!PyUnicode_IS_READY(op) || \
_PyUnicode_WSTR(op) != PyUnicode_DATA(op))))
/* Generic helper macro to convert characters of different types. /* Generic helper macro to convert characters of different types.
from_type and to_type have to be valid type names, begin and end from_type and to_type have to be valid type names, begin and end
are pointers to the source characters which should be of type are pointers to the source characters which should be of type
@ -1238,9 +1246,7 @@ unicode_dealloc(register PyUnicodeObject *unicode)
Py_FatalError("Inconsistent interned string state."); Py_FatalError("Inconsistent interned string state.");
} }
if (_PyUnicode_WSTR(unicode) && if (_PyUnicode_HAS_WSTR_MEMORY(unicode))
(!PyUnicode_IS_READY(unicode) ||
_PyUnicode_WSTR(unicode) != PyUnicode_DATA(unicode)))
PyObject_DEL(_PyUnicode_WSTR(unicode)); PyObject_DEL(_PyUnicode_WSTR(unicode));
if (_PyUnicode_HAS_UTF8_MEMORY(unicode)) if (_PyUnicode_HAS_UTF8_MEMORY(unicode))
PyObject_DEL(_PyUnicode_UTF8(unicode)); PyObject_DEL(_PyUnicode_UTF8(unicode));
@ -12061,8 +12067,7 @@ unicode__sizeof__(PyUnicodeObject *v)
} }
/* If the wstr pointer is present, account for it unless it is shared /* If the wstr pointer is present, account for it unless it is shared
with the data pointer. Check if the data is not shared. */ with the data pointer. Check if the data is not shared. */
if (_PyUnicode_WSTR(v) && if (_PyUnicode_HAS_WSTR_MEMORY(v))
(PyUnicode_DATA(v) != _PyUnicode_WSTR(v)))
size += (PyUnicode_WSTR_LENGTH(v) + 1) * sizeof(wchar_t); size += (PyUnicode_WSTR_LENGTH(v) + 1) * sizeof(wchar_t);
if (_PyUnicode_HAS_UTF8_MEMORY(v)) if (_PyUnicode_HAS_UTF8_MEMORY(v))
size += PyUnicode_UTF8_LENGTH(v) + 1; size += PyUnicode_UTF8_LENGTH(v) + 1;