diff options
| author | Fredrik Lundh <fredrik@pythonware.com> | 2001-06-27 18:59:43 (GMT) |
|---|---|---|
| committer | Fredrik Lundh <fredrik@pythonware.com> | 2001-06-27 18:59:43 (GMT) |
| commit | 8f4558583f3b7e2d98e13baec06c2f43c9e6a723 (patch) | |
| tree | e0fbd260591171ba41e443fd38b90b61210be03a /Objects | |
| parent | 3f8c2e1616f1d67730ffef40f3077247dfe46e26 (diff) | |
| download | cpython-8f4558583f3b7e2d98e13baec06c2f43c9e6a723.zip cpython-8f4558583f3b7e2d98e13baec06c2f43c9e6a723.tar.gz cpython-8f4558583f3b7e2d98e13baec06c2f43c9e6a723.tar.bz2 | |
use Py_UNICODE_WIDE instead of USE_UCS4_STORAGE and Py_UNICODE_SIZE
tests.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/unicodectype.c | 6 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Objects/unicodectype.c b/Objects/unicodectype.c index 13fc612..c1b5a0d 100644 --- a/Objects/unicodectype.c +++ b/Objects/unicodectype.c @@ -68,7 +68,7 @@ Py_UNICODE _PyUnicode_ToTitlecase(register Py_UNICODE ch) else ch += ctype->upper; -#ifdef USE_UCS4_STORAGE +#ifdef Py_UNICODE_WIDE /* The database assumes that the values wrap around at 0x10000. */ if (ch > 0x10000) ch -= 0x10000; @@ -360,7 +360,7 @@ Py_UNICODE _PyUnicode_ToUppercase(register Py_UNICODE ch) const _PyUnicode_TypeRecord *ctype = gettyperecord(ch); ch += ctype->upper; -#ifdef USE_UCS4_STORAGE +#ifdef Py_UNICODE_WIDE /* The database assumes that the values wrap around at 0x10000. */ if (ch > 0x10000) ch -= 0x10000; @@ -376,7 +376,7 @@ Py_UNICODE _PyUnicode_ToLowercase(register Py_UNICODE ch) const _PyUnicode_TypeRecord *ctype = gettyperecord(ch); ch += ctype->lower; -#ifdef USE_UCS4_STORAGE +#ifdef Py_UNICODE_WIDE /* The database assumes that the values wrap around at 0x10000. */ if (ch > 0x10000) ch -= 0x10000; diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 2f66c3c..08e8089 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -106,7 +106,7 @@ static char unicode_default_encoding[100]; Py_UNICODE PyUnicode_GetMax() { -#ifdef USE_UCS4_STORAGE +#ifdef Py_UNICODE_WIDE return 0x10FFFF; #else /* This is actually an illegal character, so it should @@ -791,7 +791,7 @@ PyObject *PyUnicode_DecodeUTF8(const char *s, errmsg = "illegal encoding"; goto utf8Error; } -#if Py_UNICODE_SIZE == 4 +#ifdef Py_UNICODE_WIDE *p++ = (Py_UNICODE)ch; #else /* compute and append the two surrogates: */ @@ -1080,7 +1080,7 @@ PyObject *PyUnicode_DecodeUTF16(const char *s, ch2 = (ch2 >> 8) | (ch2 << 8); #endif if (0xDC00 <= ch2 && ch2 <= 0xDFFF) { -#if Py_UNICODE_SIZE == 2 +#ifndef Py_UNICODE_WIDE /* This is valid data (a UTF-16 surrogate pair), but we are not able to store this information since our Py_UNICODE type only has 16 bits... this might @@ -1326,7 +1326,7 @@ PyObject *PyUnicode_DecodeUnicodeEscape(const char *s, *p++ = (Py_UNICODE) chr; else if (chr <= 0x10ffff) { /* UCS-4 character. Either store directly, or as surrogate pair. */ -#if Py_UNICODE_SIZE == 4 +#ifdef Py_UNICODE_WIDE *p++ = chr; #else chr -= 0x10000L; |