mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Check size of wchar_t using the preprocessor

Browse source
This commit is contained in:
Victor Stinner 2011-09-28 22:34:18 +02:00
parent 73f01c65c8
commit 506f592769
1 changed files with 27 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

56
Objects/unicodeobject.c
View file

@ -830,36 +830,34 @@ _PyUnicode_Ready(PyUnicodeObject *unicode)
assert(num_surrogates == 0 &&
"FindMaxCharAndNumSurrogatePairs() messed up");
if (sizeof(wchar_t) == 2) {
/* We can share representations and are done. */
unicode->data.any = _PyUnicode_WSTR(unicode);
PyUnicode_2BYTE_DATA(unicode)[_PyUnicode_WSTR_LENGTH(unicode)] = '\0';
_PyUnicode_LENGTH(unicode) = _PyUnicode_WSTR_LENGTH(unicode);
_PyUnicode_STATE(unicode).kind = PyUnicode_2BYTE_KIND;
unicode->_base.utf8 = NULL;
unicode->_base.utf8_length = 0;
}
else {
assert(sizeof(wchar_t) == 4);
unicode->data.any = PyObject_MALLOC(
2 * (_PyUnicode_WSTR_LENGTH(unicode) + 1));
if (!unicode->data.any) {
PyErr_NoMemory();
return -1;
}
_PyUnicode_CONVERT_BYTES(wchar_t, Py_UCS2,
_PyUnicode_WSTR(unicode), end,
PyUnicode_2BYTE_DATA(unicode));
PyUnicode_2BYTE_DATA(unicode)[_PyUnicode_WSTR_LENGTH(unicode)] = '\0';
_PyUnicode_LENGTH(unicode) = _PyUnicode_WSTR_LENGTH(unicode);
_PyUnicode_STATE(unicode).kind = PyUnicode_2BYTE_KIND;
unicode->_base.utf8 = NULL;
unicode->_base.utf8_length = 0;
PyObject_FREE(_PyUnicode_WSTR(unicode));
_PyUnicode_WSTR(unicode) = NULL;
_PyUnicode_WSTR_LENGTH(unicode) = 0;
#if SIZEOF_WCHAR_T == 2
/* We can share representations and are done. */
unicode->data.any = _PyUnicode_WSTR(unicode);
PyUnicode_2BYTE_DATA(unicode)[_PyUnicode_WSTR_LENGTH(unicode)] = '\0';
_PyUnicode_LENGTH(unicode) = _PyUnicode_WSTR_LENGTH(unicode);
_PyUnicode_STATE(unicode).kind = PyUnicode_2BYTE_KIND;
unicode->_base.utf8 = NULL;
unicode->_base.utf8_length = 0;
#else
/* sizeof(wchar_t) == 4 */
unicode->data.any = PyObject_MALLOC(
2 * (_PyUnicode_WSTR_LENGTH(unicode) + 1));
if (!unicode->data.any) {
PyErr_NoMemory();
return -1;
}
_PyUnicode_CONVERT_BYTES(wchar_t, Py_UCS2,
_PyUnicode_WSTR(unicode), end,
PyUnicode_2BYTE_DATA(unicode));
PyUnicode_2BYTE_DATA(unicode)[_PyUnicode_WSTR_LENGTH(unicode)] = '\0';
_PyUnicode_LENGTH(unicode) = _PyUnicode_WSTR_LENGTH(unicode);
_PyUnicode_STATE(unicode).kind = PyUnicode_2BYTE_KIND;
unicode->_base.utf8 = NULL;
unicode->_base.utf8_length = 0;
PyObject_FREE(_PyUnicode_WSTR(unicode));
_PyUnicode_WSTR(unicode) = NULL;
_PyUnicode_WSTR_LENGTH(unicode) = 0;
#endif
}
/* maxchar exeeds 16 bit, wee need 4 bytes for unicode characters */
else {