cpython-lru_cache-weakref: Objects/unicodeobject.c annotate

annotate Objects/unicodeobject.c @ 32260:cdad005bc030 legacy-trunk

[Bug #936837] Add missing word

author	Andrew M. Kuchling <amk@amk.ca>
date	Sat, 05 Jun 2004 19:00:55 +0000
parents	3a84e23b042f
children	b8fce2258c20

rev	line source
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	1 /*
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3 Unicode implementation based on original code by Fredrik Lundh,
12646 17d1a3f1f085 Minimal change so I can add the rest of MAL's checkin message: Fred Drake <fdrake@acm.org> parents: 12645 diff changeset	4 modified by Marc-Andre Lemburg <mal@lemburg.com> according to the
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5 Unicode Integration Proposal (see file Misc/unicode.txt).
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6
13828 254f8b7c4a83 Changing the CNRI copyright notice according to CNRI's instructions. Guido van Rossum <guido@python.org> parents: 13761 diff changeset	7 Copyright (c) Corporation for National Research Initiatives.
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	8
16029 55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	9 --------------------------------------------------------------------
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	10 The original string type implementation is:
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	11
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	12 Copyright (c) 1999 by Secret Labs AB
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	13 Copyright (c) 1999 by Fredrik Lundh
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	14
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	15 By obtaining, using, and/or copying this software and/or its
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	16 associated documentation, you agree that you have read, understood,
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	17 and will comply with the following terms and conditions:
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	18
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	19 Permission to use, copy, modify, and distribute this software and its
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	20 associated documentation for any purpose and without fee is hereby
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	21 granted, provided that the above copyright notice appears in all
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	22 copies, and that both that copyright notice and this permission notice
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	23 appear in supporting documentation, and that the name of Secret Labs
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	24 AB or the author not be used in advertising or publicity pertaining to
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	25 distribution of the software without specific, written prior
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	26 permission.
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	27
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	28 SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	29 THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	30 FITNESS. IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	31 ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	32 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	33 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	34 OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	35 --------------------------------------------------------------------
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	36
55d89a8fe963 refactored the unicodeobject/ucnhash interface, to hide the Fredrik Lundh <fredrik@pythonware.com> parents: 15952 diff changeset	37 */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	38
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	39 #include "Python.h"
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	40
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	41 #include "unicodeobject.h"
13209 b11e0a898de0 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13196 diff changeset	42 #include "ucnhash.h"
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	43
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 23837 diff changeset	44 #ifdef MS_WINDOWS
12067 bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	45 #include <windows.h>
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	46 #endif
12329 3cc77848a62a Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	47
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	48 /* Limit for the Unicode object free list */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	49
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	50 #define MAX_UNICODE_FREELIST_SIZE 1024
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	51
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	52 /* Limit for the Unicode object free list stay alive optimization.
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	53
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	54 The implementation will keep allocated Unicode memory intact for
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	55 all objects on the free list having a size less than this
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	56 limit. This reduces malloc() overhead for small Unicode objects.
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	57
12025 7994d9db7f4d On 17-Mar-2000, Marc-Andre Lemburg said: Barry Warsaw <barry@python.org> parents: 11997 diff changeset	58 At worst this will result in MAX_UNICODE_FREELIST_SIZE *
12329 3cc77848a62a Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	59 (sizeof(PyUnicodeObject) + KEEPALIVE_SIZE_LIMIT +
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	60 malloc()-overhead) bytes of unused garbage.
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	61
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	62 Setting the limit to 0 effectively turns the feature off.
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	63
12329 3cc77848a62a Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	64 Note: This is an experimental feature ! If you get core dumps when
3cc77848a62a Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	65 using Unicode objects, turn this feature off.
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	66
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	67 */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	68
12329 3cc77848a62a Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	69 #define KEEPALIVE_SIZE_LIMIT 9
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	70
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	71 /* Endianness switches; defaults to little endian */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	72
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	73 #ifdef WORDS_BIGENDIAN
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	74 # define BYTEORDER_IS_BIG_ENDIAN
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	75 #else
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	76 # define BYTEORDER_IS_LITTLE_ENDIAN
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	77 #endif
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	78
12899 9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	79 /* --- Globals ------------------------------------------------------------
9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	80
9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	81 The globals are initialized by the _PyUnicode_Init() API and should
9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	82 not be used before calling that API.
9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	83
9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	84 */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	85
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	86 /* Free list for Unicode objects */
12899 9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	87 static PyUnicodeObject *unicode_freelist;
9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	88 static int unicode_freelist_size;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	89
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	90 /* The empty Unicode object is shared to improve performance. */
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	91 static PyUnicodeObject *unicode_empty;
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	92
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	93 /* Single character Unicode strings in the Latin-1 range are being
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	94 shared as well. */
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	95 static PyUnicodeObject *unicode_latin1[256];
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	96
12645 c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	97 /* Default encoding to use and assume when NULL is passed as encoding
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	98 parameter; it is initialized by _PyUnicode_Init().
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	99
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	100 Always use the PyUnicode_SetDefaultEncoding() and
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	101 PyUnicode_GetDefaultEncoding() APIs to access this global.
12645 c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	102
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	103 */
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	104 static char unicode_default_encoding[100];
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	105
18298 982163c4e9d2 Encode surrogates in UTF-8 even for a wide Py_UNICODE. Martin v. Löwis <martin@v.loewis.de> parents: 18295 diff changeset	106 Py_UNICODE
18774 57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	107 PyUnicode_GetMax(void)
18298 982163c4e9d2 Encode surrogates in UTF-8 even for a wide Py_UNICODE. Martin v. Löwis <martin@v.loewis.de> parents: 18295 diff changeset	108 {
18324 3ba7a358ce02 use Py_UNICODE_WIDE instead of USE_UCS4_STORAGE and Py_UNICODE_SIZE Fredrik Lundh <fredrik@pythonware.com> parents: 18298 diff changeset	109 #ifdef Py_UNICODE_WIDE
18298 982163c4e9d2 Encode surrogates in UTF-8 even for a wide Py_UNICODE. Martin v. Löwis <martin@v.loewis.de> parents: 18295 diff changeset	110 return 0x10FFFF;
982163c4e9d2 Encode surrogates in UTF-8 even for a wide Py_UNICODE. Martin v. Löwis <martin@v.loewis.de> parents: 18295 diff changeset	111 #else
982163c4e9d2 Encode surrogates in UTF-8 even for a wide Py_UNICODE. Martin v. Löwis <martin@v.loewis.de> parents: 18295 diff changeset	112 /* This is actually an illegal character, so it should
982163c4e9d2 Encode surrogates in UTF-8 even for a wide Py_UNICODE. Martin v. Löwis <martin@v.loewis.de> parents: 18295 diff changeset	113 not be passed to unichr. */
982163c4e9d2 Encode surrogates in UTF-8 even for a wide Py_UNICODE. Martin v. Löwis <martin@v.loewis.de> parents: 18295 diff changeset	114 return 0xFFFF;
982163c4e9d2 Encode surrogates in UTF-8 even for a wide Py_UNICODE. Martin v. Löwis <martin@v.loewis.de> parents: 18295 diff changeset	115 #endif
982163c4e9d2 Encode surrogates in UTF-8 even for a wide Py_UNICODE. Martin v. Löwis <martin@v.loewis.de> parents: 18295 diff changeset	116 }
982163c4e9d2 Encode surrogates in UTF-8 even for a wide Py_UNICODE. Martin v. Löwis <martin@v.loewis.de> parents: 18295 diff changeset	117
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	118 /* --- Unicode Object ----------------------------------------------------- */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	119
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	120 static
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	121 int unicode_resize(register PyUnicodeObject *unicode,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	122 int length)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	123 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	124 void *oldstr;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	125
12329 3cc77848a62a Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	126 /* Shortcut if there's nothing much to do. */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	127 if (unicode->length == length)
12329 3cc77848a62a Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	128 goto reset;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	129
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	130 /* Resizing shared object (unicode_empty or single character
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	131 objects) in-place is not allowed. Use PyUnicode_Resize()
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	132 instead ! */
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	133 if (unicode == unicode_empty \|\|
76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	134 (unicode->length == 1 &&
76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	135 /* MvL said unicode->str[] may be signed. Python generally assumes
76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	136 * an int contains at least 32 bits, and we don't use more than
76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	137 * 32 bits even in a UCS4 build, so casting to unsigned int should
76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	138 * be correct.
76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	139 */
76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	140 (unsigned int)unicode->str[0] < 256U &&
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	141 unicode_latin1[unicode->str[0]] == unicode)) {
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	142 PyErr_SetString(PyExc_SystemError,
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	143 "can't resize shared unicode objects");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	144 return -1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	145 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	146
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	147 /* We allocate one more byte to make sure the string is
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	148 Ux0000 terminated -- XXX is this needed ? */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	149 oldstr = unicode->str;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	150 PyMem_RESIZE(unicode->str, Py_UNICODE, length + 1);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	151 if (!unicode->str) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	152 unicode->str = oldstr;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	153 PyErr_NoMemory();
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	154 return -1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	155 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	156 unicode->str[length] = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	157 unicode->length = length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	158
12329 3cc77848a62a Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	159 reset:
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	160 /* Reset the object caches */
13837 2badb322355f This patch finalizes the move from UTF-8 to a default encoding in Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	161 if (unicode->defenc) {
2badb322355f This patch finalizes the move from UTF-8 to a default encoding in Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	162 Py_DECREF(unicode->defenc);
2badb322355f This patch finalizes the move from UTF-8 to a default encoding in Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	163 unicode->defenc = NULL;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	164 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	165 unicode->hash = -1;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	166
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	167 return 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	168 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	169
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	170 /* We allocate one more byte to make sure the string is
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	171 Ux0000 terminated -- XXX is this needed ?
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	172
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	173 XXX This allocator could further be enhanced by assuring that the
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	174 free list never reduces its size below 1.
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	175
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	176 */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	177
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	178 static
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	179 PyUnicodeObject *_PyUnicode_New(int length)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	180 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	181 register PyUnicodeObject *unicode;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	182
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	183 /* Optimization fo empty strings */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	184 if (length == 0 && unicode_empty != NULL) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	185 Py_INCREF(unicode_empty);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	186 return unicode_empty;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	187 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	188
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	189 /* Unicode freelist & memory allocation */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	190 if (unicode_freelist) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	191 unicode = unicode_freelist;
12939 88004f25dc25 Vladimir MARANGOZOV <Vladimir.Marangozov@inrialpes.fr>: Marc-André Lemburg <mal@egenix.com> parents: 12924 diff changeset	192 unicode_freelist = (PyUnicodeObject *)unicode;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	193 unicode_freelist_size--;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	194 if (unicode->str) {
12329 3cc77848a62a Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	195 /* Keep-Alive optimization: we only upsize the buffer,
3cc77848a62a Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	196 never downsize it. */
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	197 if ((unicode->length < length) &&
30431 cd0c3f916b34 Change checks of PyUnicode_Resize() return value for clarity. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30216 diff changeset	198 unicode_resize(unicode, length) < 0) {
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12568 diff changeset	199 PyMem_DEL(unicode->str);
12511 8747f1c8b5fb Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12369 diff changeset	200 goto onError;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	201 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	202 }
18120 c29f3135a20c Fix a mis-indentation in _PyUnicode_New() that caused me to stare at Guido van Rossum <guido@python.org> parents: 18051 diff changeset	203 else {
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	204 unicode->str = PyMem_NEW(Py_UNICODE, length + 1);
18120 c29f3135a20c Fix a mis-indentation in _PyUnicode_New() that caused me to stare at Guido van Rossum <guido@python.org> parents: 18051 diff changeset	205 }
c29f3135a20c Fix a mis-indentation in _PyUnicode_New() that caused me to stare at Guido van Rossum <guido@python.org> parents: 18051 diff changeset	206 PyObject_INIT(unicode, &PyUnicode_Type);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	207 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	208 else {
22981 dc1fb19d990d Remove PyMalloc_. Neil Schemenauer <nascheme@enme.ucalgary.ca>* parents: 22938 diff changeset	209 unicode = PyObject_New(PyUnicodeObject, &PyUnicode_Type);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	210 if (unicode == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	211 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	212 unicode->str = PyMem_NEW(Py_UNICODE, length + 1);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	213 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	214
12511 8747f1c8b5fb Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12369 diff changeset	215 if (!unicode->str) {
8747f1c8b5fb Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12369 diff changeset	216 PyErr_NoMemory();
12025 7994d9db7f4d On 17-Mar-2000, Marc-Andre Lemburg said: Barry Warsaw <barry@python.org> parents: 11997 diff changeset	217 goto onError;
12511 8747f1c8b5fb Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12369 diff changeset	218 }
30439 30e495efe90a Double-fix of crash in Unicode freelist handling. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30431 diff changeset	219 /* Initialize the first element to guard against cases where
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	220 * the caller fails before initializing str -- unicode_resize()
76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	221 * reads str[0], and the Keep-Alive optimization can keep memory
76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	222 * allocated for str alive across a call to unicode_dealloc(unicode).
76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	223 * We don't want unicode_resize to read uninitialized memory in
76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	224 * that case.
76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	225 */
30439 30e495efe90a Double-fix of crash in Unicode freelist handling. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30431 diff changeset	226 unicode->str[0] = 0;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	227 unicode->str[length] = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	228 unicode->length = length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	229 unicode->hash = -1;
13837 2badb322355f This patch finalizes the move from UTF-8 to a default encoding in Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	230 unicode->defenc = NULL;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	231 return unicode;
12025 7994d9db7f4d On 17-Mar-2000, Marc-Andre Lemburg said: Barry Warsaw <barry@python.org> parents: 11997 diff changeset	232
7994d9db7f4d On 17-Mar-2000, Marc-Andre Lemburg said: Barry Warsaw <barry@python.org> parents: 11997 diff changeset	233 onError:
7994d9db7f4d On 17-Mar-2000, Marc-Andre Lemburg said: Barry Warsaw <barry@python.org> parents: 11997 diff changeset	234 _Py_ForgetReference((PyObject *)unicode);
22981 dc1fb19d990d Remove PyMalloc_. Neil Schemenauer <nascheme@enme.ucalgary.ca>* parents: 22938 diff changeset	235 PyObject_Del(unicode);
12025 7994d9db7f4d On 17-Mar-2000, Marc-Andre Lemburg said: Barry Warsaw <barry@python.org> parents: 11997 diff changeset	236 return NULL;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	237 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	238
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	239 static
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20018 diff changeset	240 void unicode_dealloc(register PyUnicodeObject *unicode)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	241 {
21262 e8fea95a82a4 Fix for #489669 (Neil Norwitz): memory leak in test_descr (unicode). Guido van Rossum <guido@python.org> parents: 21082 diff changeset	242 if (PyUnicode_CheckExact(unicode) &&
e8fea95a82a4 Fix for #489669 (Neil Norwitz): memory leak in test_descr (unicode). Guido van Rossum <guido@python.org> parents: 21082 diff changeset	243 unicode_freelist_size < MAX_UNICODE_FREELIST_SIZE) {
12329 3cc77848a62a Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	244 /* Keep-Alive optimization */
3cc77848a62a Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	245 if (unicode->length >= KEEPALIVE_SIZE_LIMIT) {
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12568 diff changeset	246 PyMem_DEL(unicode->str);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	247 unicode->str = NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	248 unicode->length = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	249 }
13837 2badb322355f This patch finalizes the move from UTF-8 to a default encoding in Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	250 if (unicode->defenc) {
2badb322355f This patch finalizes the move from UTF-8 to a default encoding in Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	251 Py_DECREF(unicode->defenc);
2badb322355f This patch finalizes the move from UTF-8 to a default encoding in Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	252 unicode->defenc = NULL;
12329 3cc77848a62a Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	253 }
3cc77848a62a Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	254 /* Add to free list */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	255 (PyUnicodeObject *)unicode = unicode_freelist;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	256 unicode_freelist = unicode;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	257 unicode_freelist_size++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	258 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	259 else {
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12568 diff changeset	260 PyMem_DEL(unicode->str);
13837 2badb322355f This patch finalizes the move from UTF-8 to a default encoding in Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	261 Py_XDECREF(unicode->defenc);
21262 e8fea95a82a4 Fix for #489669 (Neil Norwitz): memory leak in test_descr (unicode). Guido van Rossum <guido@python.org> parents: 21082 diff changeset	262 unicode->ob_type->tp_free((PyObject *)unicode);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	263 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	264 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	265
30431 cd0c3f916b34 Change checks of PyUnicode_Resize() return value for clarity. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30216 diff changeset	266 int PyUnicode_Resize(PyObject **unicode, int length)
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	267 {
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	268 register PyUnicodeObject *v;
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	269
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	270 /* Argument checks */
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	271 if (unicode == NULL) {
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	272 PyErr_BadInternalCall();
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	273 return -1;
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	274 }
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	275 v = (PyUnicodeObject )unicode;
25719 f532e9b69551 Fix a nasty endcase reported by Armin Rigo in SF bug 618623: Guido van Rossum <guido@python.org> parents: 25375 diff changeset	276 if (v == NULL \|\| !PyUnicode_Check(v) \|\| v->ob_refcnt != 1 \|\| length < 0) {
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	277 PyErr_BadInternalCall();
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	278 return -1;
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	279 }
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	280
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	281 /* Resizing unicode_empty and single character objects is not
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	282 possible since these are being shared. We simply return a fresh
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	283 copy with the same Unicode content. */
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	284 if (v->length != length &&
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	285 (v == unicode_empty \|\| v->length == 1)) {
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	286 PyUnicodeObject *w = _PyUnicode_New(length);
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	287 if (w == NULL)
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	288 return -1;
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	289 Py_UNICODE_COPY(w->str, v->str,
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	290 length < v->length ? length : v->length);
28242 fe1d571c3f80 Sf patch #700047: unicode object leaks refcount on resizing Raymond Hettinger <python@rcn.com> parents: 27826 diff changeset	291 Py_DECREF(*unicode);
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	292 unicode = (PyObject )w;
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	293 return 0;
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	294 }
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	295
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	296 /* Note that we don't have to modify *unicode for unshared Unicode
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	297 objects, since we can modify them in-place. */
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	298 return unicode_resize(v, length);
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	299 }
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	300
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	301 /* Internal API for use in unicodeobject.c only ! */
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	302 #define _PyUnicode_Resize(unicodevar, length) \
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	303 PyUnicode_Resize(((PyObject **)(unicodevar)), length)
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	304
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	305 PyObject PyUnicode_FromUnicode(const Py_UNICODE u,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	306 int size)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	307 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	308 PyUnicodeObject *unicode;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	309
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	310 /* If the Unicode data is known at construction time, we can apply
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	311 some optimizations which share commonly used objects. */
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	312 if (u != NULL) {
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	313
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	314 /* Optimization for empty strings */
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	315 if (size == 0 && unicode_empty != NULL) {
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	316 Py_INCREF(unicode_empty);
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	317 return (PyObject *)unicode_empty;
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	318 }
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	319
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	320 /* Single character Unicode objects in the Latin-1 range are
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	321 shared when using this constructor */
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	322 if (size == 1 && *u < 256) {
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	323 unicode = unicode_latin1[*u];
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	324 if (!unicode) {
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	325 unicode = _PyUnicode_New(1);
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	326 if (!unicode)
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	327 return NULL;
18051 e897550b4748 Fixes [ #430986 ] Buglet in PyUnicode_FromUnicode. Marc-André Lemburg <mal@egenix.com> parents: 17995 diff changeset	328 unicode->str[0] = *u;
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	329 unicode_latin1[*u] = unicode;
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	330 }
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	331 Py_INCREF(unicode);
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	332 return (PyObject *)unicode;
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	333 }
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	334 }
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	335
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	336 unicode = _PyUnicode_New(size);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	337 if (!unicode)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	338 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	339
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	340 /* Copy the Unicode data into the new object */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	341 if (u != NULL)
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	342 Py_UNICODE_COPY(unicode->str, u, size);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	343
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	344 return (PyObject *)unicode;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	345 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	346
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	347 #ifdef HAVE_WCHAR_H
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	348
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	349 PyObject PyUnicode_FromWideChar(register const wchar_t w,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	350 int size)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	351 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	352 PyUnicodeObject *unicode;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	353
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	354 if (w == NULL) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	355 PyErr_BadInternalCall();
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	356 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	357 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	358
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	359 unicode = _PyUnicode_New(size);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	360 if (!unicode)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	361 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	362
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	363 /* Copy the wchar_t data into the new object */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	364 #ifdef HAVE_USABLE_WCHAR_T
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	365 memcpy(unicode->str, w, size * sizeof(wchar_t));
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	366 #else
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	367 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	368 register Py_UNICODE *u;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	369 register int i;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	370 u = PyUnicode_AS_UNICODE(unicode);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	371 for (i = size; i >= 0; i--)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	372 u++ = w++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	373 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	374 #endif
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	375
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	376 return (PyObject *)unicode;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	377 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	378
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	379 int PyUnicode_AsWideChar(PyUnicodeObject *unicode,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	380 register wchar_t *w,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	381 int size)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	382 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	383 if (unicode == NULL) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	384 PyErr_BadInternalCall();
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	385 return -1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	386 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	387 if (size > PyUnicode_GET_SIZE(unicode))
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	388 size = PyUnicode_GET_SIZE(unicode);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	389 #ifdef HAVE_USABLE_WCHAR_T
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	390 memcpy(w, unicode->str, size * sizeof(wchar_t));
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	391 #else
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	392 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	393 register Py_UNICODE *u;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	394 register int i;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	395 u = PyUnicode_AS_UNICODE(unicode);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	396 for (i = size; i >= 0; i--)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	397 w++ = u++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	398 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	399 #endif
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	400
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	401 return size;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	402 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	403
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	404 #endif
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	405
24737 eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	406 PyObject *PyUnicode_FromOrdinal(int ordinal)
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	407 {
31873 227cb7402c6e SF Patch #926375: Remove a useless UTF-16 support code that is never Hye-Shik Chang <hyeshik@gmail.com> parents: 31455 diff changeset	408 Py_UNICODE s[1];
24737 eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	409
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	410 #ifdef Py_UNICODE_WIDE
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	411 if (ordinal < 0 \|\| ordinal > 0x10ffff) {
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	412 PyErr_SetString(PyExc_ValueError,
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	413 "unichr() arg not in range(0x110000) "
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	414 "(wide Python build)");
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	415 return NULL;
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	416 }
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	417 #else
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	418 if (ordinal < 0 \|\| ordinal > 0xffff) {
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	419 PyErr_SetString(PyExc_ValueError,
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	420 "unichr() arg not in range(0x10000) "
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	421 "(narrow Python build)");
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	422 return NULL;
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	423 }
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	424 #endif
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	425
31873 227cb7402c6e SF Patch #926375: Remove a useless UTF-16 support code that is never Hye-Shik Chang <hyeshik@gmail.com> parents: 31455 diff changeset	426 s[0] = (Py_UNICODE)ordinal;
227cb7402c6e SF Patch #926375: Remove a useless UTF-16 support code that is never Hye-Shik Chang <hyeshik@gmail.com> parents: 31455 diff changeset	427 return PyUnicode_FromUnicode(s, 1);
24737 eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	428 }
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	429
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	430 PyObject PyUnicode_FromObject(register PyObject obj)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	431 {
20554 0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	432 /* XXX Perhaps we should make this API an alias of
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	433 PyObject_Unicode() instead ?! */
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	434 if (PyUnicode_CheckExact(obj)) {
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	435 Py_INCREF(obj);
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	436 return obj;
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	437 }
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	438 if (PyUnicode_Check(obj)) {
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	439 /* For a Unicode subtype that's not a Unicode object,
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	440 return a true Unicode object with the same data. */
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	441 return PyUnicode_FromUnicode(PyUnicode_AS_UNICODE(obj),
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	442 PyUnicode_GET_SIZE(obj));
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	443 }
13401 8f1a2deeb9b0 Added new API PyUnicode_FromEncodedObject() which supports decoding Marc-André Lemburg <mal@egenix.com> parents: 13396 diff changeset	444 return PyUnicode_FromEncodedObject(obj, NULL, "strict");
8f1a2deeb9b0 Added new API PyUnicode_FromEncodedObject() which supports decoding Marc-André Lemburg <mal@egenix.com> parents: 13396 diff changeset	445 }
8f1a2deeb9b0 Added new API PyUnicode_FromEncodedObject() which supports decoding Marc-André Lemburg <mal@egenix.com> parents: 13396 diff changeset	446
8f1a2deeb9b0 Added new API PyUnicode_FromEncodedObject() which supports decoding Marc-André Lemburg <mal@egenix.com> parents: 13396 diff changeset	447 PyObject PyUnicode_FromEncodedObject(register PyObject obj,
8f1a2deeb9b0 Added new API PyUnicode_FromEncodedObject() which supports decoding Marc-André Lemburg <mal@egenix.com> parents: 13396 diff changeset	448 const char *encoding,
8f1a2deeb9b0 Added new API PyUnicode_FromEncodedObject() which supports decoding Marc-André Lemburg <mal@egenix.com> parents: 13396 diff changeset	449 const char *errors)
8f1a2deeb9b0 Added new API PyUnicode_FromEncodedObject() which supports decoding Marc-André Lemburg <mal@egenix.com> parents: 13396 diff changeset	450 {
19999 1f4e2627b627 Implement the changes proposed in patch #413333. unicode(obj) now Marc-André Lemburg <mal@egenix.com> parents: 19998 diff changeset	451 const char *s = NULL;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	452 int len;
13401 8f1a2deeb9b0 Added new API PyUnicode_FromEncodedObject() which supports decoding Marc-André Lemburg <mal@egenix.com> parents: 13396 diff changeset	453 PyObject *v;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	454
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	455 if (obj == NULL) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	456 PyErr_BadInternalCall();
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	457 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	458 }
13401 8f1a2deeb9b0 Added new API PyUnicode_FromEncodedObject() which supports decoding Marc-André Lemburg <mal@egenix.com> parents: 13396 diff changeset	459
20554 0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	460 #if 0
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	461 /* For b/w compatibility we also accept Unicode objects provided
20563 9058e49c6c57 Additional test and documentation for the unicode() changes. Marc-André Lemburg <mal@egenix.com> parents: 20554 diff changeset	462 that no encodings is given and then redirect to
9058e49c6c57 Additional test and documentation for the unicode() changes. Marc-André Lemburg <mal@egenix.com> parents: 20554 diff changeset	463 PyObject_Unicode() which then applies the additional logic for
9058e49c6c57 Additional test and documentation for the unicode() changes. Marc-André Lemburg <mal@egenix.com> parents: 20554 diff changeset	464 Unicode subclasses.
20554 0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	465
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	466 NOTE: This API should really only be used for object which
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	467 represent encoded Unicode !
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	468
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	469 */
19999 1f4e2627b627 Implement the changes proposed in patch #413333. unicode(obj) now Marc-André Lemburg <mal@egenix.com> parents: 19998 diff changeset	470 if (PyUnicode_Check(obj)) {
1f4e2627b627 Implement the changes proposed in patch #413333. unicode(obj) now Marc-André Lemburg <mal@egenix.com> parents: 19998 diff changeset	471 if (encoding) {
1f4e2627b627 Implement the changes proposed in patch #413333. unicode(obj) now Marc-André Lemburg <mal@egenix.com> parents: 19998 diff changeset	472 PyErr_SetString(PyExc_TypeError,
1f4e2627b627 Implement the changes proposed in patch #413333. unicode(obj) now Marc-André Lemburg <mal@egenix.com> parents: 19998 diff changeset	473 "decoding Unicode is not supported");
20554 0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	474 return NULL;
19999 1f4e2627b627 Implement the changes proposed in patch #413333. unicode(obj) now Marc-André Lemburg <mal@egenix.com> parents: 19998 diff changeset	475 }
20554 0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	476 return PyObject_Unicode(obj);
19999 1f4e2627b627 Implement the changes proposed in patch #413333. unicode(obj) now Marc-André Lemburg <mal@egenix.com> parents: 19998 diff changeset	477 }
20554 0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	478 #else
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	479 if (PyUnicode_Check(obj)) {
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	480 PyErr_SetString(PyExc_TypeError,
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	481 "decoding Unicode is not supported");
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	482 return NULL;
13401 8f1a2deeb9b0 Added new API PyUnicode_FromEncodedObject() which supports decoding Marc-André Lemburg <mal@egenix.com> parents: 13396 diff changeset	483 }
20554 0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	484 #endif
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	485
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	486 /* Coerce object */
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	487 if (PyString_Check(obj)) {
19999 1f4e2627b627 Implement the changes proposed in patch #413333. unicode(obj) now Marc-André Lemburg <mal@egenix.com> parents: 19998 diff changeset	488 s = PyString_AS_STRING(obj);
1f4e2627b627 Implement the changes proposed in patch #413333. unicode(obj) now Marc-André Lemburg <mal@egenix.com> parents: 19998 diff changeset	489 len = PyString_GET_SIZE(obj);
1f4e2627b627 Implement the changes proposed in patch #413333. unicode(obj) now Marc-André Lemburg <mal@egenix.com> parents: 19998 diff changeset	490 }
20554 0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	491 else if (PyObject_AsCharBuffer(obj, &s, &len)) {
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	492 /* Overwrite the error message with something more useful in
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	493 case of a TypeError. */
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	494 if (PyErr_ExceptionMatches(PyExc_TypeError))
19999 1f4e2627b627 Implement the changes proposed in patch #413333. unicode(obj) now Marc-André Lemburg <mal@egenix.com> parents: 19998 diff changeset	495 PyErr_Format(PyExc_TypeError,
20554 0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	496 "coercing to Unicode: need string or buffer, "
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	497 "%.80s found",
19999 1f4e2627b627 Implement the changes proposed in patch #413333. unicode(obj) now Marc-André Lemburg <mal@egenix.com> parents: 19998 diff changeset	498 obj->ob_type->tp_name);
13401 8f1a2deeb9b0 Added new API PyUnicode_FromEncodedObject() which supports decoding Marc-André Lemburg <mal@egenix.com> parents: 13396 diff changeset	499 goto onError;
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	500 }
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	501
13401 8f1a2deeb9b0 Added new API PyUnicode_FromEncodedObject() which supports decoding Marc-André Lemburg <mal@egenix.com> parents: 13396 diff changeset	502 /* Convert to Unicode */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	503 if (len == 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	504 Py_INCREF(unicode_empty);
13401 8f1a2deeb9b0 Added new API PyUnicode_FromEncodedObject() which supports decoding Marc-André Lemburg <mal@egenix.com> parents: 13396 diff changeset	505 v = (PyObject *)unicode_empty;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	506 }
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	507 else
13401 8f1a2deeb9b0 Added new API PyUnicode_FromEncodedObject() which supports decoding Marc-André Lemburg <mal@egenix.com> parents: 13396 diff changeset	508 v = PyUnicode_Decode(s, len, encoding, errors);
15952 1f92d63b20f0 This patch adds a new builtin unistr() which behaves like str() Marc-André Lemburg <mal@egenix.com> parents: 15910 diff changeset	509
13401 8f1a2deeb9b0 Added new API PyUnicode_FromEncodedObject() which supports decoding Marc-André Lemburg <mal@egenix.com> parents: 13396 diff changeset	510 return v;
8f1a2deeb9b0 Added new API PyUnicode_FromEncodedObject() which supports decoding Marc-André Lemburg <mal@egenix.com> parents: 13396 diff changeset	511
8f1a2deeb9b0 Added new API PyUnicode_FromEncodedObject() which supports decoding Marc-André Lemburg <mal@egenix.com> parents: 13396 diff changeset	512 onError:
8f1a2deeb9b0 Added new API PyUnicode_FromEncodedObject() which supports decoding Marc-André Lemburg <mal@egenix.com> parents: 13396 diff changeset	513 return NULL;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	514 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	515
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	516 PyObject PyUnicode_Decode(const char s,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	517 int size,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	518 const char *encoding,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	519 const char *errors)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	520 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	521 PyObject buffer = NULL, unicode;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	522
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	523 if (encoding == NULL)
12645 c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	524 encoding = PyUnicode_GetDefaultEncoding();
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	525
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	526 /* Shortcuts for common default encodings */
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	527 if (strcmp(encoding, "utf-8") == 0)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	528 return PyUnicode_DecodeUTF8(s, size, errors);
12645 c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	529 else if (strcmp(encoding, "latin-1") == 0)
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	530 return PyUnicode_DecodeLatin1(s, size, errors);
29706 a4fead0e24f8 Support 'mbcs' as a 'built-in' encoding, so the C API can use it without Mark Hammond <mhammond@skippinet.com.au> parents: 29641 diff changeset	531 #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
a4fead0e24f8 Support 'mbcs' as a 'built-in' encoding, so the C API can use it without Mark Hammond <mhammond@skippinet.com.au> parents: 29641 diff changeset	532 else if (strcmp(encoding, "mbcs") == 0)
a4fead0e24f8 Support 'mbcs' as a 'built-in' encoding, so the C API can use it without Mark Hammond <mhammond@skippinet.com.au> parents: 29641 diff changeset	533 return PyUnicode_DecodeMBCS(s, size, errors);
a4fead0e24f8 Support 'mbcs' as a 'built-in' encoding, so the C API can use it without Mark Hammond <mhammond@skippinet.com.au> parents: 29641 diff changeset	534 #endif
12645 c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	535 else if (strcmp(encoding, "ascii") == 0)
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	536 return PyUnicode_DecodeASCII(s, size, errors);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	537
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	538 /* Decode via the codec registry */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	539 buffer = PyBuffer_FromMemory((void *)s, size);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	540 if (buffer == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	541 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	542 unicode = PyCodec_Decode(buffer, encoding, errors);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	543 if (unicode == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	544 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	545 if (!PyUnicode_Check(unicode)) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	546 PyErr_Format(PyExc_TypeError,
12320 5de0b939fe61 Skip Montanaro: add string precisions to calls to PyErr_Format Guido van Rossum <guido@python.org> parents: 12275 diff changeset	547 "decoder did not return an unicode object (type=%.400s)",
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	548 unicode->ob_type->tp_name);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	549 Py_DECREF(unicode);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	550 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	551 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	552 Py_DECREF(buffer);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	553 return unicode;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	554
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	555 onError:
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	556 Py_XDECREF(buffer);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	557 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	558 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	559
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	560 PyObject PyUnicode_Encode(const Py_UNICODE s,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	561 int size,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	562 const char *encoding,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	563 const char *errors)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	564 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	565 PyObject v, unicode;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	566
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	567 unicode = PyUnicode_FromUnicode(s, size);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	568 if (unicode == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	569 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	570 v = PyUnicode_AsEncodedString(unicode, encoding, errors);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	571 Py_DECREF(unicode);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	572 return v;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	573 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	574
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	575 PyObject PyUnicode_AsEncodedString(PyObject unicode,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	576 const char *encoding,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	577 const char *errors)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	578 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	579 PyObject *v;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	580
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	581 if (!PyUnicode_Check(unicode)) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	582 PyErr_BadArgument();
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	583 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	584 }
12645 c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	585
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	586 if (encoding == NULL)
12645 c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	587 encoding = PyUnicode_GetDefaultEncoding();
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	588
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	589 /* Shortcuts for common default encodings */
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	590 if (errors == NULL) {
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	591 if (strcmp(encoding, "utf-8") == 0)
17995 837825a779c1 fix bogus indentation Jeremy Hylton <jeremy@alum.mit.edu> parents: 17887 diff changeset	592 return PyUnicode_AsUTF8String(unicode);
12645 c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	593 else if (strcmp(encoding, "latin-1") == 0)
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	594 return PyUnicode_AsLatin1String(unicode);
29706 a4fead0e24f8 Support 'mbcs' as a 'built-in' encoding, so the C API can use it without Mark Hammond <mhammond@skippinet.com.au> parents: 29641 diff changeset	595 #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
a4fead0e24f8 Support 'mbcs' as a 'built-in' encoding, so the C API can use it without Mark Hammond <mhammond@skippinet.com.au> parents: 29641 diff changeset	596 else if (strcmp(encoding, "mbcs") == 0)
a4fead0e24f8 Support 'mbcs' as a 'built-in' encoding, so the C API can use it without Mark Hammond <mhammond@skippinet.com.au> parents: 29641 diff changeset	597 return PyUnicode_AsMBCSString(unicode);
a4fead0e24f8 Support 'mbcs' as a 'built-in' encoding, so the C API can use it without Mark Hammond <mhammond@skippinet.com.au> parents: 29641 diff changeset	598 #endif
12645 c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	599 else if (strcmp(encoding, "ascii") == 0)
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	600 return PyUnicode_AsASCIIString(unicode);
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	601 }
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	602
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	603 /* Encode via the codec registry */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	604 v = PyCodec_Encode(unicode, encoding, errors);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	605 if (v == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	606 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	607 /* XXX Should we really enforce this ? */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	608 if (!PyString_Check(v)) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	609 PyErr_Format(PyExc_TypeError,
12320 5de0b939fe61 Skip Montanaro: add string precisions to calls to PyErr_Format Guido van Rossum <guido@python.org> parents: 12275 diff changeset	610 "encoder did not return a string object (type=%.400s)",
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	611 v->ob_type->tp_name);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	612 Py_DECREF(v);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	613 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	614 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	615 return v;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	616
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	617 onError:
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	618 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	619 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	620
13837 2badb322355f This patch finalizes the move from UTF-8 to a default encoding in Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	621 PyObject _PyUnicode_AsDefaultEncodedString(PyObject unicode,
2badb322355f This patch finalizes the move from UTF-8 to a default encoding in Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	622 const char *errors)
2badb322355f This patch finalizes the move from UTF-8 to a default encoding in Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	623 {
2badb322355f This patch finalizes the move from UTF-8 to a default encoding in Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	624 PyObject v = ((PyUnicodeObject )unicode)->defenc;
2badb322355f This patch finalizes the move from UTF-8 to a default encoding in Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	625
2badb322355f This patch finalizes the move from UTF-8 to a default encoding in Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	626 if (v)
2badb322355f This patch finalizes the move from UTF-8 to a default encoding in Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	627 return v;
2badb322355f This patch finalizes the move from UTF-8 to a default encoding in Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	628 v = PyUnicode_AsEncodedString(unicode, NULL, errors);
2badb322355f This patch finalizes the move from UTF-8 to a default encoding in Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	629 if (v && errors == NULL)
2badb322355f This patch finalizes the move from UTF-8 to a default encoding in Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	630 ((PyUnicodeObject *)unicode)->defenc = v;
2badb322355f This patch finalizes the move from UTF-8 to a default encoding in Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	631 return v;
2badb322355f This patch finalizes the move from UTF-8 to a default encoding in Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	632 }
2badb322355f This patch finalizes the move from UTF-8 to a default encoding in Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	633
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	634 Py_UNICODE PyUnicode_AsUnicode(PyObject unicode)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	635 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	636 if (!PyUnicode_Check(unicode)) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	637 PyErr_BadArgument();
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	638 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	639 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	640 return PyUnicode_AS_UNICODE(unicode);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	641
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	642 onError:
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	643 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	644 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	645
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	646 int PyUnicode_GetSize(PyObject *unicode)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	647 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	648 if (!PyUnicode_Check(unicode)) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	649 PyErr_BadArgument();
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	650 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	651 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	652 return PyUnicode_GET_SIZE(unicode);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	653
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	654 onError:
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	655 return -1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	656 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	657
32197 3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	658 int PyUnicode_GetWidth(PyObject *unicode)
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	659 {
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	660 const Py_UNICODE p, e;
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	661 int width;
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	662
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	663 if (!PyUnicode_Check(unicode)) {
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	664 PyErr_BadArgument();
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	665 return -1;
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	666 }
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	667
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	668 p = PyUnicode_AS_UNICODE(unicode);
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	669 e = p + PyUnicode_GET_SIZE(unicode);
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	670 for (width = 0; p < e; p++)
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	671 if (Py_UNICODE_ISWIDE(*p))
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	672 width += 2;
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	673 else
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	674 width++;
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	675
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	676 return width;
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	677 }
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	678
13660 a1ce07218781 Miscelaneous ANSIfications. I'm assuming here 'main' should take (int, Thomas Wouters <thomas@python.org> parents: 13635 diff changeset	679 const char *PyUnicode_GetDefaultEncoding(void)
12645 c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	680 {
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	681 return unicode_default_encoding;
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	682 }
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	683
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	684 int PyUnicode_SetDefaultEncoding(const char *encoding)
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	685 {
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	686 PyObject *v;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	687
12645 c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	688 /* Make sure the encoding is valid. As side effect, this also
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	689 loads the encoding into the codec registry cache. */
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	690 v = _PyCodec_Lookup(encoding);
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	691 if (v == NULL)
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	692 goto onError;
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	693 Py_DECREF(v);
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	694 strncpy(unicode_default_encoding,
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	695 encoding,
12645 c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	696 sizeof(unicode_default_encoding));
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	697 return 0;
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	698
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	699 onError:
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	700 return -1;
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	701 }
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	702
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	703 /* error handling callback helper:
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	704 build arguments, call the callback and check the arguments,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	705 if no exception occured, copy the replacement to the output
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	706 and adjust various state variables.
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	707 return 0 on success, -1 on error
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	708 */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	709
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	710 static
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	711 int unicode_decode_call_errorhandler(const char errors, PyObject *errorHandler,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	712 const char encoding, const char reason,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	713 const char input, int insize, int startinpos, int endinpos, PyObject exceptionObject, const char *inptr,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	714 PyObject *output, int outpos, Py_UNICODE **outptr)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	715 {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	716 static char *argparse = "O!i;decoding error handler must return (unicode, int) tuple";
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	717
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	718 PyObject *restuple = NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	719 PyObject *repunicode = NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	720 int outsize = PyUnicode_GET_SIZE(*output);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	721 int requiredsize;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	722 int newpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	723 Py_UNICODE *repptr;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	724 int repsize;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	725 int res = -1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	726
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	727 if (*errorHandler == NULL) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	728 *errorHandler = PyCodec_LookupError(errors);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	729 if (*errorHandler == NULL)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	730 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	731 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	732
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	733 if (*exceptionObject == NULL) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	734 *exceptionObject = PyUnicodeDecodeError_Create(
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	735 encoding, input, insize, startinpos, endinpos, reason);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	736 if (*exceptionObject == NULL)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	737 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	738 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	739 else {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	740 if (PyUnicodeDecodeError_SetStart(exceptionObject, startinpos))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	741 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	742 if (PyUnicodeDecodeError_SetEnd(exceptionObject, endinpos))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	743 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	744 if (PyUnicodeDecodeError_SetReason(*exceptionObject, reason))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	745 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	746 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	747
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	748 restuple = PyObject_CallFunctionObjArgs(errorHandler, exceptionObject, NULL);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	749 if (restuple == NULL)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	750 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	751 if (!PyTuple_Check(restuple)) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	752 PyErr_Format(PyExc_TypeError, &argparse[4]);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	753 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	754 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	755 if (!PyArg_ParseTuple(restuple, argparse, &PyUnicode_Type, &repunicode, &newpos))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	756 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	757 if (newpos<0)
27555 c267f28724dd Change the treatment of positions returned by PEP293 Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	758 newpos = insize+newpos;
c267f28724dd Change the treatment of positions returned by PEP293 Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	759 if (newpos<0 \|\| newpos>insize) {
c267f28724dd Change the treatment of positions returned by PEP293 Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	760 PyErr_Format(PyExc_IndexError, "position %d from error handler out of bounds", newpos);
c267f28724dd Change the treatment of positions returned by PEP293 Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	761 goto onError;
c267f28724dd Change the treatment of positions returned by PEP293 Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	762 }
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	763
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	764 /* need more space? (at least enough for what we
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	765 have+the replacement+the rest of the string (starting
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	766 at the new input position), so we won't have to check space
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	767 when there are no errors in the rest of the string) */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	768 repptr = PyUnicode_AS_UNICODE(repunicode);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	769 repsize = PyUnicode_GET_SIZE(repunicode);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	770 requiredsize = *outpos + repsize + insize-newpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	771 if (requiredsize > outsize) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	772 if (requiredsize<2*outsize)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	773 requiredsize = 2*outsize;
30431 cd0c3f916b34 Change checks of PyUnicode_Resize() return value for clarity. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30216 diff changeset	774 if (PyUnicode_Resize(output, requiredsize) < 0)
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	775 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	776 outptr = PyUnicode_AS_UNICODE(output) + *outpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	777 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	778 *endinpos = newpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	779 *inptr = input + newpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	780 Py_UNICODE_COPY(*outptr, repptr, repsize);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	781 *outptr += repsize;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	782 *outpos += repsize;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	783 /* we made it! */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	784 res = 0;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	785
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	786 onError:
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	787 Py_XDECREF(restuple);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	788 return res;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	789 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	790
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	791 /* --- UTF-7 Codec -------------------------------------------------------- */
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	792
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	793 /* see RFC2152 for details */
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	794
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	795 static
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	796 char utf7_special[128] = {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	797 /* indicate whether a UTF-7 character is special i.e. cannot be directly
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	798 encoded:
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	799 0 - not special
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	800 1 - special
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	801 2 - whitespace (optional)
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	802 3 - RFC2152 Set O (optional) */
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	803 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 2, 1, 1,
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	804 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	805 2, 3, 3, 3, 3, 3, 3, 0, 0, 0, 3, 1, 0, 0, 0, 1,
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	806 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 0,
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	807 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	808 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 3, 3, 3,
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	809 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	810 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 1, 1,
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	811
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	812 };
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	813
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	814 #define SPECIAL(c, encodeO, encodeWS) \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	815 (((c)>127 \|\| utf7_special[(c)] == 1) \|\| \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	816 (encodeWS && (utf7_special[(c)] == 2)) \|\| \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	817 (encodeO && (utf7_special[(c)] == 3)))
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	818
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	819 #define B64(n) ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[(n) & 0x3f])
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	820 #define B64CHAR(c) (isalnum(c) \|\| (c) == '+' \|\| (c) == '/')
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	821 #define UB64(c) ((c) == '+' ? 62 : (c) == '/' ? 63 : (c) >= 'a' ? \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	822 (c) - 71 : (c) >= 'A' ? (c) - 65 : (c) + 4)
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	823
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	824 #define ENCODE(out, ch, bits) \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	825 while (bits >= 6) { \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	826 *out++ = B64(ch >> (bits-6)); \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	827 bits -= 6; \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	828 }
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	829
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	830 #define DECODE(out, ch, bits, surrogate) \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	831 while (bits >= 16) { \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	832 Py_UNICODE outCh = (Py_UNICODE) ((ch >> (bits-16)) & 0xffff); \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	833 bits -= 16; \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	834 if (surrogate) { \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	835 /* We have already generated an error for the high surrogate
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	836 so let's not bother seeing if the low surrogate is correct or not */\
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	837 surrogate = 0; \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	838 } else if (0xDC00 <= outCh && outCh <= 0xDFFF) { \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	839 /* This is a surrogate pair. Unfortunately we can't represent \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	840 it in a 16-bit character */ \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	841 surrogate = 1; \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	842 errmsg = "code pairs are not supported"; \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	843 goto utf7Error; \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	844 } else { \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	845 *out++ = outCh; \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	846 } \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	847 } \
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	848
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	849 PyObject PyUnicode_DecodeUTF7(const char s,
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	850 int size,
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	851 const char *errors)
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	852 {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	853 const char *starts = s;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	854 int startinpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	855 int endinpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	856 int outpos;
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	857 const char *e;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	858 PyUnicodeObject *unicode;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	859 Py_UNICODE *p;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	860 const char *errmsg = "";
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	861 int inShift = 0;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	862 unsigned int bitsleft = 0;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	863 unsigned long charsleft = 0;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	864 int surrogate = 0;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	865 PyObject *errorHandler = NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	866 PyObject *exc = NULL;
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	867
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	868 unicode = _PyUnicode_New(size);
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	869 if (!unicode)
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	870 return NULL;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	871 if (size == 0)
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	872 return (PyObject *)unicode;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	873
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	874 p = unicode->str;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	875 e = s + size;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	876
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	877 while (s < e) {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	878 Py_UNICODE ch;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	879 restart:
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	880 ch = *s;
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	881
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	882 if (inShift) {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	883 if ((ch == '-') \|\| !B64CHAR(ch)) {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	884 inShift = 0;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	885 s++;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	886
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	887 /* p, charsleft, bitsleft, surrogate = */ DECODE(p, charsleft, bitsleft, surrogate);
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	888 if (bitsleft >= 6) {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	889 /* The shift sequence has a partial character in it. If
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	890 bitsleft < 6 then we could just classify it as padding
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	891 but that is not the case here */
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	892
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	893 errmsg = "partial character in shift sequence";
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	894 goto utf7Error;
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	895 }
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	896 /* According to RFC2152 the remaining bits should be zero. We
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	897 choose to signal an error/insert a replacement character
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	898 here so indicate the potential of a misencoded character. */
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	899
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	900 /* On x86, a << b == a << (b%32) so make sure that bitsleft != 0 */
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	901 if (bitsleft && charsleft << (sizeof(charsleft) * 8 - bitsleft)) {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	902 errmsg = "non-zero padding bits in shift sequence";
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	903 goto utf7Error;
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	904 }
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	905
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	906 if (ch == '-') {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	907 if ((s < e) && (*(s) == '-')) {
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	908 *p++ = '-';
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	909 inShift = 1;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	910 }
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	911 } else if (SPECIAL(ch,0,0)) {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	912 errmsg = "unexpected special character";
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	913 goto utf7Error;
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	914 } else {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	915 *p++ = ch;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	916 }
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	917 } else {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	918 charsleft = (charsleft << 6) \| UB64(ch);
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	919 bitsleft += 6;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	920 s++;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	921 /* p, charsleft, bitsleft, surrogate = */ DECODE(p, charsleft, bitsleft, surrogate);
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	922 }
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	923 }
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	924 else if ( ch == '+' ) {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	925 startinpos = s-starts;
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	926 s++;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	927 if (s < e && *s == '-') {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	928 s++;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	929 *p++ = '+';
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	930 } else
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	931 {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	932 inShift = 1;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	933 bitsleft = 0;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	934 }
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	935 }
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	936 else if (SPECIAL(ch,0,0)) {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	937 errmsg = "unexpected special character";
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	938 s++;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	939 goto utf7Error;
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	940 }
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	941 else {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	942 *p++ = ch;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	943 s++;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	944 }
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	945 continue;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	946 utf7Error:
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	947 outpos = p-PyUnicode_AS_UNICODE(unicode);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	948 endinpos = s-starts;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	949 if (unicode_decode_call_errorhandler(
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	950 errors, &errorHandler,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	951 "utf7", errmsg,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	952 starts, size, &startinpos, &endinpos, &exc, &s,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	953 (PyObject **)&unicode, &outpos, &p))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	954 goto onError;
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	955 }
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	956
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	957 if (inShift) {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	958 outpos = p-PyUnicode_AS_UNICODE(unicode);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	959 endinpos = size;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	960 if (unicode_decode_call_errorhandler(
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	961 errors, &errorHandler,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	962 "utf7", "unterminated shift sequence",
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	963 starts, size, &startinpos, &endinpos, &exc, &s,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	964 (PyObject **)&unicode, &outpos, &p))
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	965 goto onError;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	966 if (s < e)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	967 goto restart;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	968 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	969
30431 cd0c3f916b34 Change checks of PyUnicode_Resize() return value for clarity. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30216 diff changeset	970 if (_PyUnicode_Resize(&unicode, p - PyUnicode_AS_UNICODE(unicode)) < 0)
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	971 goto onError;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	972
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	973 Py_XDECREF(errorHandler);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	974 Py_XDECREF(exc);
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	975 return (PyObject *)unicode;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	976
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	977 onError:
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	978 Py_XDECREF(errorHandler);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	979 Py_XDECREF(exc);
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	980 Py_DECREF(unicode);
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	981 return NULL;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	982 }
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	983
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	984
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	985 PyObject PyUnicode_EncodeUTF7(const Py_UNICODE s,
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	986 int size,
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	987 int encodeSetO,
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	988 int encodeWhiteSpace,
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	989 const char *errors)
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	990 {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	991 PyObject *v;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	992 /* It might be possible to tighten this worst case */
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	993 unsigned int cbAllocated = 5 * size;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	994 int inShift = 0;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	995 int i = 0;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	996 unsigned int bitsleft = 0;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	997 unsigned long charsleft = 0;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	998 char * out;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	999 char * start;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1000
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1001 if (size == 0)
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1002 return PyString_FromStringAndSize(NULL, 0);
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1003
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1004 v = PyString_FromStringAndSize(NULL, cbAllocated);
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1005 if (v == NULL)
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1006 return NULL;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1007
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1008 start = out = PyString_AS_STRING(v);
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1009 for (;i < size; ++i) {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1010 Py_UNICODE ch = s[i];
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1011
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1012 if (!inShift) {
31325 b4532c246a3a Cosmetic fix for wrongly indented tabs with ts=4. Hye-Shik Chang <hyeshik@gmail.com> parents: 31252 diff changeset	1013 if (ch == '+') {
b4532c246a3a Cosmetic fix for wrongly indented tabs with ts=4. Hye-Shik Chang <hyeshik@gmail.com> parents: 31252 diff changeset	1014 *out++ = '+';
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1015 *out++ = '-';
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1016 } else if (SPECIAL(ch, encodeSetO, encodeWhiteSpace)) {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1017 charsleft = ch;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1018 bitsleft = 16;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1019 *out++ = '+';
31325 b4532c246a3a Cosmetic fix for wrongly indented tabs with ts=4. Hye-Shik Chang <hyeshik@gmail.com> parents: 31252 diff changeset	1020 /* out, charsleft, bitsleft = */ ENCODE(out, charsleft, bitsleft);
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1021 inShift = bitsleft > 0;
31325 b4532c246a3a Cosmetic fix for wrongly indented tabs with ts=4. Hye-Shik Chang <hyeshik@gmail.com> parents: 31252 diff changeset	1022 } else {
b4532c246a3a Cosmetic fix for wrongly indented tabs with ts=4. Hye-Shik Chang <hyeshik@gmail.com> parents: 31252 diff changeset	1023 *out++ = (char) ch;
b4532c246a3a Cosmetic fix for wrongly indented tabs with ts=4. Hye-Shik Chang <hyeshik@gmail.com> parents: 31252 diff changeset	1024 }
b4532c246a3a Cosmetic fix for wrongly indented tabs with ts=4. Hye-Shik Chang <hyeshik@gmail.com> parents: 31252 diff changeset	1025 } else {
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1026 if (!SPECIAL(ch, encodeSetO, encodeWhiteSpace)) {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1027 *out++ = B64(charsleft << (6-bitsleft));
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1028 charsleft = 0;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1029 bitsleft = 0;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1030 /* Characters not in the BASE64 set implicitly unshift the sequence
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1031 so no '-' is required, except if the character is itself a '-' */
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1032 if (B64CHAR(ch) \|\| ch == '-') {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1033 *out++ = '-';
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1034 }
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1035 inShift = 0;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1036 *out++ = (char) ch;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1037 } else {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1038 bitsleft += 16;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1039 charsleft = (charsleft << 16) \| ch;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1040 /* out, charsleft, bitsleft = */ ENCODE(out, charsleft, bitsleft);
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1041
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1042 /* If the next character is special then we dont' need to terminate
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	1043 the shift sequence. If the next character is not a BASE64 character
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1044 or '-' then the shift sequence will be terminated implicitly and we
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1045 don't have to insert a '-'. */
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1046
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1047 if (bitsleft == 0) {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1048 if (i + 1 < size) {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1049 Py_UNICODE ch2 = s[i+1];
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1050
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1051 if (SPECIAL(ch2, encodeSetO, encodeWhiteSpace)) {
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	1052
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1053 } else if (B64CHAR(ch2) \|\| ch2 == '-') {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1054 *out++ = '-';
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1055 inShift = 0;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1056 } else {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1057 inShift = 0;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1058 }
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1059
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1060 }
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1061 else {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1062 *out++ = '-';
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1063 inShift = 0;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1064 }
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1065 }
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	1066 }
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1067 }
31325 b4532c246a3a Cosmetic fix for wrongly indented tabs with ts=4. Hye-Shik Chang <hyeshik@gmail.com> parents: 31252 diff changeset	1068 }
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1069 if (bitsleft) {
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1070 *out++= B64(charsleft << (6-bitsleft) );
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1071 *out++ = '-';
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1072 }
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1073
23295 6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23294 diff changeset	1074 _PyString_Resize(&v, out - start);
19998 8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1075 return v;
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1076 }
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1077
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1078 #undef SPECIAL
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1079 #undef B64
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1080 #undef B64CHAR
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1081 #undef UB64
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1082 #undef ENCODE
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1083 #undef DECODE
8a0c97453df4 Patch #435971: UTF-7 codec by Brian Quinlan. Marc-André Lemburg <mal@egenix.com> parents: 19886 diff changeset	1084
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1085 /* --- UTF-8 Codec -------------------------------------------------------- */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1086
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	1087 static
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1088 char utf8_code_length[256] = {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1089 /* Map UTF-8 encoded prefix byte to sequence length. zero means
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1090 illegal prefix. see RFC 2279 for details */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1091 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1092 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1093 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1094 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1095 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1096 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1097 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1098 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1099 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1100 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1101 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1102 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1103 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1104 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1105 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1106 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 0, 0
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1107 };
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1108
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1109 PyObject PyUnicode_DecodeUTF8(const char s,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1110 int size,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1111 const char *errors)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1112 {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1113 const char *starts = s;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1114 int n;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1115 int startinpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1116 int endinpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1117 int outpos;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1118 const char *e;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1119 PyUnicodeObject *unicode;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1120 Py_UNICODE *p;
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1121 const char *errmsg = "";
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1122 PyObject *errorHandler = NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1123 PyObject *exc = NULL;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1124
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1125 /* Note: size will always be longer than the resulting Unicode
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1126 character count */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1127 unicode = _PyUnicode_New(size);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1128 if (!unicode)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1129 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1130 if (size == 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1131 return (PyObject *)unicode;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1132
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1133 /* Unpack UTF-8 encoded data */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1134 p = unicode->str;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1135 e = s + size;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1136
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1137 while (s < e) {
13411 9a8391054840 New surrogate support in the UTF-8 codec. By Bill Tutt. Marc-André Lemburg <mal@egenix.com> parents: 13401 diff changeset	1138 Py_UCS4 ch = (unsigned char)*s;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1139
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1140 if (ch < 0x80) {
13411 9a8391054840 New surrogate support in the UTF-8 codec. By Bill Tutt. Marc-André Lemburg <mal@egenix.com> parents: 13401 diff changeset	1141 *p++ = (Py_UNICODE)ch;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1142 s++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1143 continue;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1144 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1145
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1146 n = utf8_code_length[ch];
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1147
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1148 if (s + n > e) {
dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1149 errmsg = "unexpected end of data";
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1150 startinpos = s-starts;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1151 endinpos = size;
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1152 goto utf8Error;
dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1153 }
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1154
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1155 switch (n) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1156
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1157 case 0:
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1158 errmsg = "unexpected code byte";
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1159 startinpos = s-starts;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1160 endinpos = startinpos+1;
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1161 goto utf8Error;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1162
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1163 case 1:
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1164 errmsg = "internal error";
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1165 startinpos = s-starts;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1166 endinpos = startinpos+1;
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1167 goto utf8Error;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1168
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1169 case 2:
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1170 if ((s[1] & 0xc0) != 0x80) {
dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1171 errmsg = "invalid data";
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1172 startinpos = s-starts;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1173 endinpos = startinpos+2;
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1174 goto utf8Error;
dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1175 }
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1176 ch = ((s[0] & 0x1f) << 6) + (s[1] & 0x3f);
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1177 if (ch < 0x80) {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1178 startinpos = s-starts;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1179 endinpos = startinpos+2;
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1180 errmsg = "illegal encoding";
dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1181 goto utf8Error;
dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1182 }
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1183 else
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1184 *p++ = (Py_UNICODE)ch;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1185 break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1186
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1187 case 3:
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	1188 if ((s[1] & 0xc0) != 0x80 \|\|
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1189 (s[2] & 0xc0) != 0x80) {
dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1190 errmsg = "invalid data";
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1191 startinpos = s-starts;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1192 endinpos = startinpos+3;
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1193 goto utf8Error;
dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1194 }
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1195 ch = ((s[0] & 0x0f) << 12) + ((s[1] & 0x3f) << 6) + (s[2] & 0x3f);
21886 abedb2418f62 Fix to the UTF-8 encoder: it failed on 0-length input strings. Marc-André Lemburg <mal@egenix.com> parents: 21884 diff changeset	1196 if (ch < 0x0800) {
abedb2418f62 Fix to the UTF-8 encoder: it failed on 0-length input strings. Marc-André Lemburg <mal@egenix.com> parents: 21884 diff changeset	1197 /* Note: UTF-8 encodings of surrogates are considered
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	1198 legal UTF-8 sequences;
21886 abedb2418f62 Fix to the UTF-8 encoder: it failed on 0-length input strings. Marc-André Lemburg <mal@egenix.com> parents: 21884 diff changeset	1199
abedb2418f62 Fix to the UTF-8 encoder: it failed on 0-length input strings. Marc-André Lemburg <mal@egenix.com> parents: 21884 diff changeset	1200 XXX For wide builds (UCS-4) we should probably try
abedb2418f62 Fix to the UTF-8 encoder: it failed on 0-length input strings. Marc-André Lemburg <mal@egenix.com> parents: 21884 diff changeset	1201 to recombine the surrogates into a single code
abedb2418f62 Fix to the UTF-8 encoder: it failed on 0-length input strings. Marc-André Lemburg <mal@egenix.com> parents: 21884 diff changeset	1202 unit.
abedb2418f62 Fix to the UTF-8 encoder: it failed on 0-length input strings. Marc-André Lemburg <mal@egenix.com> parents: 21884 diff changeset	1203 */
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1204 errmsg = "illegal encoding";
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1205 startinpos = s-starts;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1206 endinpos = startinpos+3;
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1207 goto utf8Error;
dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1208 }
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1209 else
21886 abedb2418f62 Fix to the UTF-8 encoder: it failed on 0-length input strings. Marc-André Lemburg <mal@egenix.com> parents: 21884 diff changeset	1210 *p++ = (Py_UNICODE)ch;
13411 9a8391054840 New surrogate support in the UTF-8 codec. By Bill Tutt. Marc-André Lemburg <mal@egenix.com> parents: 13401 diff changeset	1211 break;
9a8391054840 New surrogate support in the UTF-8 codec. By Bill Tutt. Marc-André Lemburg <mal@egenix.com> parents: 13401 diff changeset	1212
9a8391054840 New surrogate support in the UTF-8 codec. By Bill Tutt. Marc-André Lemburg <mal@egenix.com> parents: 13401 diff changeset	1213 case 4:
9a8391054840 New surrogate support in the UTF-8 codec. By Bill Tutt. Marc-André Lemburg <mal@egenix.com> parents: 13401 diff changeset	1214 if ((s[1] & 0xc0) != 0x80 \|\|
9a8391054840 New surrogate support in the UTF-8 codec. By Bill Tutt. Marc-André Lemburg <mal@egenix.com> parents: 13401 diff changeset	1215 (s[2] & 0xc0) != 0x80 \|\|
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1216 (s[3] & 0xc0) != 0x80) {
dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1217 errmsg = "invalid data";
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1218 startinpos = s-starts;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1219 endinpos = startinpos+4;
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1220 goto utf8Error;
dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1221 }
13411 9a8391054840 New surrogate support in the UTF-8 codec. By Bill Tutt. Marc-André Lemburg <mal@egenix.com> parents: 13401 diff changeset	1222 ch = ((s[0] & 0x7) << 18) + ((s[1] & 0x3f) << 12) +
9a8391054840 New surrogate support in the UTF-8 codec. By Bill Tutt. Marc-André Lemburg <mal@egenix.com> parents: 13401 diff changeset	1223 ((s[2] & 0x3f) << 6) + (s[3] & 0x3f);
9a8391054840 New surrogate support in the UTF-8 codec. By Bill Tutt. Marc-André Lemburg <mal@egenix.com> parents: 13401 diff changeset	1224 /* validate and convert to UTF-16 */
18292 ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1225 if ((ch < 0x10000) /* minimum value allowed for 4
21886 abedb2418f62 Fix to the UTF-8 encoder: it failed on 0-length input strings. Marc-André Lemburg <mal@egenix.com> parents: 21884 diff changeset	1226 byte encoding */
18292 ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1227 \|\| (ch > 0x10ffff)) /* maximum value allowed for
21886 abedb2418f62 Fix to the UTF-8 encoder: it failed on 0-length input strings. Marc-André Lemburg <mal@egenix.com> parents: 21884 diff changeset	1228 UTF-16 */
18292 ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1229 {
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1230 errmsg = "illegal encoding";
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1231 startinpos = s-starts;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1232 endinpos = startinpos+4;
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1233 goto utf8Error;
dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1234 }
18324 3ba7a358ce02 use Py_UNICODE_WIDE instead of USE_UCS4_STORAGE and Py_UNICODE_SIZE Fredrik Lundh <fredrik@pythonware.com> parents: 18298 diff changeset	1235 #ifdef Py_UNICODE_WIDE
18292 ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1236 *p++ = (Py_UNICODE)ch;
ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1237 #else
13411 9a8391054840 New surrogate support in the UTF-8 codec. By Bill Tutt. Marc-André Lemburg <mal@egenix.com> parents: 13401 diff changeset	1238 /* compute and append the two surrogates: */
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	1239
13411 9a8391054840 New surrogate support in the UTF-8 codec. By Bill Tutt. Marc-André Lemburg <mal@egenix.com> parents: 13401 diff changeset	1240 /* translate from 10000..10FFFF to 0..FFFF */
9a8391054840 New surrogate support in the UTF-8 codec. By Bill Tutt. Marc-André Lemburg <mal@egenix.com> parents: 13401 diff changeset	1241 ch -= 0x10000;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	1242
13411 9a8391054840 New surrogate support in the UTF-8 codec. By Bill Tutt. Marc-André Lemburg <mal@egenix.com> parents: 13401 diff changeset	1243 /* high surrogate = top 10 bits added to D800 */
9a8391054840 New surrogate support in the UTF-8 codec. By Bill Tutt. Marc-André Lemburg <mal@egenix.com> parents: 13401 diff changeset	1244 *p++ = (Py_UNICODE)(0xD800 + (ch >> 10));
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	1245
13411 9a8391054840 New surrogate support in the UTF-8 codec. By Bill Tutt. Marc-André Lemburg <mal@egenix.com> parents: 13401 diff changeset	1246 /* low surrogate = bottom 10 bits added to DC00 */
18279 8b7ff44b4669 experimental UCS-4 support: made compare a bit more robust, in case Fredrik Lundh <fredrik@pythonware.com> parents: 18278 diff changeset	1247 *p++ = (Py_UNICODE)(0xDC00 + (ch & 0x03FF));
18292 ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1248 #endif
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1249 break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1250
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1251 default:
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1252 /* Other sizes are only needed for UCS-4 */
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1253 errmsg = "unsupported Unicode code range";
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1254 startinpos = s-starts;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1255 endinpos = startinpos+n;
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1256 goto utf8Error;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1257 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1258 s += n;
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1259 continue;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	1260
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1261 utf8Error:
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1262 outpos = p-PyUnicode_AS_UNICODE(unicode);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1263 if (unicode_decode_call_errorhandler(
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1264 errors, &errorHandler,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1265 "utf8", errmsg,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1266 starts, size, &startinpos, &endinpos, &exc, &s,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1267 (PyObject **)&unicode, &outpos, &p))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1268 goto onError;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1269 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1270
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1271 /* Adjust length */
30431 cd0c3f916b34 Change checks of PyUnicode_Resize() return value for clarity. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30216 diff changeset	1272 if (_PyUnicode_Resize(&unicode, p - unicode->str) < 0)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1273 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1274
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1275 Py_XDECREF(errorHandler);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1276 Py_XDECREF(exc);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1277 return (PyObject *)unicode;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1278
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1279 onError:
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1280 Py_XDECREF(errorHandler);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1281 Py_XDECREF(exc);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1282 Py_DECREF(unicode);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1283 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1284 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1285
23294 b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1286 /* Allocation strategy: if the string is short, convert into a stack buffer
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1287 and allocate exactly as much space needed at the end. Else allocate the
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1288 maximum possible needed (4 result bytes per Unicode character), and return
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1289 the excess memory at the end.
23203 583c226afde6 Back out 2.140. Martin v. Löwis <martin@v.loewis.de> parents: 23198 diff changeset	1290 */
23198 950a22eb8cc8 PyUnicode_EncodeUTF8: squash compiler wng. The difference of two Tim Peters <tim.peters@gmail.com> parents: 23192 diff changeset	1291 PyObject *
950a22eb8cc8 PyUnicode_EncodeUTF8: squash compiler wng. The difference of two Tim Peters <tim.peters@gmail.com> parents: 23192 diff changeset	1292 PyUnicode_EncodeUTF8(const Py_UNICODE *s,
950a22eb8cc8 PyUnicode_EncodeUTF8: squash compiler wng. The difference of two Tim Peters <tim.peters@gmail.com> parents: 23192 diff changeset	1293 int size,
950a22eb8cc8 PyUnicode_EncodeUTF8: squash compiler wng. The difference of two Tim Peters <tim.peters@gmail.com> parents: 23192 diff changeset	1294 const char *errors)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1295 {
23294 b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1296 #define MAX_SHORT_UNICHARS 300 /* largest size we'll do on the stack */
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1297
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1298 int i; /* index into s of next input byte */
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1299 PyObject v; / result string object */
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1300 char p; / next free byte in output buffer */
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1301 int nallocated; /* number of result bytes allocated */
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1302 int nneeded; /* number of result bytes needed */
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1303 char stackbuf[MAX_SHORT_UNICHARS * 4];
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1304
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1305 assert(s != NULL);
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1306 assert(size >= 0);
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1307
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1308 if (size <= MAX_SHORT_UNICHARS) {
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1309 /* Write into the stack buffer; nallocated can't overflow.
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1310 * At the end, we'll allocate exactly as much heap space as it
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1311 * turns out we need.
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1312 */
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1313 nallocated = Py_SAFE_DOWNCAST(sizeof(stackbuf), size_t, int);
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1314 v = NULL; /* will allocate after we're done */
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1315 p = stackbuf;
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1316 }
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1317 else {
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1318 /* Overallocate on the heap, and give the excess back at the end. */
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1319 nallocated = size * 4;
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1320 if (nallocated / 4 != size) /* overflow! */
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1321 return PyErr_NoMemory();
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1322 v = PyString_FromStringAndSize(NULL, nallocated);
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1323 if (v == NULL)
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1324 return NULL;
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1325 p = PyString_AS_STRING(v);
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1326 }
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1327
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1328 for (i = 0; i < size;) {
13411 9a8391054840 New surrogate support in the UTF-8 codec. By Bill Tutt. Marc-André Lemburg <mal@egenix.com> parents: 13401 diff changeset	1329 Py_UCS4 ch = s[i++];
21882 94bac88f150f Fix for the UTF-8 memory allocation bug and the UTF-8 encoding Marc-André Lemburg <mal@egenix.com> parents: 21262 diff changeset	1330
23203 583c226afde6 Back out 2.140. Martin v. Löwis <martin@v.loewis.de> parents: 23198 diff changeset	1331 if (ch < 0x80)
23294 b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1332 /* Encode ASCII */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1333 *p++ = (char) ch;
21882 94bac88f150f Fix for the UTF-8 memory allocation bug and the UTF-8 encoding Marc-André Lemburg <mal@egenix.com> parents: 21262 diff changeset	1334
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1335 else if (ch < 0x0800) {
23294 b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1336 /* Encode Latin-1 */
21884 04cf4e13e5c9 Cosmetics. Marc-André Lemburg <mal@egenix.com> parents: 21883 diff changeset	1337 *p++ = (char)(0xc0 \| (ch >> 6));
04cf4e13e5c9 Cosmetics. Marc-André Lemburg <mal@egenix.com> parents: 21883 diff changeset	1338 *p++ = (char)(0x80 \| (ch & 0x3f));
13411 9a8391054840 New surrogate support in the UTF-8 codec. By Bill Tutt. Marc-André Lemburg <mal@egenix.com> parents: 13401 diff changeset	1339 }
21882 94bac88f150f Fix for the UTF-8 memory allocation bug and the UTF-8 encoding Marc-André Lemburg <mal@egenix.com> parents: 21262 diff changeset	1340 else {
23294 b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1341 /* Encode UCS2 Unicode ordinals */
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1342 if (ch < 0x10000) {
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1343 /* Special case: check for high surrogate */
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1344 if (0xD800 <= ch && ch <= 0xDBFF && i != size) {
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1345 Py_UCS4 ch2 = s[i];
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1346 /* Check for low surrogate and combine the two to
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1347 form a UCS4 value */
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1348 if (0xDC00 <= ch2 && ch2 <= 0xDFFF) {
23203 583c226afde6 Back out 2.140. Martin v. Löwis <martin@v.loewis.de> parents: 23198 diff changeset	1349 ch = ((ch - 0xD800) << 10 \| (ch2 - 0xDC00)) + 0x10000;
23294 b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1350 i++;
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1351 goto encodeUCS4;
13411 9a8391054840 New surrogate support in the UTF-8 codec. By Bill Tutt. Marc-André Lemburg <mal@egenix.com> parents: 13401 diff changeset	1352 }
23294 b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1353 /* Fall through: handles isolated high surrogates */
13411 9a8391054840 New surrogate support in the UTF-8 codec. By Bill Tutt. Marc-André Lemburg <mal@egenix.com> parents: 13401 diff changeset	1354 }
9a8391054840 New surrogate support in the UTF-8 codec. By Bill Tutt. Marc-André Lemburg <mal@egenix.com> parents: 13401 diff changeset	1355 *p++ = (char)(0xe0 \| (ch >> 12));
23294 b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1356 *p++ = (char)(0x80 \| ((ch >> 6) & 0x3f));
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1357 *p++ = (char)(0x80 \| (ch & 0x3f));
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1358 continue;
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1359 }
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1360 encodeUCS4:
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1361 /* Encode UCS4 Unicode ordinals */
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1362 *p++ = (char)(0xf0 \| (ch >> 18));
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1363 *p++ = (char)(0x80 \| ((ch >> 12) & 0x3f));
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1364 *p++ = (char)(0x80 \| ((ch >> 6) & 0x3f));
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1365 *p++ = (char)(0x80 \| (ch & 0x3f));
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1366 }
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1367 }
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1368
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1369 if (v == NULL) {
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1370 /* This was stack allocated. */
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1371 nneeded = Py_SAFE_DOWNCAST(p - stackbuf, long, int);
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1372 assert(nneeded <= nallocated);
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1373 v = PyString_FromStringAndSize(stackbuf, nneeded);
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1374 }
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1375 else {
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1376 /* Cut back to size actually needed. */
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1377 nneeded = Py_SAFE_DOWNCAST(p - PyString_AS_STRING(v), long, int);
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1378 assert(nneeded <= nallocated);
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1379 _PyString_Resize(&v, nneeded);
b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1380 }
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1381 return v;
23203 583c226afde6 Back out 2.140. Martin v. Löwis <martin@v.loewis.de> parents: 23198 diff changeset	1382
23294 b735e89ccda7 SF patch 549375: Compromise PyUnicode_EncodeUTF8 Tim Peters <tim.peters@gmail.com> parents: 23228 diff changeset	1383 #undef MAX_SHORT_UNICHARS
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1384 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1385
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1386 PyObject PyUnicode_AsUTF8String(PyObject unicode)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1387 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1388 if (!PyUnicode_Check(unicode)) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1389 PyErr_BadArgument();
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1390 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1391 }
14059 d0348a26b093 PyUnicode_AsUTF8String(): Don't need to explicitly incref str since Barry Warsaw <barry@python.org> parents: 13966 diff changeset	1392 return PyUnicode_EncodeUTF8(PyUnicode_AS_UNICODE(unicode),
d0348a26b093 PyUnicode_AsUTF8String(): Don't need to explicitly incref str since Barry Warsaw <barry@python.org> parents: 13966 diff changeset	1393 PyUnicode_GET_SIZE(unicode),
d0348a26b093 PyUnicode_AsUTF8String(): Don't need to explicitly incref str since Barry Warsaw <barry@python.org> parents: 13966 diff changeset	1394 NULL);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1395 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1396
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1397 /* --- UTF-16 Codec ------------------------------------------------------- */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1398
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1399 PyObject *
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1400 PyUnicode_DecodeUTF16(const char *s,
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1401 int size,
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1402 const char *errors,
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1403 int *byteorder)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1404 {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1405 const char *starts = s;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1406 int startinpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1407 int endinpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1408 int outpos;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1409 PyUnicodeObject *unicode;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1410 Py_UNICODE *p;
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1411 const unsigned char q, e;
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1412 int bo = 0; /* assume native ordering by default */
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1413 const char *errmsg = "";
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1414 /* Offsets from q for retrieving byte pairs in the right order. */
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1415 #ifdef BYTEORDER_IS_LITTLE_ENDIAN
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1416 int ihi = 1, ilo = 0;
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1417 #else
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1418 int ihi = 0, ilo = 1;
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1419 #endif
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1420 PyObject *errorHandler = NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1421 PyObject *exc = NULL;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1422
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1423 /* Note: size will always be longer than the resulting Unicode
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1424 character count */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1425 unicode = _PyUnicode_New(size);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1426 if (!unicode)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1427 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1428 if (size == 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1429 return (PyObject *)unicode;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1430
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1431 /* Unpack UTF-16 encoded data */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1432 p = unicode->str;
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1433 q = (unsigned char *)s;
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1434 e = q + size;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1435
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1436 if (byteorder)
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1437 bo = *byteorder;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1438
17887 fd5f83188778 This patch changes the behaviour of the UTF-16 codec family. Only the Marc-André Lemburg <mal@egenix.com> parents: 17700 diff changeset	1439 /* Check for BOM marks (U+FEFF) in the input and adjust current
fd5f83188778 This patch changes the behaviour of the UTF-16 codec family. Only the Marc-André Lemburg <mal@egenix.com> parents: 17700 diff changeset	1440 byte order setting accordingly. In native mode, the leading BOM
fd5f83188778 This patch changes the behaviour of the UTF-16 codec family. Only the Marc-André Lemburg <mal@egenix.com> parents: 17700 diff changeset	1441 mark is skipped, in all other modes, it is copied to the output
fd5f83188778 This patch changes the behaviour of the UTF-16 codec family. Only the Marc-André Lemburg <mal@egenix.com> parents: 17700 diff changeset	1442 stream as-is (giving a ZWNBSP character). */
fd5f83188778 This patch changes the behaviour of the UTF-16 codec family. Only the Marc-André Lemburg <mal@egenix.com> parents: 17700 diff changeset	1443 if (bo == 0) {
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1444 const Py_UNICODE bom = (q[ihi] << 8) \| q[ilo];
17887 fd5f83188778 This patch changes the behaviour of the UTF-16 codec family. Only the Marc-André Lemburg <mal@egenix.com> parents: 17700 diff changeset	1445 #ifdef BYTEORDER_IS_LITTLE_ENDIAN
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1446 if (bom == 0xFEFF) {
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1447 q += 2;
17887 fd5f83188778 This patch changes the behaviour of the UTF-16 codec family. Only the Marc-André Lemburg <mal@egenix.com> parents: 17700 diff changeset	1448 bo = -1;
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1449 }
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1450 else if (bom == 0xFFFE) {
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1451 q += 2;
17887 fd5f83188778 This patch changes the behaviour of the UTF-16 codec family. Only the Marc-André Lemburg <mal@egenix.com> parents: 17700 diff changeset	1452 bo = 1;
fd5f83188778 This patch changes the behaviour of the UTF-16 codec family. Only the Marc-André Lemburg <mal@egenix.com> parents: 17700 diff changeset	1453 }
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	1454 #else
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1455 if (bom == 0xFEFF) {
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1456 q += 2;
17887 fd5f83188778 This patch changes the behaviour of the UTF-16 codec family. Only the Marc-André Lemburg <mal@egenix.com> parents: 17700 diff changeset	1457 bo = 1;
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1458 }
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1459 else if (bom == 0xFFFE) {
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1460 q += 2;
17887 fd5f83188778 This patch changes the behaviour of the UTF-16 codec family. Only the Marc-André Lemburg <mal@egenix.com> parents: 17700 diff changeset	1461 bo = -1;
fd5f83188778 This patch changes the behaviour of the UTF-16 codec family. Only the Marc-André Lemburg <mal@egenix.com> parents: 17700 diff changeset	1462 }
fd5f83188778 This patch changes the behaviour of the UTF-16 codec family. Only the Marc-André Lemburg <mal@egenix.com> parents: 17700 diff changeset	1463 #endif
fd5f83188778 This patch changes the behaviour of the UTF-16 codec family. Only the Marc-André Lemburg <mal@egenix.com> parents: 17700 diff changeset	1464 }
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1465
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1466 if (bo == -1) {
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1467 /* force LE */
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1468 ihi = 1;
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1469 ilo = 0;
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1470 }
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1471 else if (bo == 1) {
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1472 /* force BE */
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1473 ihi = 0;
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1474 ilo = 1;
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1475 }
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1476
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1477 while (q < e) {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1478 Py_UNICODE ch;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1479 /* remaing bytes at the end? (size should be even) */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1480 if (e-q<2) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1481 errmsg = "truncated data";
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1482 startinpos = ((const char *)q)-starts;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1483 endinpos = ((const char *)e)-starts;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1484 goto utf16Error;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1485 /* The remaining input chars are ignored if the callback
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1486 chooses to skip the input */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1487 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1488 ch = (q[ihi] << 8) \| q[ilo];
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1489
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1490 q += 2;
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1491
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1492 if (ch < 0xD800 \|\| ch > 0xDFFF) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1493 *p++ = ch;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1494 continue;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1495 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1496
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1497 /* UTF-16 code pair: */
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1498 if (q >= e) {
dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1499 errmsg = "unexpected end of data";
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1500 startinpos = (((const char *)q)-2)-starts;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1501 endinpos = ((const char *)e)-starts;
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1502 goto utf16Error;
dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1503 }
18295 20e3a6e10c24 When decoding UTF-16, don't assume that the buffer is in native endianness Martin v. Löwis <martin@v.loewis.de> parents: 18292 diff changeset	1504 if (0xD800 <= ch && ch <= 0xDBFF) {
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1505 Py_UNICODE ch2 = (q[ihi] << 8) \| q[ilo];
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1506 q += 2;
18295 20e3a6e10c24 When decoding UTF-16, don't assume that the buffer is in native endianness Martin v. Löwis <martin@v.loewis.de> parents: 18292 diff changeset	1507 if (0xDC00 <= ch2 && ch2 <= 0xDFFF) {
18324 3ba7a358ce02 use Py_UNICODE_WIDE instead of USE_UCS4_STORAGE and Py_UNICODE_SIZE Fredrik Lundh <fredrik@pythonware.com> parents: 18298 diff changeset	1508 #ifndef Py_UNICODE_WIDE
18774 57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1509 *p++ = ch;
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1510 *p++ = ch2;
18292 ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1511 #else
ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1512 *p++ = (((ch & 0x3FF)<<10) \| (ch2 & 0x3FF)) + 0x10000;
18774 57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1513 #endif
18292 ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1514 continue;
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1515 }
18292 ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1516 else {
ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1517 errmsg = "illegal UTF-16 surrogate";
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1518 startinpos = (((const char *)q)-4)-starts;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1519 endinpos = startinpos+2;
18292 ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1520 goto utf16Error;
ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1521 }
ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1522
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1523 }
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1524 errmsg = "illegal encoding";
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1525 startinpos = (((const char *)q)-2)-starts;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1526 endinpos = startinpos+2;
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1527 /* Fall through to report the error */
dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1528
dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1529 utf16Error:
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1530 outpos = p-PyUnicode_AS_UNICODE(unicode);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1531 if (unicode_decode_call_errorhandler(
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1532 errors, &errorHandler,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1533 "utf16", errmsg,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1534 starts, size, &startinpos, &endinpos, &exc, (const char **)&q,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1535 (PyObject **)&unicode, &outpos, &p))
13635 dfb7ecfffe3d Fixed problems with UTF error reporting macros and some formatting bugs. Marc-André Lemburg <mal@egenix.com> parents: 13633 diff changeset	1536 goto onError;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1537 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1538
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1539 if (byteorder)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1540 *byteorder = bo;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1541
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1542 /* Adjust length */
30431 cd0c3f916b34 Change checks of PyUnicode_Resize() return value for clarity. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30216 diff changeset	1543 if (_PyUnicode_Resize(&unicode, p - unicode->str) < 0)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1544 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1545
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1546 Py_XDECREF(errorHandler);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1547 Py_XDECREF(exc);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1548 return (PyObject *)unicode;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1549
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1550 onError:
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1551 Py_DECREF(unicode);
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1552 Py_XDECREF(errorHandler);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1553 Py_XDECREF(exc);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1554 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1555 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1556
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1557 PyObject *
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1558 PyUnicode_EncodeUTF16(const Py_UNICODE *s,
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1559 int size,
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1560 const char *errors,
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1561 int byteorder)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1562 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1563 PyObject *v;
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1564 unsigned char *p;
31238 4edf200a8118 SF #859573: Reduce compiler warnings on gcc 3.2 and above. Hye-Shik Chang <hyeshik@gmail.com> parents: 31199 diff changeset	1565 #ifdef Py_UNICODE_WIDE
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1566 int i, pairs;
31238 4edf200a8118 SF #859573: Reduce compiler warnings on gcc 3.2 and above. Hye-Shik Chang <hyeshik@gmail.com> parents: 31199 diff changeset	1567 #else
4edf200a8118 SF #859573: Reduce compiler warnings on gcc 3.2 and above. Hye-Shik Chang <hyeshik@gmail.com> parents: 31199 diff changeset	1568 const int pairs = 0;
4edf200a8118 SF #859573: Reduce compiler warnings on gcc 3.2 and above. Hye-Shik Chang <hyeshik@gmail.com> parents: 31199 diff changeset	1569 #endif
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1570 /* Offsets from p for storing byte pairs in the right order. */
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1571 #ifdef BYTEORDER_IS_LITTLE_ENDIAN
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1572 int ihi = 1, ilo = 0;
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1573 #else
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1574 int ihi = 0, ilo = 1;
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1575 #endif
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1576
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1577 #define STORECHAR(CH) \
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1578 do { \
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1579 p[ihi] = ((CH) >> 8) & 0xff; \
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1580 p[ilo] = (CH) & 0xff; \
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1581 p += 2; \
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1582 } while(0)
18292 ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1583
31238 4edf200a8118 SF #859573: Reduce compiler warnings on gcc 3.2 and above. Hye-Shik Chang <hyeshik@gmail.com> parents: 31199 diff changeset	1584 #ifdef Py_UNICODE_WIDE
18292 ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1585 for (i = pairs = 0; i < size; i++)
ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1586 if (s[i] >= 0x10000)
ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1587 pairs++;
31238 4edf200a8118 SF #859573: Reduce compiler warnings on gcc 3.2 and above. Hye-Shik Chang <hyeshik@gmail.com> parents: 31199 diff changeset	1588 #endif
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	1589 v = PyString_FromStringAndSize(NULL,
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1590 2 * (size + pairs + (byteorder == 0)));
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1591 if (v == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1592 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1593
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1594 p = (unsigned char *)PyString_AS_STRING(v);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1595 if (byteorder == 0)
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1596 STORECHAR(0xFEFF);
13396 759f698740cc Fix to bug #393 (UTF16 codec didn't like empty strings) and Marc-André Lemburg <mal@egenix.com> parents: 13394 diff changeset	1597 if (size == 0)
13966 91ddeed12fa7 Fixed a couple of instances where a 0-length string was being Marc-André Lemburg <mal@egenix.com> parents: 13946 diff changeset	1598 return v;
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1599
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1600 if (byteorder == -1) {
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1601 /* force LE */
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1602 ihi = 1;
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1603 ilo = 0;
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1604 }
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1605 else if (byteorder == 1) {
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1606 /* force BE */
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1607 ihi = 0;
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1608 ilo = 1;
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1609 }
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1610
18292 ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1611 while (size-- > 0) {
ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1612 Py_UNICODE ch = *s++;
ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1613 Py_UNICODE ch2 = 0;
31238 4edf200a8118 SF #859573: Reduce compiler warnings on gcc 3.2 and above. Hye-Shik Chang <hyeshik@gmail.com> parents: 31199 diff changeset	1614 #ifdef Py_UNICODE_WIDE
18292 ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1615 if (ch >= 0x10000) {
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1616 ch2 = 0xDC00 \| ((ch-0x10000) & 0x3FF);
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1617 ch = 0xD800 \| ((ch-0x10000) >> 10);
18292 ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1618 }
31238 4edf200a8118 SF #859573: Reduce compiler warnings on gcc 3.2 and above. Hye-Shik Chang <hyeshik@gmail.com> parents: 31199 diff changeset	1619 #endif
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1620 STORECHAR(ch);
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1621 if (ch2)
77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1622 STORECHAR(ch2);
18292 ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1623 }
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1624 return v;
19121 77e405f3a942 SF patch #438013 Remove 2-byte Py_UCS2 assumptions Tim Peters <tim.peters@gmail.com> parents: 18933 diff changeset	1625 #undef STORECHAR
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1626 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1627
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1628 PyObject PyUnicode_AsUTF16String(PyObject unicode)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1629 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1630 if (!PyUnicode_Check(unicode)) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1631 PyErr_BadArgument();
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1632 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1633 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1634 return PyUnicode_EncodeUTF16(PyUnicode_AS_UNICODE(unicode),
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1635 PyUnicode_GET_SIZE(unicode),
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1636 NULL,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1637 0);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1638 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1639
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1640 /* --- Unicode Escape Codec ----------------------------------------------- */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1641
16200 3484670c37f2 Move uchhash functionality into unicodedata (after the recent Fredrik Lundh <fredrik@pythonware.com> parents: 16064 diff changeset	1642 static _PyUnicode_Name_CAPI *ucnhash_CAPI = NULL;
13063 eb243443b884 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13049 diff changeset	1643
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1644 PyObject PyUnicode_DecodeUnicodeEscape(const char s,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1645 int size,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1646 const char *errors)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1647 {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1648 const char *starts = s;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1649 int startinpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1650 int endinpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1651 int outpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1652 int i;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1653 PyUnicodeObject *v;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1654 Py_UNICODE *p;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1655 const char *end;
16667 725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1656 char* message;
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1657 Py_UCS4 chr = 0xffffffff; /* in case 'getcode' messes up */
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1658 PyObject *errorHandler = NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1659 PyObject *exc = NULL;
16667 725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1660
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1661 /* Escaped strings will always be longer than the resulting
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1662 Unicode string, so we start with size here and then reduce the
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1663 length after conversion to the true value.
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1664 (but if the error callback returns a long replacement string
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1665 we'll have to allocate more space) */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1666 v = _PyUnicode_New(size);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1667 if (v == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1668 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1669 if (size == 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1670 return (PyObject *)v;
16667 725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1671
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1672 p = PyUnicode_AS_UNICODE(v);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1673 end = s + size;
16667 725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1674
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1675 while (s < end) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1676 unsigned char c;
13396 759f698740cc Fix to bug #393 (UTF16 codec didn't like empty strings) and Marc-André Lemburg <mal@egenix.com> parents: 13394 diff changeset	1677 Py_UNICODE x;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1678 int digits;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1679
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1680 /* Non-escape characters are interpreted as Unicode ordinals */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1681 if (*s != '\\') {
16667 725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1682 p++ = (unsigned char) s++;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1683 continue;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1684 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1685
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1686 startinpos = s-starts;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1687 /* \ - Escapes */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1688 s++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1689 switch (*s++) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1690
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1691 /* \x escapes */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1692 case '\n': break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1693 case '\\': *p++ = '\\'; break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1694 case '\'': *p++ = '\''; break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1695 case '\"': *p++ = '\"'; break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1696 case 'b': *p++ = '\b'; break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1697 case 'f': p++ = '\014'; break; / FF */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1698 case 't': *p++ = '\t'; break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1699 case 'n': *p++ = '\n'; break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1700 case 'r': *p++ = '\r'; break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1701 case 'v': p++ = '\013'; break; / VT */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1702 case 'a': p++ = '\007'; break; / BEL, not classic C */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1703
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1704 /* \OOO (octal) escapes */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1705 case '0': case '1': case '2': case '3':
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1706 case '4': case '5': case '6': case '7':
12544 599bfa4ffd49 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12511 diff changeset	1707 x = s[-1] - '0';
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1708 if ('0' <= s && s <= '7') {
12544 599bfa4ffd49 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12511 diff changeset	1709 x = (x<<3) + *s++ - '0';
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1710 if ('0' <= s && s <= '7')
12544 599bfa4ffd49 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12511 diff changeset	1711 x = (x<<3) + *s++ - '0';
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1712 }
12544 599bfa4ffd49 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12511 diff changeset	1713 *p++ = x;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1714 break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1715
16667 725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1716 /* hex escapes */
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1717 /* \xXX */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1718 case 'x':
16667 725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1719 digits = 2;
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1720 message = "truncated \\xXX escape";
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1721 goto hexescape;
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1722
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1723 /* \uXXXX */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1724 case 'u':
16667 725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1725 digits = 4;
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1726 message = "truncated \\uXXXX escape";
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1727 goto hexescape;
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1728
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1729 /* \UXXXXXXXX */
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1730 case 'U':
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1731 digits = 8;
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1732 message = "truncated \\UXXXXXXXX escape";
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1733 hexescape:
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1734 chr = 0;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1735 outpos = p-PyUnicode_AS_UNICODE(v);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1736 if (s+digits>end) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1737 endinpos = size;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1738 if (unicode_decode_call_errorhandler(
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1739 errors, &errorHandler,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1740 "unicodeescape", "end of string in escape sequence",
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1741 starts, size, &startinpos, &endinpos, &exc, &s,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1742 (PyObject **)&v, &outpos, &p))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1743 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1744 goto nextByte;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1745 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1746 for (i = 0; i < digits; ++i) {
16667 725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1747 c = (unsigned char) s[i];
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1748 if (!isxdigit(c)) {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1749 endinpos = (s+i+1)-starts;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1750 if (unicode_decode_call_errorhandler(
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1751 errors, &errorHandler,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1752 "unicodeescape", message,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1753 starts, size, &startinpos, &endinpos, &exc, &s,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1754 (PyObject **)&v, &outpos, &p))
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1755 goto onError;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1756 goto nextByte;
14388 ef2714bb0730 changed \x to consume exactly two hex digits, also for unicode Fredrik Lundh <fredrik@pythonware.com> parents: 14067 diff changeset	1757 }
ef2714bb0730 changed \x to consume exactly two hex digits, also for unicode Fredrik Lundh <fredrik@pythonware.com> parents: 14067 diff changeset	1758 chr = (chr<<4) & ~0xF;
ef2714bb0730 changed \x to consume exactly two hex digits, also for unicode Fredrik Lundh <fredrik@pythonware.com> parents: 14067 diff changeset	1759 if (c >= '0' && c <= '9')
ef2714bb0730 changed \x to consume exactly two hex digits, also for unicode Fredrik Lundh <fredrik@pythonware.com> parents: 14067 diff changeset	1760 chr += c - '0';
ef2714bb0730 changed \x to consume exactly two hex digits, also for unicode Fredrik Lundh <fredrik@pythonware.com> parents: 14067 diff changeset	1761 else if (c >= 'a' && c <= 'f')
ef2714bb0730 changed \x to consume exactly two hex digits, also for unicode Fredrik Lundh <fredrik@pythonware.com> parents: 14067 diff changeset	1762 chr += 10 + c - 'a';
ef2714bb0730 changed \x to consume exactly two hex digits, also for unicode Fredrik Lundh <fredrik@pythonware.com> parents: 14067 diff changeset	1763 else
ef2714bb0730 changed \x to consume exactly two hex digits, also for unicode Fredrik Lundh <fredrik@pythonware.com> parents: 14067 diff changeset	1764 chr += 10 + c - 'A';
ef2714bb0730 changed \x to consume exactly two hex digits, also for unicode Fredrik Lundh <fredrik@pythonware.com> parents: 14067 diff changeset	1765 }
ef2714bb0730 changed \x to consume exactly two hex digits, also for unicode Fredrik Lundh <fredrik@pythonware.com> parents: 14067 diff changeset	1766 s += i;
30653 3b47d6057151 Fix for SF bug [ 817156 ] invalid \U escape gives 0=length unistr. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30441 diff changeset	1767 if (chr == 0xffffffff && PyErr_Occurred())
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1768 /* _decoding_error will have already written into the
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1769 target buffer. */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1770 break;
16667 725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1771 store:
14388 ef2714bb0730 changed \x to consume exactly two hex digits, also for unicode Fredrik Lundh <fredrik@pythonware.com> parents: 14067 diff changeset	1772 /* when we get here, chr is a 32-bit unicode character */
ef2714bb0730 changed \x to consume exactly two hex digits, also for unicode Fredrik Lundh <fredrik@pythonware.com> parents: 14067 diff changeset	1773 if (chr <= 0xffff)
ef2714bb0730 changed \x to consume exactly two hex digits, also for unicode Fredrik Lundh <fredrik@pythonware.com> parents: 14067 diff changeset	1774 /* UCS-2 character */
ef2714bb0730 changed \x to consume exactly two hex digits, also for unicode Fredrik Lundh <fredrik@pythonware.com> parents: 14067 diff changeset	1775 *p++ = (Py_UNICODE) chr;
ef2714bb0730 changed \x to consume exactly two hex digits, also for unicode Fredrik Lundh <fredrik@pythonware.com> parents: 14067 diff changeset	1776 else if (chr <= 0x10ffff) {
18774 57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1777 /* UCS-4 character. Either store directly, or as
22521 795bdd692176 Fix whitespace. Walter Dörwald <walter@livinglogic.de> parents: 22446 diff changeset	1778 surrogate pair. */
18324 3ba7a358ce02 use Py_UNICODE_WIDE instead of USE_UCS4_STORAGE and Py_UNICODE_SIZE Fredrik Lundh <fredrik@pythonware.com> parents: 18298 diff changeset	1779 #ifdef Py_UNICODE_WIDE
18292 ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1780 *p++ = chr;
ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1781 #else
14388 ef2714bb0730 changed \x to consume exactly two hex digits, also for unicode Fredrik Lundh <fredrik@pythonware.com> parents: 14067 diff changeset	1782 chr -= 0x10000L;
ef2714bb0730 changed \x to consume exactly two hex digits, also for unicode Fredrik Lundh <fredrik@pythonware.com> parents: 14067 diff changeset	1783 *p++ = 0xD800 + (Py_UNICODE) (chr >> 10);
18279 8b7ff44b4669 experimental UCS-4 support: made compare a bit more robust, in case Fredrik Lundh <fredrik@pythonware.com> parents: 18278 diff changeset	1784 *p++ = 0xDC00 + (Py_UNICODE) (chr & 0x03FF);
18292 ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1785 #endif
14388 ef2714bb0730 changed \x to consume exactly two hex digits, also for unicode Fredrik Lundh <fredrik@pythonware.com> parents: 14067 diff changeset	1786 } else {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1787 endinpos = s-starts;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1788 outpos = p-PyUnicode_AS_UNICODE(v);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1789 if (unicode_decode_call_errorhandler(
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1790 errors, &errorHandler,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1791 "unicodeescape", "illegal Unicode character",
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1792 starts, size, &startinpos, &endinpos, &exc, &s,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1793 (PyObject **)&v, &outpos, &p))
14388 ef2714bb0730 changed \x to consume exactly two hex digits, also for unicode Fredrik Lundh <fredrik@pythonware.com> parents: 14067 diff changeset	1794 goto onError;
ef2714bb0730 changed \x to consume exactly two hex digits, also for unicode Fredrik Lundh <fredrik@pythonware.com> parents: 14067 diff changeset	1795 }
16667 725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1796 break;
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1797
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1798 /* \N{name} */
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1799 case 'N':
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1800 message = "malformed \\N character escape";
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1801 if (ucnhash_CAPI == NULL) {
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1802 /* load the unicode data module */
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1803 PyObject m, v;
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1804 m = PyImport_ImportModule("unicodedata");
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1805 if (m == NULL)
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1806 goto ucnhashError;
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1807 v = PyObject_GetAttrString(m, "ucnhash_CAPI");
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1808 Py_DECREF(m);
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1809 if (v == NULL)
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1810 goto ucnhashError;
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1811 ucnhash_CAPI = PyCObject_AsVoidPtr(v);
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1812 Py_DECREF(v);
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1813 if (ucnhash_CAPI == NULL)
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1814 goto ucnhashError;
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1815 }
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1816 if (*s == '{') {
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1817 const char *start = s+1;
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1818 /* look for the closing brace */
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1819 while (*s != '}' && s < end)
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1820 s++;
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1821 if (s > start && s < end && *s == '}') {
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1822 /* found a name. look it up in the unicode database */
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1823 message = "unknown Unicode character name";
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1824 s++;
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1825 if (ucnhash_CAPI->getcode(start, s-start-1, &chr))
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1826 goto store;
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1827 }
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1828 }
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1829 endinpos = s-starts;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1830 outpos = p-PyUnicode_AS_UNICODE(v);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1831 if (unicode_decode_call_errorhandler(
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1832 errors, &errorHandler,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1833 "unicodeescape", message,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1834 starts, size, &startinpos, &endinpos, &exc, &s,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1835 (PyObject **)&v, &outpos, &p))
16667 725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1836 goto onError;
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1837 break;
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1838
725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1839 default:
22521 795bdd692176 Fix whitespace. Walter Dörwald <walter@livinglogic.de> parents: 22446 diff changeset	1840 if (s > end) {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1841 message = "\\ at end of string";
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1842 s--;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1843 endinpos = s-starts;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1844 outpos = p-PyUnicode_AS_UNICODE(v);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1845 if (unicode_decode_call_errorhandler(
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1846 errors, &errorHandler,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1847 "unicodeescape", message,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1848 starts, size, &startinpos, &endinpos, &exc, &s,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1849 (PyObject **)&v, &outpos, &p))
22521 795bdd692176 Fix whitespace. Walter Dörwald <walter@livinglogic.de> parents: 22446 diff changeset	1850 goto onError;
795bdd692176 Fix whitespace. Walter Dörwald <walter@livinglogic.de> parents: 22446 diff changeset	1851 }
795bdd692176 Fix whitespace. Walter Dörwald <walter@livinglogic.de> parents: 22446 diff changeset	1852 else {
795bdd692176 Fix whitespace. Walter Dörwald <walter@livinglogic.de> parents: 22446 diff changeset	1853 *p++ = '\\';
795bdd692176 Fix whitespace. Walter Dörwald <walter@livinglogic.de> parents: 22446 diff changeset	1854 *p++ = (unsigned char)s[-1];
795bdd692176 Fix whitespace. Walter Dörwald <walter@livinglogic.de> parents: 22446 diff changeset	1855 }
16667 725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1856 break;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1857 }
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1858 nextByte:
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1859 ;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1860 }
30431 cd0c3f916b34 Change checks of PyUnicode_Resize() return value for clarity. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30216 diff changeset	1861 if (_PyUnicode_Resize(&v, (int)(p - PyUnicode_AS_UNICODE(v))) < 0)
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1862 goto onError;
30160 3329b058db20 Fix another refcounting leak (in PyUnicode_DecodeUnicodeEscape()). Walter Dörwald <walter@livinglogic.de> parents: 30149 diff changeset	1863 Py_XDECREF(errorHandler);
3329b058db20 Fix another refcounting leak (in PyUnicode_DecodeUnicodeEscape()). Walter Dörwald <walter@livinglogic.de> parents: 30149 diff changeset	1864 Py_XDECREF(exc);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1865 return (PyObject *)v;
22521 795bdd692176 Fix whitespace. Walter Dörwald <walter@livinglogic.de> parents: 22446 diff changeset	1866
16667 725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1867 ucnhashError:
16200 3484670c37f2 Move uchhash functionality into unicodedata (after the recent Fredrik Lundh <fredrik@pythonware.com> parents: 16064 diff changeset	1868 PyErr_SetString(
3484670c37f2 Move uchhash functionality into unicodedata (after the recent Fredrik Lundh <fredrik@pythonware.com> parents: 16064 diff changeset	1869 PyExc_UnicodeError,
3484670c37f2 Move uchhash functionality into unicodedata (after the recent Fredrik Lundh <fredrik@pythonware.com> parents: 16064 diff changeset	1870 "\\N escapes not supported (can't load unicodedata module)"
3484670c37f2 Move uchhash functionality into unicodedata (after the recent Fredrik Lundh <fredrik@pythonware.com> parents: 16064 diff changeset	1871 );
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1872 Py_XDECREF(errorHandler);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1873 Py_XDECREF(exc);
16064 a97aa9238771 Better error message if ucnhash cannot be found (obscure attribute Fredrik Lundh <fredrik@pythonware.com> parents: 16029 diff changeset	1874 return NULL;
a97aa9238771 Better error message if ucnhash cannot be found (obscure attribute Fredrik Lundh <fredrik@pythonware.com> parents: 16029 diff changeset	1875
16667 725238293869 reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it Fredrik Lundh <fredrik@pythonware.com> parents: 16332 diff changeset	1876 onError:
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1877 Py_XDECREF(v);
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1878 Py_XDECREF(errorHandler);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	1879 Py_XDECREF(exc);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1880 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1881 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1882
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1883 /* Return a Unicode-Escape string version of the Unicode object.
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1884
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1885 If quotes is true, the string is enclosed in u"" or u'' quotes as
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1886 appropriate.
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1887
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1888 */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1889
12025 7994d9db7f4d On 17-Mar-2000, Marc-Andre Lemburg said: Barry Warsaw <barry@python.org> parents: 11997 diff changeset	1890 static const Py_UNICODE findchar(const Py_UNICODE s,
7994d9db7f4d On 17-Mar-2000, Marc-Andre Lemburg said: Barry Warsaw <barry@python.org> parents: 11997 diff changeset	1891 int size,
7994d9db7f4d On 17-Mar-2000, Marc-Andre Lemburg said: Barry Warsaw <barry@python.org> parents: 11997 diff changeset	1892 Py_UNICODE ch);
7994d9db7f4d On 17-Mar-2000, Marc-Andre Lemburg said: Barry Warsaw <barry@python.org> parents: 11997 diff changeset	1893
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1894 static
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1895 PyObject unicodeescape_string(const Py_UNICODE s,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1896 int size,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1897 int quotes)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1898 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1899 PyObject *repr;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1900 char *p;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1901
16226 c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16200 diff changeset	1902 static const char *hexdigit = "0123456789abcdef";
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1903
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1904 repr = PyString_FromStringAndSize(NULL, 2 + 6*size + 1);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1905 if (repr == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1906 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1907
18828 081d96fbcf43 Fix for bug #444493: u'\U00010001' segfaults with current CVS on Marc-André Lemburg <mal@egenix.com> parents: 18774 diff changeset	1908 p = PyString_AS_STRING(repr);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1909
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1910 if (quotes) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1911 *p++ = 'u';
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	1912 *p++ = (findchar(s, size, '\'') &&
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1913 !findchar(s, size, '"')) ? '"' : '\'';
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1914 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1915 while (size-- > 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1916 Py_UNICODE ch = *s++;
18828 081d96fbcf43 Fix for bug #444493: u'\U00010001' segfaults with current CVS on Marc-André Lemburg <mal@egenix.com> parents: 18774 diff changeset	1917
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1918 /* Escape quotes */
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	1919 if (quotes &&
18828 081d96fbcf43 Fix for bug #444493: u'\U00010001' segfaults with current CVS on Marc-André Lemburg <mal@egenix.com> parents: 18774 diff changeset	1920 (ch == (Py_UNICODE) PyString_AS_STRING(repr)[1] \|\| ch == '\\')) {
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1921 *p++ = '\\';
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1922 *p++ = (char) ch;
20018 8aa1ada33f64 Fix a bug in rendering of \\ by repr() -- it rendered as \\\ instead Guido van Rossum <guido@python.org> parents: 20007 diff changeset	1923 continue;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	1924 }
18828 081d96fbcf43 Fix for bug #444493: u'\U00010001' segfaults with current CVS on Marc-André Lemburg <mal@egenix.com> parents: 18774 diff changeset	1925
18773 743f8e1d953c #ifdef out generation of \U escapes unless Py_UNICODE_WIDE. This Guido van Rossum <guido@python.org> parents: 18324 diff changeset	1926 #ifdef Py_UNICODE_WIDE
18292 ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1927 /* Map 21-bit characters to '\U00xxxxxx' */
ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1928 else if (ch >= 0x10000) {
18828 081d96fbcf43 Fix for bug #444493: u'\U00010001' segfaults with current CVS on Marc-André Lemburg <mal@egenix.com> parents: 18774 diff changeset	1929 int offset = p - PyString_AS_STRING(repr);
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	1930
18828 081d96fbcf43 Fix for bug #444493: u'\U00010001' segfaults with current CVS on Marc-André Lemburg <mal@egenix.com> parents: 18774 diff changeset	1931 /* Resize the string if necessary */
081d96fbcf43 Fix for bug #444493: u'\U00010001' segfaults with current CVS on Marc-André Lemburg <mal@egenix.com> parents: 18774 diff changeset	1932 if (offset + 12 > PyString_GET_SIZE(repr)) {
081d96fbcf43 Fix for bug #444493: u'\U00010001' segfaults with current CVS on Marc-André Lemburg <mal@egenix.com> parents: 18774 diff changeset	1933 if (_PyString_Resize(&repr, PyString_GET_SIZE(repr) + 100))
23295 6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23294 diff changeset	1934 return NULL;
18828 081d96fbcf43 Fix for bug #444493: u'\U00010001' segfaults with current CVS on Marc-André Lemburg <mal@egenix.com> parents: 18774 diff changeset	1935 p = PyString_AS_STRING(repr) + offset;
081d96fbcf43 Fix for bug #444493: u'\U00010001' segfaults with current CVS on Marc-André Lemburg <mal@egenix.com> parents: 18774 diff changeset	1936 }
081d96fbcf43 Fix for bug #444493: u'\U00010001' segfaults with current CVS on Marc-André Lemburg <mal@egenix.com> parents: 18774 diff changeset	1937
18292 ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1938 *p++ = '\\';
ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1939 *p++ = 'U';
18774 57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1940 *p++ = hexdigit[(ch >> 28) & 0x0000000F];
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1941 *p++ = hexdigit[(ch >> 24) & 0x0000000F];
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1942 *p++ = hexdigit[(ch >> 20) & 0x0000000F];
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1943 *p++ = hexdigit[(ch >> 16) & 0x0000000F];
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1944 *p++ = hexdigit[(ch >> 12) & 0x0000000F];
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1945 *p++ = hexdigit[(ch >> 8) & 0x0000000F];
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1946 *p++ = hexdigit[(ch >> 4) & 0x0000000F];
18828 081d96fbcf43 Fix for bug #444493: u'\U00010001' segfaults with current CVS on Marc-André Lemburg <mal@egenix.com> parents: 18774 diff changeset	1947 *p++ = hexdigit[ch & 0x0000000F];
081d96fbcf43 Fix for bug #444493: u'\U00010001' segfaults with current CVS on Marc-André Lemburg <mal@egenix.com> parents: 18774 diff changeset	1948 continue;
18292 ffbb9c918ac0 Support using UCS-4 as the Py_UNICODE type: Martin v. Löwis <martin@v.loewis.de> parents: 18280 diff changeset	1949 }
18773 743f8e1d953c #ifdef out generation of \U escapes unless Py_UNICODE_WIDE. This Guido van Rossum <guido@python.org> parents: 18324 diff changeset	1950 #endif
18774 57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1951 /* Map UTF-16 surrogate pairs to Unicode \UXXXXXXXX escapes */
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1952 else if (ch >= 0xD800 && ch < 0xDC00) {
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1953 Py_UNICODE ch2;
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1954 Py_UCS4 ucs;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	1955
18774 57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1956 ch2 = *s++;
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1957 size--;
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1958 if (ch2 >= 0xDC00 && ch2 <= 0xDFFF) {
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1959 ucs = (((ch & 0x03FF) << 10) \| (ch2 & 0x03FF)) + 0x00010000;
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1960 *p++ = '\\';
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1961 *p++ = 'U';
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1962 *p++ = hexdigit[(ucs >> 28) & 0x0000000F];
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1963 *p++ = hexdigit[(ucs >> 24) & 0x0000000F];
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1964 *p++ = hexdigit[(ucs >> 20) & 0x0000000F];
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1965 *p++ = hexdigit[(ucs >> 16) & 0x0000000F];
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1966 *p++ = hexdigit[(ucs >> 12) & 0x0000000F];
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1967 *p++ = hexdigit[(ucs >> 8) & 0x0000000F];
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1968 *p++ = hexdigit[(ucs >> 4) & 0x0000000F];
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1969 *p++ = hexdigit[ucs & 0x0000000F];
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1970 continue;
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1971 }
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1972 /* Fall through: isolated surrogates are copied as-is */
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1973 s--;
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1974 size++;
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1975 }
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1976
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1977 /* Map 16-bit characters to '\uxxxx' */
18774 57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1978 if (ch >= 256) {
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1979 *p++ = '\\';
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1980 *p++ = 'u';
18774 57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1981 *p++ = hexdigit[(ch >> 12) & 0x000F];
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1982 *p++ = hexdigit[(ch >> 8) & 0x000F];
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1983 *p++ = hexdigit[(ch >> 4) & 0x000F];
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	1984 *p++ = hexdigit[ch & 0x000F];
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	1985 }
18828 081d96fbcf43 Fix for bug #444493: u'\U00010001' segfaults with current CVS on Marc-André Lemburg <mal@egenix.com> parents: 18774 diff changeset	1986
16226 c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16200 diff changeset	1987 /* Map special whitespace to '\t', \n', '\r' */
c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16200 diff changeset	1988 else if (ch == '\t') {
c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16200 diff changeset	1989 *p++ = '\\';
c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16200 diff changeset	1990 *p++ = 't';
c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16200 diff changeset	1991 }
c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16200 diff changeset	1992 else if (ch == '\n') {
c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16200 diff changeset	1993 *p++ = '\\';
c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16200 diff changeset	1994 *p++ = 'n';
c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16200 diff changeset	1995 }
c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16200 diff changeset	1996 else if (ch == '\r') {
c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16200 diff changeset	1997 *p++ = '\\';
c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16200 diff changeset	1998 *p++ = 'r';
c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16200 diff changeset	1999 }
18828 081d96fbcf43 Fix for bug #444493: u'\U00010001' segfaults with current CVS on Marc-André Lemburg <mal@egenix.com> parents: 18774 diff changeset	2000
16226 c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16200 diff changeset	2001 /* Map non-printable US ASCII to '\xhh' */
21067 c9c4c523dcbf Fix for bug #485951: repr diff between string and unicode. Marc-André Lemburg <mal@egenix.com> parents: 21028 diff changeset	2002 else if (ch < ' ' \|\| ch >= 0x7F) {
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2003 *p++ = '\\';
16226 c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16200 diff changeset	2004 *p++ = 'x';
18774 57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	2005 *p++ = hexdigit[(ch >> 4) & 0x000F];
57684d3cefce Make the unicode-escape and the UTF-16 codecs handle surrogates Marc-André Lemburg <mal@egenix.com> parents: 18773 diff changeset	2006 *p++ = hexdigit[ch & 0x000F];
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	2007 }
18828 081d96fbcf43 Fix for bug #444493: u'\U00010001' segfaults with current CVS on Marc-André Lemburg <mal@egenix.com> parents: 18774 diff changeset	2008
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2009 /* Copy everything else as-is */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2010 else
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2011 *p++ = (char) ch;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2012 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2013 if (quotes)
18828 081d96fbcf43 Fix for bug #444493: u'\U00010001' segfaults with current CVS on Marc-André Lemburg <mal@egenix.com> parents: 18774 diff changeset	2014 *p++ = PyString_AS_STRING(repr)[1];
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2015
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2016 *p = '\0';
23295 6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23294 diff changeset	2017 _PyString_Resize(&repr, p - PyString_AS_STRING(repr));
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2018 return repr;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2019 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2020
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2021 PyObject PyUnicode_EncodeUnicodeEscape(const Py_UNICODE s,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2022 int size)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2023 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2024 return unicodeescape_string(s, size, 0);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2025 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2026
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2027 PyObject PyUnicode_AsUnicodeEscapeString(PyObject unicode)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2028 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2029 if (!PyUnicode_Check(unicode)) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2030 PyErr_BadArgument();
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2031 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2032 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2033 return PyUnicode_EncodeUnicodeEscape(PyUnicode_AS_UNICODE(unicode),
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2034 PyUnicode_GET_SIZE(unicode));
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2035 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2036
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2037 /* --- Raw Unicode Escape Codec ------------------------------------------- */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2038
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2039 PyObject PyUnicode_DecodeRawUnicodeEscape(const char s,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2040 int size,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2041 const char *errors)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2042 {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2043 const char *starts = s;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2044 int startinpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2045 int endinpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2046 int outpos;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2047 PyUnicodeObject *v;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2048 Py_UNICODE *p;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2049 const char *end;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2050 const char *bs;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2051 PyObject *errorHandler = NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2052 PyObject *exc = NULL;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	2053
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2054 /* Escaped strings will always be longer than the resulting
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2055 Unicode string, so we start with size here and then reduce the
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2056 length after conversion to the true value. (But decoding error
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2057 handler might have to resize the string) */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2058 v = _PyUnicode_New(size);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2059 if (v == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2060 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2061 if (size == 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2062 return (PyObject *)v;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2063 p = PyUnicode_AS_UNICODE(v);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2064 end = s + size;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2065 while (s < end) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2066 unsigned char c;
22423 b523a470a0ce Do not insert characters for unicode-escape decoders if the error mode Martin v. Löwis <martin@v.loewis.de> parents: 22087 diff changeset	2067 Py_UCS4 x;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2068 int i;
29164 4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2069 int count;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2070
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2071 /* Non-escape characters are interpreted as Unicode ordinals */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2072 if (*s != '\\') {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2073 p++ = (unsigned char)s++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2074 continue;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2075 }
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2076 startinpos = s-starts;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2077
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2078 /* \u-escapes are only interpreted iff the number of leading
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2079 backslashes if odd */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2080 bs = s;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2081 for (;s < end;) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2082 if (*s != '\\')
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2083 break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2084 p++ = (unsigned char)s++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2085 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2086 if (((s - bs) & 1) == 0 \|\|
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2087 s >= end \|\|
29164 4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2088 (s != 'u' && s != 'U')) {
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2089 continue;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2090 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2091 p--;
29164 4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2092 count = *s=='u' ? 4 : 8;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2093 s++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2094
29164 4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2095 /* \uXXXX with 4 hex digits, \Uxxxxxxxx with 8 */
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2096 outpos = p-PyUnicode_AS_UNICODE(v);
29164 4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2097 for (x = 0, i = 0; i < count; ++i, ++s) {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2098 c = (unsigned char)*s;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2099 if (!isxdigit(c)) {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2100 endinpos = s-starts;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2101 if (unicode_decode_call_errorhandler(
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2102 errors, &errorHandler,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2103 "rawunicodeescape", "truncated \\uXXXX",
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2104 starts, size, &startinpos, &endinpos, &exc, &s,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2105 (PyObject **)&v, &outpos, &p))
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2106 goto onError;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2107 goto nextByte;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2108 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2109 x = (x<<4) & ~0xF;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2110 if (c >= '0' && c <= '9')
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2111 x += c - '0';
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2112 else if (c >= 'a' && c <= 'f')
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2113 x += 10 + c - 'a';
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2114 else
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2115 x += 10 + c - 'A';
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2116 }
29164 4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2117 #ifndef Py_UNICODE_WIDE
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2118 if (x > 0x10000) {
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2119 if (unicode_decode_call_errorhandler(
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2120 errors, &errorHandler,
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2121 "rawunicodeescape", "\\Uxxxxxxxx out of range",
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2122 starts, size, &startinpos, &endinpos, &exc, &s,
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2123 (PyObject **)&v, &outpos, &p))
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2124 goto onError;
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2125 }
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2126 #endif
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2127 *p++ = x;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2128 nextByte:
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2129 ;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2130 }
30431 cd0c3f916b34 Change checks of PyUnicode_Resize() return value for clarity. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30216 diff changeset	2131 if (_PyUnicode_Resize(&v, (int)(p - PyUnicode_AS_UNICODE(v))) < 0)
12329 3cc77848a62a Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	2132 goto onError;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2133 Py_XDECREF(errorHandler);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2134 Py_XDECREF(exc);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2135 return (PyObject *)v;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	2136
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2137 onError:
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2138 Py_XDECREF(v);
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2139 Py_XDECREF(errorHandler);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2140 Py_XDECREF(exc);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2141 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2142 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2143
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2144 PyObject PyUnicode_EncodeRawUnicodeEscape(const Py_UNICODE s,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2145 int size)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2146 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2147 PyObject *repr;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2148 char *p;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2149 char *q;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2150
16226 c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16200 diff changeset	2151 static const char *hexdigit = "0123456789abcdef";
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2152
29164 4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2153 #ifdef Py_UNICODE_WIDE
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2154 repr = PyString_FromStringAndSize(NULL, 10 * size);
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2155 #else
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2156 repr = PyString_FromStringAndSize(NULL, 6 * size);
29164 4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2157 #endif
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2158 if (repr == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2159 return NULL;
13966 91ddeed12fa7 Fixed a couple of instances where a 0-length string was being Marc-André Lemburg <mal@egenix.com> parents: 13946 diff changeset	2160 if (size == 0)
91ddeed12fa7 Fixed a couple of instances where a 0-length string was being Marc-André Lemburg <mal@egenix.com> parents: 13946 diff changeset	2161 return repr;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2162
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2163 p = q = PyString_AS_STRING(repr);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2164 while (size-- > 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2165 Py_UNICODE ch = *s++;
29164 4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2166 #ifdef Py_UNICODE_WIDE
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2167 /* Map 32-bit characters to '\Uxxxxxxxx' */
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2168 if (ch >= 0x10000) {
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2169 *p++ = '\\';
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2170 *p++ = 'U';
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2171 *p++ = hexdigit[(ch >> 28) & 0xf];
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2172 *p++ = hexdigit[(ch >> 24) & 0xf];
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2173 *p++ = hexdigit[(ch >> 20) & 0xf];
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2174 *p++ = hexdigit[(ch >> 16) & 0xf];
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2175 *p++ = hexdigit[(ch >> 12) & 0xf];
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2176 *p++ = hexdigit[(ch >> 8) & 0xf];
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2177 *p++ = hexdigit[(ch >> 4) & 0xf];
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2178 *p++ = hexdigit[ch & 15];
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	2179 }
29164 4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2180 else
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	2181 #endif
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2182 /* Map 16-bit characters to '\uxxxx' */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2183 if (ch >= 256) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2184 *p++ = '\\';
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2185 *p++ = 'u';
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2186 *p++ = hexdigit[(ch >> 12) & 0xf];
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2187 *p++ = hexdigit[(ch >> 8) & 0xf];
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2188 *p++ = hexdigit[(ch >> 4) & 0xf];
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2189 *p++ = hexdigit[ch & 15];
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2190 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2191 /* Copy everything else as-is */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2192 else
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2193 *p++ = (char) ch;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2194 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2195 *p = '\0';
23295 6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23294 diff changeset	2196 _PyString_Resize(&repr, p - q);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2197 return repr;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2198 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2199
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2200 PyObject PyUnicode_AsRawUnicodeEscapeString(PyObject unicode)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2201 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2202 if (!PyUnicode_Check(unicode)) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2203 PyErr_BadArgument();
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2204 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2205 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2206 return PyUnicode_EncodeRawUnicodeEscape(PyUnicode_AS_UNICODE(unicode),
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2207 PyUnicode_GET_SIZE(unicode));
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2208 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2209
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2210 /* --- Latin-1 Codec ------------------------------------------------------ */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2211
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2212 PyObject PyUnicode_DecodeLatin1(const char s,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2213 int size,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2214 const char *errors)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2215 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2216 PyUnicodeObject *v;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2217 Py_UNICODE *p;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	2218
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2219 /* Latin-1 is equivalent to the first 256 ordinals in Unicode. */
31238 4edf200a8118 SF #859573: Reduce compiler warnings on gcc 3.2 and above. Hye-Shik Chang <hyeshik@gmail.com> parents: 31199 diff changeset	2220 if (size == 1) {
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	2221 Py_UNICODE r = (unsigned char)s;
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	2222 return PyUnicode_FromUnicode(&r, 1);
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	2223 }
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	2224
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2225 v = _PyUnicode_New(size);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2226 if (v == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2227 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2228 if (size == 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2229 return (PyObject *)v;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2230 p = PyUnicode_AS_UNICODE(v);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2231 while (size-- > 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2232 p++ = (unsigned char)s++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2233 return (PyObject *)v;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	2234
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2235 onError:
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2236 Py_XDECREF(v);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2237 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2238 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2239
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2240 /* create or adjust a UnicodeEncodeError */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2241 static void make_encode_exception(PyObject **exceptionObject,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2242 const char *encoding,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2243 const Py_UNICODE *unicode, int size,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2244 int startpos, int endpos,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2245 const char *reason)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2246 {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2247 if (*exceptionObject == NULL) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2248 *exceptionObject = PyUnicodeEncodeError_Create(
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2249 encoding, unicode, size, startpos, endpos, reason);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2250 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2251 else {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2252 if (PyUnicodeEncodeError_SetStart(*exceptionObject, startpos))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2253 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2254 if (PyUnicodeEncodeError_SetEnd(*exceptionObject, endpos))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2255 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2256 if (PyUnicodeEncodeError_SetReason(*exceptionObject, reason))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2257 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2258 return;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2259 onError:
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2260 Py_DECREF(*exceptionObject);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2261 *exceptionObject = NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2262 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2263 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2264
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2265 /* raises a UnicodeEncodeError */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2266 static void raise_encode_exception(PyObject **exceptionObject,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2267 const char *encoding,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2268 const Py_UNICODE *unicode, int size,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2269 int startpos, int endpos,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2270 const char *reason)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2271 {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2272 make_encode_exception(exceptionObject,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2273 encoding, unicode, size, startpos, endpos, reason);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2274 if (*exceptionObject != NULL)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2275 PyCodec_StrictErrors(*exceptionObject);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2276 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2277
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2278 /* error handling callback helper:
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2279 build arguments, call the callback and check the arguments,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2280 put the result into newpos and return the replacement string, which
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2281 has to be freed by the caller */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2282 static PyObject unicode_encode_call_errorhandler(const char errors,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2283 PyObject **errorHandler,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2284 const char encoding, const char reason,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2285 const Py_UNICODE unicode, int size, PyObject *exceptionObject,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2286 int startpos, int endpos,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2287 int *newpos)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2288 {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2289 static char *argparse = "O!i;encoding error handler must return (unicode, int) tuple";
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2290
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2291 PyObject *restuple;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2292 PyObject *resunicode;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2293
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2294 if (*errorHandler == NULL) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2295 *errorHandler = PyCodec_LookupError(errors);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2296 if (*errorHandler == NULL)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2297 return NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2298 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2299
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2300 make_encode_exception(exceptionObject,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2301 encoding, unicode, size, startpos, endpos, reason);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2302 if (*exceptionObject == NULL)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2303 return NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2304
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2305 restuple = PyObject_CallFunctionObjArgs(
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2306 errorHandler, exceptionObject, NULL);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2307 if (restuple == NULL)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2308 return NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2309 if (!PyTuple_Check(restuple)) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2310 PyErr_Format(PyExc_TypeError, &argparse[4]);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2311 Py_DECREF(restuple);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2312 return NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2313 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2314 if (!PyArg_ParseTuple(restuple, argparse, &PyUnicode_Type,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2315 &resunicode, newpos)) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2316 Py_DECREF(restuple);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2317 return NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2318 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2319 if (*newpos<0)
27555 c267f28724dd Change the treatment of positions returned by PEP293 Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	2320 newpos = size+newpos;
c267f28724dd Change the treatment of positions returned by PEP293 Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	2321 if (newpos<0 \|\| newpos>size) {
c267f28724dd Change the treatment of positions returned by PEP293 Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	2322 PyErr_Format(PyExc_IndexError, "position %d from error handler out of bounds", *newpos);
c267f28724dd Change the treatment of positions returned by PEP293 Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	2323 Py_DECREF(restuple);
c267f28724dd Change the treatment of positions returned by PEP293 Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	2324 return NULL;
c267f28724dd Change the treatment of positions returned by PEP293 Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	2325 }
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2326 Py_INCREF(resunicode);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2327 Py_DECREF(restuple);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2328 return resunicode;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2329 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2330
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2331 static PyObject unicode_encode_ucs1(const Py_UNICODE p,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2332 int size,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2333 const char *errors,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2334 int limit)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2335 {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2336 /* output object */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2337 PyObject *res;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2338 /* pointers to the beginning and end+1 of input */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2339 const Py_UNICODE *startp = p;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2340 const Py_UNICODE *endp = p + size;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2341 /* pointer to the beginning of the unencodable characters */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2342 /* const Py_UNICODE badp = NULL; /
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2343 /* pointer into the output */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2344 char *str;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2345 /* current output position */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2346 int respos = 0;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2347 int ressize;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2348 char *encoding = (limit == 256) ? "latin-1" : "ascii";
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2349 char *reason = (limit == 256) ? "ordinal not in range(256)" : "ordinal not in range(128)";
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2350 PyObject *errorHandler = NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2351 PyObject *exc = NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2352 /* the following variable is used for caching string comparisons
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2353 * -1=not initialized, 0=unknown, 1=strict, 2=replace, 3=ignore, 4=xmlcharrefreplace */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2354 int known_errorHandler = -1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2355
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2356 /* allocate enough for a simple encoding without
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2357 replacements, if we need more, we'll resize */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2358 res = PyString_FromStringAndSize(NULL, size);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2359 if (res == NULL)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2360 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2361 if (size == 0)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2362 return res;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2363 str = PyString_AS_STRING(res);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2364 ressize = size;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2365
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2366 while (p<endp) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2367 Py_UNICODE c = *p;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2368
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2369 /* can we encode this? */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2370 if (c<limit) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2371 /* no overflow check, because we know that the space is enough */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2372 *str++ = (char)c;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2373 ++p;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2374 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2375 else {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2376 int unicodepos = p-startp;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2377 int requiredsize;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2378 PyObject *repunicode;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2379 int repsize;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2380 int newpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2381 int respos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2382 Py_UNICODE *uni2;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2383 /* startpos for collecting unencodable chars */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2384 const Py_UNICODE *collstart = p;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2385 const Py_UNICODE *collend = p;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2386 /* find all unecodable characters */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2387 while ((collend < endp) && ((*collend)>=limit))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2388 ++collend;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2389 /* cache callback name lookup (if not done yet, i.e. it's the first error) */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2390 if (known_errorHandler==-1) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2391 if ((errors==NULL) \|\| (!strcmp(errors, "strict")))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2392 known_errorHandler = 1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2393 else if (!strcmp(errors, "replace"))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2394 known_errorHandler = 2;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2395 else if (!strcmp(errors, "ignore"))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2396 known_errorHandler = 3;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2397 else if (!strcmp(errors, "xmlcharrefreplace"))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2398 known_errorHandler = 4;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2399 else
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2400 known_errorHandler = 0;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2401 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2402 switch (known_errorHandler) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2403 case 1: /* strict */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2404 raise_encode_exception(&exc, encoding, startp, size, collstart-startp, collend-startp, reason);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2405 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2406 case 2: /* replace */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2407 while (collstart++<collend)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2408 str++ = '?'; / fall through */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2409 case 3: /* ignore */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2410 p = collend;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2411 break;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2412 case 4: /* xmlcharrefreplace */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2413 respos = str-PyString_AS_STRING(res);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2414 /* determine replacement size (temporarily (mis)uses p) */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2415 for (p = collstart, repsize = 0; p < collend; ++p) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2416 if (*p<10)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2417 repsize += 2+1+1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2418 else if (*p<100)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2419 repsize += 2+2+1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2420 else if (*p<1000)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2421 repsize += 2+3+1;
31248 353a16033f6a Fix broken xmlcharrefreplace by rev 2.204. Hye-Shik Chang <hyeshik@gmail.com> parents: 31238 diff changeset	2422 else if (*p<10000)
353a16033f6a Fix broken xmlcharrefreplace by rev 2.204. Hye-Shik Chang <hyeshik@gmail.com> parents: 31238 diff changeset	2423 repsize += 2+4+1;
31238 4edf200a8118 SF #859573: Reduce compiler warnings on gcc 3.2 and above. Hye-Shik Chang <hyeshik@gmail.com> parents: 31199 diff changeset	2424 #ifndef Py_UNICODE_WIDE
4edf200a8118 SF #859573: Reduce compiler warnings on gcc 3.2 and above. Hye-Shik Chang <hyeshik@gmail.com> parents: 31199 diff changeset	2425 else
31248 353a16033f6a Fix broken xmlcharrefreplace by rev 2.204. Hye-Shik Chang <hyeshik@gmail.com> parents: 31238 diff changeset	2426 repsize += 2+5+1;
31238 4edf200a8118 SF #859573: Reduce compiler warnings on gcc 3.2 and above. Hye-Shik Chang <hyeshik@gmail.com> parents: 31199 diff changeset	2427 #else
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2428 else if (*p<100000)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2429 repsize += 2+5+1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2430 else if (*p<1000000)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2431 repsize += 2+6+1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2432 else
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2433 repsize += 2+7+1;
31238 4edf200a8118 SF #859573: Reduce compiler warnings on gcc 3.2 and above. Hye-Shik Chang <hyeshik@gmail.com> parents: 31199 diff changeset	2434 #endif
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2435 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2436 requiredsize = respos+repsize+(endp-collend);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2437 if (requiredsize > ressize) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2438 if (requiredsize<2*ressize)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2439 requiredsize = 2*ressize;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2440 if (_PyString_Resize(&res, requiredsize))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2441 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2442 str = PyString_AS_STRING(res) + respos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2443 ressize = requiredsize;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2444 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2445 /* generate replacement (temporarily (mis)uses p) */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2446 for (p = collstart; p < collend; ++p) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2447 str += sprintf(str, "&#%d;", (int)*p);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2448 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2449 p = collend;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2450 break;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2451 default:
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2452 repunicode = unicode_encode_call_errorhandler(errors, &errorHandler,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2453 encoding, reason, startp, size, &exc,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2454 collstart-startp, collend-startp, &newpos);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2455 if (repunicode == NULL)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2456 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2457 /* need more space? (at least enough for what we
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2458 have+the replacement+the rest of the string, so
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2459 we won't have to check space for encodable characters) */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2460 respos = str-PyString_AS_STRING(res);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2461 repsize = PyUnicode_GET_SIZE(repunicode);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2462 requiredsize = respos+repsize+(endp-collend);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2463 if (requiredsize > ressize) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2464 if (requiredsize<2*ressize)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2465 requiredsize = 2*ressize;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2466 if (_PyString_Resize(&res, requiredsize)) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2467 Py_DECREF(repunicode);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2468 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2469 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2470 str = PyString_AS_STRING(res) + respos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2471 ressize = requiredsize;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2472 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2473 /* check if there is anything unencodable in the replacement
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2474 and copy it to the output */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2475 for (uni2 = PyUnicode_AS_UNICODE(repunicode);repsize-->0; ++uni2, ++str) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2476 c = *uni2;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2477 if (c >= limit) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2478 raise_encode_exception(&exc, encoding, startp, size,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2479 unicodepos, unicodepos+1, reason);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2480 Py_DECREF(repunicode);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2481 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2482 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2483 *str = (char)c;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2484 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2485 p = startp + newpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2486 Py_DECREF(repunicode);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2487 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2488 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2489 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2490 /* Resize if we allocated to much */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2491 respos = str-PyString_AS_STRING(res);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2492 if (respos<ressize)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2493 /* If this falls res will be NULL */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2494 _PyString_Resize(&res, respos);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2495 Py_XDECREF(errorHandler);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2496 Py_XDECREF(exc);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2497 return res;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2498
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2499 onError:
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2500 Py_XDECREF(res);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2501 Py_XDECREF(errorHandler);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2502 Py_XDECREF(exc);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2503 return NULL;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2504 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2505
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2506 PyObject PyUnicode_EncodeLatin1(const Py_UNICODE p,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2507 int size,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2508 const char *errors)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2509 {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2510 return unicode_encode_ucs1(p, size, errors, 256);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2511 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2512
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2513 PyObject PyUnicode_AsLatin1String(PyObject unicode)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2514 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2515 if (!PyUnicode_Check(unicode)) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2516 PyErr_BadArgument();
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2517 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2518 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2519 return PyUnicode_EncodeLatin1(PyUnicode_AS_UNICODE(unicode),
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2520 PyUnicode_GET_SIZE(unicode),
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2521 NULL);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2522 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2523
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2524 /* --- 7-bit ASCII Codec -------------------------------------------------- */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2525
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2526 PyObject PyUnicode_DecodeASCII(const char s,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2527 int size,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2528 const char *errors)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2529 {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2530 const char *starts = s;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2531 PyUnicodeObject *v;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2532 Py_UNICODE *p;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2533 int startinpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2534 int endinpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2535 int outpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2536 const char *e;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2537 PyObject *errorHandler = NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2538 PyObject *exc = NULL;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	2539
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2540 /* ASCII is equivalent to the first 128 ordinals in Unicode. */
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	2541 if (size == 1 && (unsigned char)s < 128) {
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	2542 Py_UNICODE r = (unsigned char)s;
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	2543 return PyUnicode_FromUnicode(&r, 1);
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	2544 }
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	2545
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2546 v = _PyUnicode_New(size);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2547 if (v == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2548 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2549 if (size == 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2550 return (PyObject *)v;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2551 p = PyUnicode_AS_UNICODE(v);
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2552 e = s + size;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2553 while (s < e) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2554 register unsigned char c = (unsigned char)*s;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2555 if (c < 128) {
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2556 *p++ = c;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2557 ++s;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2558 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2559 else {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2560 startinpos = s-starts;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2561 endinpos = startinpos + 1;
30439 30e495efe90a Double-fix of crash in Unicode freelist handling. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30431 diff changeset	2562 outpos = p - (Py_UNICODE *)PyUnicode_AS_UNICODE(v);
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2563 if (unicode_decode_call_errorhandler(
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2564 errors, &errorHandler,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2565 "ascii", "ordinal not in range(128)",
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2566 starts, size, &startinpos, &endinpos, &exc, &s,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2567 (PyObject **)&v, &outpos, &p))
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2568 goto onError;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2569 }
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2570 }
12329 3cc77848a62a Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	2571 if (p - PyUnicode_AS_UNICODE(v) < PyString_GET_SIZE(v))
30431 cd0c3f916b34 Change checks of PyUnicode_Resize() return value for clarity. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30216 diff changeset	2572 if (_PyUnicode_Resize(&v, (int)(p - PyUnicode_AS_UNICODE(v))) < 0)
12329 3cc77848a62a Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	2573 goto onError;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2574 Py_XDECREF(errorHandler);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2575 Py_XDECREF(exc);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2576 return (PyObject *)v;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	2577
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2578 onError:
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2579 Py_XDECREF(v);
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2580 Py_XDECREF(errorHandler);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2581 Py_XDECREF(exc);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2582 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2583 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2584
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2585 PyObject PyUnicode_EncodeASCII(const Py_UNICODE p,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2586 int size,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2587 const char *errors)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2588 {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2589 return unicode_encode_ucs1(p, size, errors, 128);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2590 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2591
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2592 PyObject PyUnicode_AsASCIIString(PyObject unicode)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2593 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2594 if (!PyUnicode_Check(unicode)) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2595 PyErr_BadArgument();
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2596 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2597 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2598 return PyUnicode_EncodeASCII(PyUnicode_AS_UNICODE(unicode),
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2599 PyUnicode_GET_SIZE(unicode),
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2600 NULL);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2601 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2602
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 23837 diff changeset	2603 #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
12193 c3fc2b4617fc Some blank lines. Guido van Rossum <guido@python.org> parents: 12067 diff changeset	2604
12067 bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2605 /* --- MBCS codecs for Windows -------------------------------------------- */
12193 c3fc2b4617fc Some blank lines. Guido van Rossum <guido@python.org> parents: 12067 diff changeset	2606
12067 bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2607 PyObject PyUnicode_DecodeMBCS(const char s,
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2608 int size,
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2609 const char *errors)
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2610 {
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2611 PyUnicodeObject *v;
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2612 Py_UNICODE *p;
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2613
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2614 /* First get the size of the result */
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2615 DWORD usize = MultiByteToWideChar(CP_ACP, 0, s, size, NULL, 0);
12582 0bab1e36a3a6 Mark Hammond should get his act into gear (his words :-). Zero length Guido van Rossum <guido@python.org> parents: 12577 diff changeset	2616 if (size > 0 && usize==0)
12067 bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2617 return PyErr_SetFromWindowsErrWithFilename(0, NULL);
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2618
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2619 v = _PyUnicode_New(usize);
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2620 if (v == NULL)
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2621 return NULL;
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2622 if (usize == 0)
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2623 return (PyObject *)v;
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2624 p = PyUnicode_AS_UNICODE(v);
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2625 if (0 == MultiByteToWideChar(CP_ACP, 0, s, size, p, usize)) {
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2626 Py_DECREF(v);
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2627 return PyErr_SetFromWindowsErrWithFilename(0, NULL);
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2628 }
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2629
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2630 return (PyObject *)v;
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2631 }
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2632
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2633 PyObject PyUnicode_EncodeMBCS(const Py_UNICODE p,
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2634 int size,
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2635 const char *errors)
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2636 {
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2637 PyObject *repr;
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2638 char *s;
12582 0bab1e36a3a6 Mark Hammond should get his act into gear (his words :-). Zero length Guido van Rossum <guido@python.org> parents: 12577 diff changeset	2639 DWORD mbcssize;
0bab1e36a3a6 Mark Hammond should get his act into gear (his words :-). Zero length Guido van Rossum <guido@python.org> parents: 12577 diff changeset	2640
0bab1e36a3a6 Mark Hammond should get his act into gear (his words :-). Zero length Guido van Rossum <guido@python.org> parents: 12577 diff changeset	2641 /* If there are no characters, bail now! */
0bab1e36a3a6 Mark Hammond should get his act into gear (his words :-). Zero length Guido van Rossum <guido@python.org> parents: 12577 diff changeset	2642 if (size==0)
0bab1e36a3a6 Mark Hammond should get his act into gear (his words :-). Zero length Guido van Rossum <guido@python.org> parents: 12577 diff changeset	2643 return PyString_FromString("");
12067 bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2644
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2645 /* First get the size of the result */
12582 0bab1e36a3a6 Mark Hammond should get his act into gear (his words :-). Zero length Guido van Rossum <guido@python.org> parents: 12577 diff changeset	2646 mbcssize = WideCharToMultiByte(CP_ACP, 0, p, size, NULL, 0, NULL, NULL);
12067 bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2647 if (mbcssize==0)
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2648 return PyErr_SetFromWindowsErrWithFilename(0, NULL);
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2649
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2650 repr = PyString_FromStringAndSize(NULL, mbcssize);
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2651 if (repr == NULL)
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2652 return NULL;
13966 91ddeed12fa7 Fixed a couple of instances where a 0-length string was being Marc-André Lemburg <mal@egenix.com> parents: 13946 diff changeset	2653 if (mbcssize == 0)
12067 bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2654 return repr;
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2655
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2656 /* Do the conversion */
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2657 s = PyString_AS_STRING(repr);
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2658 if (0 == WideCharToMultiByte(CP_ACP, 0, p, size, s, mbcssize, NULL, NULL)) {
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2659 Py_DECREF(repr);
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2660 return PyErr_SetFromWindowsErrWithFilename(0, NULL);
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2661 }
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2662 return repr;
bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2663 }
12193 c3fc2b4617fc Some blank lines. Guido van Rossum <guido@python.org> parents: 12067 diff changeset	2664
29706 a4fead0e24f8 Support 'mbcs' as a 'built-in' encoding, so the C API can use it without Mark Hammond <mhammond@skippinet.com.au> parents: 29641 diff changeset	2665 PyObject PyUnicode_AsMBCSString(PyObject unicode)
a4fead0e24f8 Support 'mbcs' as a 'built-in' encoding, so the C API can use it without Mark Hammond <mhammond@skippinet.com.au> parents: 29641 diff changeset	2666 {
a4fead0e24f8 Support 'mbcs' as a 'built-in' encoding, so the C API can use it without Mark Hammond <mhammond@skippinet.com.au> parents: 29641 diff changeset	2667 if (!PyUnicode_Check(unicode)) {
a4fead0e24f8 Support 'mbcs' as a 'built-in' encoding, so the C API can use it without Mark Hammond <mhammond@skippinet.com.au> parents: 29641 diff changeset	2668 PyErr_BadArgument();
a4fead0e24f8 Support 'mbcs' as a 'built-in' encoding, so the C API can use it without Mark Hammond <mhammond@skippinet.com.au> parents: 29641 diff changeset	2669 return NULL;
a4fead0e24f8 Support 'mbcs' as a 'built-in' encoding, so the C API can use it without Mark Hammond <mhammond@skippinet.com.au> parents: 29641 diff changeset	2670 }
a4fead0e24f8 Support 'mbcs' as a 'built-in' encoding, so the C API can use it without Mark Hammond <mhammond@skippinet.com.au> parents: 29641 diff changeset	2671 return PyUnicode_EncodeMBCS(PyUnicode_AS_UNICODE(unicode),
a4fead0e24f8 Support 'mbcs' as a 'built-in' encoding, so the C API can use it without Mark Hammond <mhammond@skippinet.com.au> parents: 29641 diff changeset	2672 PyUnicode_GET_SIZE(unicode),
a4fead0e24f8 Support 'mbcs' as a 'built-in' encoding, so the C API can use it without Mark Hammond <mhammond@skippinet.com.au> parents: 29641 diff changeset	2673 NULL);
a4fead0e24f8 Support 'mbcs' as a 'built-in' encoding, so the C API can use it without Mark Hammond <mhammond@skippinet.com.au> parents: 29641 diff changeset	2674 }
a4fead0e24f8 Support 'mbcs' as a 'built-in' encoding, so the C API can use it without Mark Hammond <mhammond@skippinet.com.au> parents: 29641 diff changeset	2675
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 23837 diff changeset	2676 #endif /* MS_WINDOWS */
12067 bcab189ddf86 MBCS codecs. (Win32 only.) By Mark Hammond. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	2677
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2678 /* --- Character Mapping Codec -------------------------------------------- */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2679
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2680 PyObject PyUnicode_DecodeCharmap(const char s,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2681 int size,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2682 PyObject *mapping,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2683 const char *errors)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2684 {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2685 const char *starts = s;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2686 int startinpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2687 int endinpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2688 int outpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2689 const char *e;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2690 PyUnicodeObject *v;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2691 Py_UNICODE *p;
15749 77c761cd1272 This patch adds a new feature to the builtin charmap codec: Marc-André Lemburg <mal@egenix.com> parents: 15706 diff changeset	2692 int extrachars = 0;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2693 PyObject *errorHandler = NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2694 PyObject *exc = NULL;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	2695
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2696 /* Default to Latin-1 */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2697 if (mapping == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2698 return PyUnicode_DecodeLatin1(s, size, errors);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2699
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2700 v = _PyUnicode_New(size);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2701 if (v == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2702 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2703 if (size == 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2704 return (PyObject *)v;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2705 p = PyUnicode_AS_UNICODE(v);
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2706 e = s + size;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2707 while (s < e) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2708 unsigned char ch = *s;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2709 PyObject w, x;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2710
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2711 /* Get mapping (char ordinal -> integer, Unicode char or None) */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2712 w = PyInt_FromLong((long)ch);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2713 if (w == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2714 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2715 x = PyObject_GetItem(mapping, w);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2716 Py_DECREF(w);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2717 if (x == NULL) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2718 if (PyErr_ExceptionMatches(PyExc_LookupError)) {
15706 bf9bb0e3dd34 This patch changes the default behaviour of the builtin charmap Marc-André Lemburg <mal@egenix.com> parents: 15631 diff changeset	2719 /* No mapping found means: mapping is undefined. */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2720 PyErr_Clear();
15706 bf9bb0e3dd34 This patch changes the default behaviour of the builtin charmap Marc-André Lemburg <mal@egenix.com> parents: 15631 diff changeset	2721 x = Py_None;
bf9bb0e3dd34 This patch changes the default behaviour of the builtin charmap Marc-André Lemburg <mal@egenix.com> parents: 15631 diff changeset	2722 Py_INCREF(x);
bf9bb0e3dd34 This patch changes the default behaviour of the builtin charmap Marc-André Lemburg <mal@egenix.com> parents: 15631 diff changeset	2723 } else
15910 f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15749 diff changeset	2724 goto onError;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2725 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2726
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2727 /* Apply mapping */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2728 if (PyInt_Check(x)) {
13390 62754b9ec7df Fixed a couple of places where 'int' was used where 'long' Marc-André Lemburg <mal@egenix.com> parents: 13356 diff changeset	2729 long value = PyInt_AS_LONG(x);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2730 if (value < 0 \|\| value > 65535) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2731 PyErr_SetString(PyExc_TypeError,
12909 be36f103a953 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2732 "character mapping must be in range(65536)");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2733 Py_DECREF(x);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2734 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2735 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2736 *p++ = (Py_UNICODE)value;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2737 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2738 else if (x == Py_None) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2739 /* undefined mapping */
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2740 outpos = p-PyUnicode_AS_UNICODE(v);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2741 startinpos = s-starts;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2742 endinpos = startinpos+1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2743 if (unicode_decode_call_errorhandler(
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2744 errors, &errorHandler,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2745 "charmap", "character maps to <undefined>",
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2746 starts, size, &startinpos, &endinpos, &exc, &s,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2747 (PyObject **)&v, &outpos, &p)) {
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2748 Py_DECREF(x);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2749 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2750 }
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2751 continue;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2752 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2753 else if (PyUnicode_Check(x)) {
15749 77c761cd1272 This patch adds a new feature to the builtin charmap codec: Marc-André Lemburg <mal@egenix.com> parents: 15706 diff changeset	2754 int targetsize = PyUnicode_GET_SIZE(x);
77c761cd1272 This patch adds a new feature to the builtin charmap codec: Marc-André Lemburg <mal@egenix.com> parents: 15706 diff changeset	2755
77c761cd1272 This patch adds a new feature to the builtin charmap codec: Marc-André Lemburg <mal@egenix.com> parents: 15706 diff changeset	2756 if (targetsize == 1)
77c761cd1272 This patch adds a new feature to the builtin charmap codec: Marc-André Lemburg <mal@egenix.com> parents: 15706 diff changeset	2757 /* 1-1 mapping */
77c761cd1272 This patch adds a new feature to the builtin charmap codec: Marc-André Lemburg <mal@egenix.com> parents: 15706 diff changeset	2758 p++ = PyUnicode_AS_UNICODE(x);
77c761cd1272 This patch adds a new feature to the builtin charmap codec: Marc-André Lemburg <mal@egenix.com> parents: 15706 diff changeset	2759
77c761cd1272 This patch adds a new feature to the builtin charmap codec: Marc-André Lemburg <mal@egenix.com> parents: 15706 diff changeset	2760 else if (targetsize > 1) {
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2761 /* 1-n mapping */
15749 77c761cd1272 This patch adds a new feature to the builtin charmap codec: Marc-André Lemburg <mal@egenix.com> parents: 15706 diff changeset	2762 if (targetsize > extrachars) {
77c761cd1272 This patch adds a new feature to the builtin charmap codec: Marc-André Lemburg <mal@egenix.com> parents: 15706 diff changeset	2763 /* resize first */
77c761cd1272 This patch adds a new feature to the builtin charmap codec: Marc-André Lemburg <mal@egenix.com> parents: 15706 diff changeset	2764 int oldpos = (int)(p - PyUnicode_AS_UNICODE(v));
77c761cd1272 This patch adds a new feature to the builtin charmap codec: Marc-André Lemburg <mal@egenix.com> parents: 15706 diff changeset	2765 int needed = (targetsize - extrachars) + \
77c761cd1272 This patch adds a new feature to the builtin charmap codec: Marc-André Lemburg <mal@egenix.com> parents: 15706 diff changeset	2766 (targetsize << 2);
77c761cd1272 This patch adds a new feature to the builtin charmap codec: Marc-André Lemburg <mal@egenix.com> parents: 15706 diff changeset	2767 extrachars += needed;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	2768 if (_PyUnicode_Resize(&v,
30431 cd0c3f916b34 Change checks of PyUnicode_Resize() return value for clarity. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30216 diff changeset	2769 PyUnicode_GET_SIZE(v) + needed) < 0) {
15910 f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15749 diff changeset	2770 Py_DECREF(x);
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15749 diff changeset	2771 goto onError;
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15749 diff changeset	2772 }
15749 77c761cd1272 This patch adds a new feature to the builtin charmap codec: Marc-André Lemburg <mal@egenix.com> parents: 15706 diff changeset	2773 p = PyUnicode_AS_UNICODE(v) + oldpos;
77c761cd1272 This patch adds a new feature to the builtin charmap codec: Marc-André Lemburg <mal@egenix.com> parents: 15706 diff changeset	2774 }
77c761cd1272 This patch adds a new feature to the builtin charmap codec: Marc-André Lemburg <mal@egenix.com> parents: 15706 diff changeset	2775 Py_UNICODE_COPY(p,
77c761cd1272 This patch adds a new feature to the builtin charmap codec: Marc-André Lemburg <mal@egenix.com> parents: 15706 diff changeset	2776 PyUnicode_AS_UNICODE(x),
77c761cd1272 This patch adds a new feature to the builtin charmap codec: Marc-André Lemburg <mal@egenix.com> parents: 15706 diff changeset	2777 targetsize);
77c761cd1272 This patch adds a new feature to the builtin charmap codec: Marc-André Lemburg <mal@egenix.com> parents: 15706 diff changeset	2778 p += targetsize;
77c761cd1272 This patch adds a new feature to the builtin charmap codec: Marc-André Lemburg <mal@egenix.com> parents: 15706 diff changeset	2779 extrachars -= targetsize;
77c761cd1272 This patch adds a new feature to the builtin charmap codec: Marc-André Lemburg <mal@egenix.com> parents: 15706 diff changeset	2780 }
77c761cd1272 This patch adds a new feature to the builtin charmap codec: Marc-André Lemburg <mal@egenix.com> parents: 15706 diff changeset	2781 /* 1-0 mapping: skip the character */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2782 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2783 else {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2784 /* wrong return value */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2785 PyErr_SetString(PyExc_TypeError,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2786 "character mapping must return integer, None or unicode");
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2787 Py_DECREF(x);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2788 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2789 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2790 Py_DECREF(x);
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2791 ++s;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2792 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2793 if (p - PyUnicode_AS_UNICODE(v) < PyUnicode_GET_SIZE(v))
30431 cd0c3f916b34 Change checks of PyUnicode_Resize() return value for clarity. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30216 diff changeset	2794 if (_PyUnicode_Resize(&v, (int)(p - PyUnicode_AS_UNICODE(v))) < 0)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2795 goto onError;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2796 Py_XDECREF(errorHandler);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2797 Py_XDECREF(exc);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2798 return (PyObject *)v;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	2799
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2800 onError:
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2801 Py_XDECREF(errorHandler);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2802 Py_XDECREF(exc);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2803 Py_XDECREF(v);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2804 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2805 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2806
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2807 /* Lookup the character ch in the mapping. If the character
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2808 can't be found, Py_None is returned (or NULL, if another
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2809 error occured). */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2810 static PyObject charmapencode_lookup(Py_UNICODE c, PyObject mapping)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2811 {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2812 PyObject *w = PyInt_FromLong((long)c);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2813 PyObject *x;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2814
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2815 if (w == NULL)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2816 return NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2817 x = PyObject_GetItem(mapping, w);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2818 Py_DECREF(w);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2819 if (x == NULL) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2820 if (PyErr_ExceptionMatches(PyExc_LookupError)) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2821 /* No mapping found means: mapping is undefined. */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2822 PyErr_Clear();
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2823 x = Py_None;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2824 Py_INCREF(x);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2825 return x;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2826 } else
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2827 return NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2828 }
27175 47b134bb51c3 Fix charmapencode_lookup(), so that a None value in the mapping Walter Dörwald <walter@livinglogic.de> parents: 27170 diff changeset	2829 else if (x == Py_None)
47b134bb51c3 Fix charmapencode_lookup(), so that a None value in the mapping Walter Dörwald <walter@livinglogic.de> parents: 27170 diff changeset	2830 return x;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2831 else if (PyInt_Check(x)) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2832 long value = PyInt_AS_LONG(x);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2833 if (value < 0 \|\| value > 255) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2834 PyErr_SetString(PyExc_TypeError,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2835 "character mapping must be in range(256)");
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2836 Py_DECREF(x);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2837 return NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2838 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2839 return x;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2840 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2841 else if (PyString_Check(x))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2842 return x;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2843 else {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2844 /* wrong return value */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2845 PyErr_SetString(PyExc_TypeError,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2846 "character mapping must return integer, None or str");
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2847 Py_DECREF(x);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2848 return NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2849 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2850 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2851
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2852 /* lookup the character, put the result in the output string and adjust
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2853 various state variables. Reallocate the output string if not enough
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2854 space is available. Return a new reference to the object that
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2855 was put in the output buffer, or Py_None, if the mapping was undefined
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2856 (in which case no character was written) or NULL, if a
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2857 reallocation error ocurred. The called must decref the result */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2858 static
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2859 PyObject charmapencode_output(Py_UNICODE c, PyObject mapping,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2860 PyObject *outobj, int outpos)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2861 {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2862 PyObject *rep = charmapencode_lookup(c, mapping);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2863
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2864 if (rep==NULL)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2865 return NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2866 else if (rep==Py_None)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2867 return rep;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	2868 else {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2869 char outstart = PyString_AS_STRING(outobj);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2870 int outsize = PyString_GET_SIZE(*outobj);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2871 if (PyInt_Check(rep)) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2872 int requiredsize = *outpos+1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2873 if (outsize<requiredsize) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2874 /* exponentially overallocate to minimize reallocations */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2875 if (requiredsize < 2*outsize)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2876 requiredsize = 2*outsize;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2877 if (_PyString_Resize(outobj, requiredsize)) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2878 Py_DECREF(rep);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2879 return NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2880 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2881 outstart = PyString_AS_STRING(*outobj);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2882 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2883 outstart[(*outpos)++] = (char)PyInt_AS_LONG(rep);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2884 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2885 else {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2886 const char *repchars = PyString_AS_STRING(rep);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2887 int repsize = PyString_GET_SIZE(rep);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2888 int requiredsize = *outpos+repsize;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2889 if (outsize<requiredsize) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2890 /* exponentially overallocate to minimize reallocations */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2891 if (requiredsize < 2*outsize)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2892 requiredsize = 2*outsize;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2893 if (_PyString_Resize(outobj, requiredsize)) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2894 Py_DECREF(rep);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2895 return NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2896 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2897 outstart = PyString_AS_STRING(*outobj);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2898 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2899 memcpy(outstart + *outpos, repchars, repsize);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2900 *outpos += repsize;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2901 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2902 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2903 return rep;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2904 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2905
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2906 /* handle an error in PyUnicode_EncodeCharmap
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2907 Return 0 on success, -1 on error */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2908 static
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2909 int charmap_encoding_error(
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2910 const Py_UNICODE p, int size, int inpos, PyObject *mapping,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2911 PyObject **exceptionObject,
30149 59bad7efff02 Fix refcount leak in PyUnicode_EncodeCharmap(). The bug surfaces Walter Dörwald <walter@livinglogic.de> parents: 29706 diff changeset	2912 int known_errorHandler, PyObject errorHandler, const char errors,
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2913 PyObject *res, int respos)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2914 {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2915 PyObject repunicode = NULL; / initialize to prevent gcc warning */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2916 int repsize;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2917 int newpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2918 Py_UNICODE *uni2;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2919 /* startpos for collecting unencodable chars */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2920 int collstartpos = *inpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2921 int collendpos = *inpos+1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2922 int collpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2923 char *encoding = "charmap";
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2924 char *reason = "character maps to <undefined>";
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2925
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2926 PyObject *x;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2927 /* find all unencodable characters */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2928 while (collendpos < size) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2929 x = charmapencode_lookup(p[collendpos], mapping);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2930 if (x==NULL)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2931 return -1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2932 else if (x!=Py_None) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2933 Py_DECREF(x);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2934 break;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2935 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2936 Py_DECREF(x);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2937 ++collendpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2938 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2939 /* cache callback name lookup
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2940 * (if not done yet, i.e. it's the first error) */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2941 if (*known_errorHandler==-1) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2942 if ((errors==NULL) \|\| (!strcmp(errors, "strict")))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2943 *known_errorHandler = 1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2944 else if (!strcmp(errors, "replace"))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2945 *known_errorHandler = 2;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2946 else if (!strcmp(errors, "ignore"))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2947 *known_errorHandler = 3;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2948 else if (!strcmp(errors, "xmlcharrefreplace"))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2949 *known_errorHandler = 4;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2950 else
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2951 *known_errorHandler = 0;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2952 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2953 switch (*known_errorHandler) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2954 case 1: /* strict */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2955 raise_encode_exception(exceptionObject, encoding, p, size, collstartpos, collendpos, reason);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2956 return -1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2957 case 2: /* replace */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2958 for (collpos = collstartpos; collpos<collendpos; ++collpos) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2959 x = charmapencode_output('?', mapping, res, respos);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2960 if (x==NULL) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2961 return -1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2962 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2963 else if (x==Py_None) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2964 Py_DECREF(x);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2965 raise_encode_exception(exceptionObject, encoding, p, size, collstartpos, collendpos, reason);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2966 return -1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2967 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2968 Py_DECREF(x);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2969 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2970 /* fall through */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2971 case 3: /* ignore */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2972 *inpos = collendpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2973 break;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2974 case 4: /* xmlcharrefreplace */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2975 /* generate replacement (temporarily (mis)uses p) */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2976 for (collpos = collstartpos; collpos < collendpos; ++collpos) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2977 char buffer[2+29+1+1];
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2978 char *cp;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2979 sprintf(buffer, "&#%d;", (int)p[collpos]);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2980 for (cp = buffer; *cp; ++cp) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2981 x = charmapencode_output(*cp, mapping, res, respos);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2982 if (x==NULL)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2983 return -1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2984 else if (x==Py_None) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2985 Py_DECREF(x);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2986 raise_encode_exception(exceptionObject, encoding, p, size, collstartpos, collendpos, reason);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2987 return -1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2988 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2989 Py_DECREF(x);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2990 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2991 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2992 *inpos = collendpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2993 break;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2994 default:
30149 59bad7efff02 Fix refcount leak in PyUnicode_EncodeCharmap(). The bug surfaces Walter Dörwald <walter@livinglogic.de> parents: 29706 diff changeset	2995 repunicode = unicode_encode_call_errorhandler(errors, errorHandler,
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2996 encoding, reason, p, size, exceptionObject,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2997 collstartpos, collendpos, &newpos);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2998 if (repunicode == NULL)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	2999 return -1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3000 /* generate replacement */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3001 repsize = PyUnicode_GET_SIZE(repunicode);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3002 for (uni2 = PyUnicode_AS_UNICODE(repunicode); repsize-->0; ++uni2) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3003 x = charmapencode_output(*uni2, mapping, res, respos);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3004 if (x==NULL) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3005 Py_DECREF(repunicode);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3006 return -1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3007 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3008 else if (x==Py_None) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3009 Py_DECREF(repunicode);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3010 Py_DECREF(x);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3011 raise_encode_exception(exceptionObject, encoding, p, size, collstartpos, collendpos, reason);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3012 return -1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3013 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3014 Py_DECREF(x);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3015 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3016 *inpos = newpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3017 Py_DECREF(repunicode);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3018 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3019 return 0;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3020 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3021
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3022 PyObject PyUnicode_EncodeCharmap(const Py_UNICODE p,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3023 int size,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3024 PyObject *mapping,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3025 const char *errors)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3026 {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3027 /* output object */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3028 PyObject *res = NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3029 /* current input position */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3030 int inpos = 0;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3031 /* current output position */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3032 int respos = 0;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3033 PyObject *errorHandler = NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3034 PyObject *exc = NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3035 /* the following variable is used for caching string comparisons
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3036 * -1=not initialized, 0=unknown, 1=strict, 2=replace,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3037 * 3=ignore, 4=xmlcharrefreplace */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3038 int known_errorHandler = -1;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3039
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3040 /* Default to Latin-1 */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3041 if (mapping == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3042 return PyUnicode_EncodeLatin1(p, size, errors);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3043
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3044 /* allocate enough for a simple encoding without
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3045 replacements, if we need more, we'll resize */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3046 res = PyString_FromStringAndSize(NULL, size);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3047 if (res == NULL)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3048 goto onError;
13966 91ddeed12fa7 Fixed a couple of instances where a 0-length string was being Marc-André Lemburg <mal@egenix.com> parents: 13946 diff changeset	3049 if (size == 0)
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3050 return res;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3051
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3052 while (inpos<size) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3053 /* try to encode it */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3054 PyObject *x = charmapencode_output(p[inpos], mapping, &res, &respos);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3055 if (x==NULL) /* error */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3056 goto onError;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3057 if (x==Py_None) { /* unencodable character */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3058 if (charmap_encoding_error(p, size, &inpos, mapping,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3059 &exc,
30149 59bad7efff02 Fix refcount leak in PyUnicode_EncodeCharmap(). The bug surfaces Walter Dörwald <walter@livinglogic.de> parents: 29706 diff changeset	3060 &known_errorHandler, &errorHandler, errors,
30162 443533d08783 Fix another refcounting leak in PyUnicode_EncodeCharmap(). Walter Dörwald <walter@livinglogic.de> parents: 30160 diff changeset	3061 &res, &respos)) {
443533d08783 Fix another refcounting leak in PyUnicode_EncodeCharmap(). Walter Dörwald <walter@livinglogic.de> parents: 30160 diff changeset	3062 Py_DECREF(x);
15910 f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15749 diff changeset	3063 goto onError;
30162 443533d08783 Fix another refcounting leak in PyUnicode_EncodeCharmap(). Walter Dörwald <walter@livinglogic.de> parents: 30160 diff changeset	3064 }
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3065 }
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3066 else
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3067 /* done with this character => adjust input position */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3068 ++inpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3069 Py_DECREF(x);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3070 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3071
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3072 /* Resize if we allocated to much */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3073 if (respos<PyString_GET_SIZE(res)) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3074 if (_PyString_Resize(&res, respos))
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3075 goto onError;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3076 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3077 Py_XDECREF(exc);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3078 Py_XDECREF(errorHandler);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3079 return res;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3080
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3081 onError:
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3082 Py_XDECREF(res);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3083 Py_XDECREF(exc);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3084 Py_XDECREF(errorHandler);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3085 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3086 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3087
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3088 PyObject PyUnicode_AsCharmapString(PyObject unicode,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3089 PyObject *mapping)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3090 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3091 if (!PyUnicode_Check(unicode) \|\| mapping == NULL) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3092 PyErr_BadArgument();
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3093 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3094 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3095 return PyUnicode_EncodeCharmap(PyUnicode_AS_UNICODE(unicode),
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3096 PyUnicode_GET_SIZE(unicode),
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3097 mapping,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3098 NULL);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3099 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3100
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3101 /* create or adjust a UnicodeTranslateError */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3102 static void make_translate_exception(PyObject **exceptionObject,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3103 const Py_UNICODE *unicode, int size,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3104 int startpos, int endpos,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3105 const char *reason)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3106 {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3107 if (*exceptionObject == NULL) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3108 *exceptionObject = PyUnicodeTranslateError_Create(
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3109 unicode, size, startpos, endpos, reason);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3110 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3111 else {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3112 if (PyUnicodeTranslateError_SetStart(*exceptionObject, startpos))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3113 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3114 if (PyUnicodeTranslateError_SetEnd(*exceptionObject, endpos))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3115 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3116 if (PyUnicodeTranslateError_SetReason(*exceptionObject, reason))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3117 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3118 return;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3119 onError:
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3120 Py_DECREF(*exceptionObject);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3121 *exceptionObject = NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3122 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3123 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3124
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3125 /* raises a UnicodeTranslateError */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3126 static void raise_translate_exception(PyObject **exceptionObject,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3127 const Py_UNICODE *unicode, int size,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3128 int startpos, int endpos,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3129 const char *reason)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3130 {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3131 make_translate_exception(exceptionObject,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3132 unicode, size, startpos, endpos, reason);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3133 if (*exceptionObject != NULL)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3134 PyCodec_StrictErrors(*exceptionObject);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3135 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3136
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3137 /* error handling callback helper:
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3138 build arguments, call the callback and check the arguments,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3139 put the result into newpos and return the replacement string, which
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3140 has to be freed by the caller */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3141 static PyObject unicode_translate_call_errorhandler(const char errors,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3142 PyObject **errorHandler,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3143 const char *reason,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3144 const Py_UNICODE unicode, int size, PyObject *exceptionObject,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3145 int startpos, int endpos,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3146 int *newpos)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3147 {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3148 static char *argparse = "O!i;translating error handler must return (unicode, int) tuple";
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3149
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3150 PyObject *restuple;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3151 PyObject *resunicode;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3152
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3153 if (*errorHandler == NULL) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3154 *errorHandler = PyCodec_LookupError(errors);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3155 if (*errorHandler == NULL)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3156 return NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3157 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3158
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3159 make_translate_exception(exceptionObject,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3160 unicode, size, startpos, endpos, reason);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3161 if (*exceptionObject == NULL)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3162 return NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3163
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3164 restuple = PyObject_CallFunctionObjArgs(
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3165 errorHandler, exceptionObject, NULL);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3166 if (restuple == NULL)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3167 return NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3168 if (!PyTuple_Check(restuple)) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3169 PyErr_Format(PyExc_TypeError, &argparse[4]);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3170 Py_DECREF(restuple);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3171 return NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3172 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3173 if (!PyArg_ParseTuple(restuple, argparse, &PyUnicode_Type,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3174 &resunicode, newpos)) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3175 Py_DECREF(restuple);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3176 return NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3177 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3178 if (*newpos<0)
27555 c267f28724dd Change the treatment of positions returned by PEP293 Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	3179 newpos = size+newpos;
c267f28724dd Change the treatment of positions returned by PEP293 Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	3180 if (newpos<0 \|\| newpos>size) {
c267f28724dd Change the treatment of positions returned by PEP293 Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	3181 PyErr_Format(PyExc_IndexError, "position %d from error handler out of bounds", *newpos);
c267f28724dd Change the treatment of positions returned by PEP293 Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	3182 Py_DECREF(restuple);
c267f28724dd Change the treatment of positions returned by PEP293 Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	3183 return NULL;
c267f28724dd Change the treatment of positions returned by PEP293 Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	3184 }
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3185 Py_INCREF(resunicode);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3186 Py_DECREF(restuple);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3187 return resunicode;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3188 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3189
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3190 /* Lookup the character ch in the mapping and put the result in result,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3191 which must be decrefed by the caller.
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3192 Return 0 on success, -1 on error */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3193 static
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3194 int charmaptranslate_lookup(Py_UNICODE c, PyObject mapping, PyObject *result)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3195 {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3196 PyObject *w = PyInt_FromLong((long)c);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3197 PyObject *x;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3198
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3199 if (w == NULL)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3200 return -1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3201 x = PyObject_GetItem(mapping, w);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3202 Py_DECREF(w);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3203 if (x == NULL) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3204 if (PyErr_ExceptionMatches(PyExc_LookupError)) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3205 /* No mapping found means: use 1:1 mapping. */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3206 PyErr_Clear();
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3207 *result = NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3208 return 0;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3209 } else
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3210 return -1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3211 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3212 else if (x == Py_None) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3213 *result = x;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3214 return 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3215 }
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3216 else if (PyInt_Check(x)) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3217 long value = PyInt_AS_LONG(x);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3218 long max = PyUnicode_GetMax();
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3219 if (value < 0 \|\| value > max) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3220 PyErr_Format(PyExc_TypeError,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3221 "character mapping must be in range(0x%lx)", max+1);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3222 Py_DECREF(x);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3223 return -1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3224 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3225 *result = x;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3226 return 0;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3227 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3228 else if (PyUnicode_Check(x)) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3229 *result = x;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3230 return 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3231 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3232 else {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3233 /* wrong return value */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3234 PyErr_SetString(PyExc_TypeError,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3235 "character mapping must return integer, None or unicode");
30164 7cb4ad5932e6 Fix refcounting leak in charmaptranslate_lookup() Walter Dörwald <walter@livinglogic.de> parents: 30162 diff changeset	3236 Py_DECREF(x);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3237 return -1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3238 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3239 }
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3240 /* ensure that *outobj is at least requiredsize characters long,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3241 if not reallocate and adjust various state variables.
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3242 Return 0 on success, -1 on error */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3243 static
30765 fe3f5592305d Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). Walter Dörwald <walter@livinglogic.de> parents: 30707 diff changeset	3244 int charmaptranslate_makespace(PyObject outobj, Py_UNICODE outp,
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3245 int requiredsize)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3246 {
30765 fe3f5592305d Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). Walter Dörwald <walter@livinglogic.de> parents: 30707 diff changeset	3247 int oldsize = PyUnicode_GET_SIZE(*outobj);
fe3f5592305d Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). Walter Dörwald <walter@livinglogic.de> parents: 30707 diff changeset	3248 if (requiredsize > oldsize) {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3249 /* remember old output position */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3250 int outpos = outp-PyUnicode_AS_UNICODE(outobj);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3251 /* exponentially overallocate to minimize reallocations */
30765 fe3f5592305d Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). Walter Dörwald <walter@livinglogic.de> parents: 30707 diff changeset	3252 if (requiredsize < 2 * oldsize)
fe3f5592305d Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). Walter Dörwald <walter@livinglogic.de> parents: 30707 diff changeset	3253 requiredsize = 2 * oldsize;
30431 cd0c3f916b34 Change checks of PyUnicode_Resize() return value for clarity. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30216 diff changeset	3254 if (_PyUnicode_Resize(outobj, requiredsize) < 0)
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3255 return -1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3256 outp = PyUnicode_AS_UNICODE(outobj) + outpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3257 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3258 return 0;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3259 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3260 /* lookup the character, put the result in the output string and adjust
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3261 various state variables. Return a new reference to the object that
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3262 was put in the output buffer in *result, or Py_None, if the mapping was
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3263 undefined (in which case no character was written).
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3264 The called must decref result.
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3265 Return 0 on success, -1 on error. */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3266 static
30765 fe3f5592305d Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). Walter Dörwald <walter@livinglogic.de> parents: 30707 diff changeset	3267 int charmaptranslate_output(const Py_UNICODE startinp, const Py_UNICODE curinp,
fe3f5592305d Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). Walter Dörwald <walter@livinglogic.de> parents: 30707 diff changeset	3268 int insize, PyObject mapping, PyObject outobj, Py_UNICODE *outp,
fe3f5592305d Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). Walter Dörwald <walter@livinglogic.de> parents: 30707 diff changeset	3269 PyObject **res)
fe3f5592305d Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). Walter Dörwald <walter@livinglogic.de> parents: 30707 diff changeset	3270 {
fe3f5592305d Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). Walter Dörwald <walter@livinglogic.de> parents: 30707 diff changeset	3271 if (charmaptranslate_lookup(*curinp, mapping, res))
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3272 return -1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3273 if (*res==NULL) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3274 /* not found => default to 1:1 mapping */
30765 fe3f5592305d Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). Walter Dörwald <walter@livinglogic.de> parents: 30707 diff changeset	3275 (outp)++ = *curinp;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3276 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3277 else if (*res==Py_None)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3278 ;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3279 else if (PyInt_Check(*res)) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3280 /* no overflow check, because we know that the space is enough */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3281 (outp)++ = (Py_UNICODE)PyInt_AS_LONG(*res);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3282 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3283 else if (PyUnicode_Check(*res)) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3284 int repsize = PyUnicode_GET_SIZE(*res);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3285 if (repsize==1) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3286 /* no overflow check, because we know that the space is enough */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3287 (outp)++ = PyUnicode_AS_UNICODE(res);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3288 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3289 else if (repsize!=0) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3290 /* more than one character */
30765 fe3f5592305d Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). Walter Dörwald <walter@livinglogic.de> parents: 30707 diff changeset	3291 int requiredsize = (outp-PyUnicode_AS_UNICODE(outobj)) +
31455 37d501b9e2d5 Fix reallocation bug in unicode.translate(): The code was comparing Walter Dörwald <walter@livinglogic.de> parents: 31325 diff changeset	3292 (insize - (curinp-startinp)) +
30765 fe3f5592305d Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). Walter Dörwald <walter@livinglogic.de> parents: 30707 diff changeset	3293 repsize - 1;
fe3f5592305d Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). Walter Dörwald <walter@livinglogic.de> parents: 30707 diff changeset	3294 if (charmaptranslate_makespace(outobj, outp, requiredsize))
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3295 return -1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3296 memcpy(outp, PyUnicode_AS_UNICODE(res), sizeof(Py_UNICODE)*repsize);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3297 *outp += repsize;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3298 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3299 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3300 else
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3301 return -1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3302 return 0;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3303 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3304
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3305 PyObject PyUnicode_TranslateCharmap(const Py_UNICODE p,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3306 int size,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3307 PyObject *mapping,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3308 const char *errors)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3309 {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3310 /* output object */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3311 PyObject *res = NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3312 /* pointers to the beginning and end+1 of input */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3313 const Py_UNICODE *startp = p;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3314 const Py_UNICODE *endp = p + size;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3315 /* pointer into the output */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3316 Py_UNICODE *str;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3317 /* current output position */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3318 int respos = 0;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3319 char *reason = "character maps to <undefined>";
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3320 PyObject *errorHandler = NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3321 PyObject *exc = NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3322 /* the following variable is used for caching string comparisons
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3323 * -1=not initialized, 0=unknown, 1=strict, 2=replace,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3324 * 3=ignore, 4=xmlcharrefreplace */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3325 int known_errorHandler = -1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3326
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3327 if (mapping == NULL) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3328 PyErr_BadArgument();
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3329 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3330 }
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3331
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3332 /* allocate enough for a simple 1:1 translation without
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3333 replacements, if we need more, we'll resize */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3334 res = PyUnicode_FromUnicode(NULL, size);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3335 if (res == NULL)
30765 fe3f5592305d Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). Walter Dörwald <walter@livinglogic.de> parents: 30707 diff changeset	3336 goto onError;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3337 if (size == 0)
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3338 return res;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3339 str = PyUnicode_AS_UNICODE(res);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3340
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3341 while (p<endp) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3342 /* try to encode it */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3343 PyObject *x = NULL;
30765 fe3f5592305d Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). Walter Dörwald <walter@livinglogic.de> parents: 30707 diff changeset	3344 if (charmaptranslate_output(startp, p, size, mapping, &res, &str, &x)) {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3345 Py_XDECREF(x);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3346 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3347 }
27774 bfc524379307 Fix two refcounting bugs Walter Dörwald <walter@livinglogic.de> parents: 27555 diff changeset	3348 Py_XDECREF(x);
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3349 if (x!=Py_None) /* it worked => adjust input pointer */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3350 ++p;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3351 else { /* untranslatable character */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3352 PyObject repunicode = NULL; / initialize to prevent gcc warning */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3353 int repsize;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3354 int newpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3355 Py_UNICODE *uni2;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3356 /* startpos for collecting untranslatable chars */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3357 const Py_UNICODE *collstart = p;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3358 const Py_UNICODE *collend = p+1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3359 const Py_UNICODE *coll;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3360
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3361 /* find all untranslatable characters */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3362 while (collend < endp) {
30765 fe3f5592305d Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). Walter Dörwald <walter@livinglogic.de> parents: 30707 diff changeset	3363 if (charmaptranslate_lookup(*collend, mapping, &x))
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3364 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3365 Py_XDECREF(x);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3366 if (x!=Py_None)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3367 break;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3368 ++collend;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3369 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3370 /* cache callback name lookup
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3371 * (if not done yet, i.e. it's the first error) */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3372 if (known_errorHandler==-1) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3373 if ((errors==NULL) \|\| (!strcmp(errors, "strict")))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3374 known_errorHandler = 1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3375 else if (!strcmp(errors, "replace"))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3376 known_errorHandler = 2;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3377 else if (!strcmp(errors, "ignore"))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3378 known_errorHandler = 3;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3379 else if (!strcmp(errors, "xmlcharrefreplace"))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3380 known_errorHandler = 4;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3381 else
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3382 known_errorHandler = 0;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3383 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3384 switch (known_errorHandler) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3385 case 1: /* strict */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3386 raise_translate_exception(&exc, startp, size, collstart-startp, collend-startp, reason);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3387 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3388 case 2: /* replace */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3389 /* No need to check for space, this is a 1:1 replacement */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3390 for (coll = collstart; coll<collend; ++coll)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3391 *str++ = '?';
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3392 /* fall through */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3393 case 3: /* ignore */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3394 p = collend;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3395 break;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3396 case 4: /* xmlcharrefreplace */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3397 /* generate replacement (temporarily (mis)uses p) */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3398 for (p = collstart; p < collend; ++p) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3399 char buffer[2+29+1+1];
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3400 char *cp;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3401 sprintf(buffer, "&#%d;", (int)*p);
30765 fe3f5592305d Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). Walter Dörwald <walter@livinglogic.de> parents: 30707 diff changeset	3402 if (charmaptranslate_makespace(&res, &str,
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3403 (str-PyUnicode_AS_UNICODE(res))+strlen(buffer)+(endp-collend)))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3404 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3405 for (cp = buffer; *cp; ++cp)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3406 str++ = cp;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3407 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3408 p = collend;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3409 break;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3410 default:
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3411 repunicode = unicode_translate_call_errorhandler(errors, &errorHandler,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3412 reason, startp, size, &exc,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3413 collstart-startp, collend-startp, &newpos);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3414 if (repunicode == NULL)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3415 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3416 /* generate replacement */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3417 repsize = PyUnicode_GET_SIZE(repunicode);
30765 fe3f5592305d Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). Walter Dörwald <walter@livinglogic.de> parents: 30707 diff changeset	3418 if (charmaptranslate_makespace(&res, &str,
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3419 (str-PyUnicode_AS_UNICODE(res))+repsize+(endp-collend))) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3420 Py_DECREF(repunicode);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3421 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3422 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3423 for (uni2 = PyUnicode_AS_UNICODE(repunicode); repsize-->0; ++uni2)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3424 str++ = uni2;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3425 p = startp + newpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3426 Py_DECREF(repunicode);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3427 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3428 }
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3429 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3430 /* Resize if we allocated to much */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3431 respos = str-PyUnicode_AS_UNICODE(res);
30765 fe3f5592305d Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). Walter Dörwald <walter@livinglogic.de> parents: 30707 diff changeset	3432 if (respos<PyUnicode_GET_SIZE(res)) {
30431 cd0c3f916b34 Change checks of PyUnicode_Resize() return value for clarity. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30216 diff changeset	3433 if (_PyUnicode_Resize(&res, respos) < 0)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3434 goto onError;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3435 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3436 Py_XDECREF(exc);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3437 Py_XDECREF(errorHandler);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3438 return res;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3439
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3440 onError:
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3441 Py_XDECREF(res);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3442 Py_XDECREF(exc);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3443 Py_XDECREF(errorHandler);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3444 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3445 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3446
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3447 PyObject PyUnicode_Translate(PyObject str,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3448 PyObject *mapping,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3449 const char *errors)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3450 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3451 PyObject *result;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3452
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3453 str = PyUnicode_FromObject(str);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3454 if (str == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3455 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3456 result = PyUnicode_TranslateCharmap(PyUnicode_AS_UNICODE(str),
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3457 PyUnicode_GET_SIZE(str),
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3458 mapping,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3459 errors);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3460 Py_DECREF(str);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3461 return result;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3462
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3463 onError:
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3464 Py_XDECREF(str);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3465 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3466 }
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3467
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3468 /* --- Decimal Encoder ---------------------------------------------------- */
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3469
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3470 int PyUnicode_EncodeDecimal(Py_UNICODE *s,
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3471 int length,
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3472 char *output,
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3473 const char *errors)
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3474 {
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3475 Py_UNICODE p, end;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3476 PyObject *errorHandler = NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3477 PyObject *exc = NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3478 const char *encoding = "decimal";
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3479 const char *reason = "invalid decimal Unicode string";
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3480 /* the following variable is used for caching string comparisons
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3481 * -1=not initialized, 0=unknown, 1=strict, 2=replace, 3=ignore, 4=xmlcharrefreplace */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3482 int known_errorHandler = -1;
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3483
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3484 if (output == NULL) {
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3485 PyErr_BadArgument();
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3486 return -1;
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3487 }
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3488
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3489 p = s;
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3490 end = s + length;
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3491 while (p < end) {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3492 register Py_UNICODE ch = *p;
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3493 int decimal;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3494 PyObject *repunicode;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3495 int repsize;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3496 int newpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3497 Py_UNICODE *uni2;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3498 Py_UNICODE *collstart;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3499 Py_UNICODE *collend;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3500
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3501 if (Py_UNICODE_ISSPACE(ch)) {
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3502 *output++ = ' ';
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3503 ++p;
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3504 continue;
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3505 }
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3506 decimal = Py_UNICODE_TODECIMAL(ch);
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3507 if (decimal >= 0) {
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3508 *output++ = '0' + decimal;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3509 ++p;
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3510 continue;
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3511 }
12275 cbfa95a6a03e Conrad Huang points out that "if (0 < ch < 256)", while legal C, Guido van Rossum <guido@python.org> parents: 12249 diff changeset	3512 if (0 < ch && ch < 256) {
12577 85f00f8cd674 Fix warning detected by VC++ on assignment of Py_UNICODE to char. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	3513 *output++ = (char)ch;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3514 ++p;
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3515 continue;
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3516 }
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3517 /* All other characters are considered unencodable */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3518 collstart = p;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3519 collend = p+1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3520 while (collend < end) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3521 if ((0 < collend && collend < 256) \|\|
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3522 !Py_UNICODE_ISSPACE(*collend) \|\|
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3523 Py_UNICODE_TODECIMAL(*collend))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3524 break;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3525 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3526 /* cache callback name lookup
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3527 * (if not done yet, i.e. it's the first error) */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3528 if (known_errorHandler==-1) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3529 if ((errors==NULL) \|\| (!strcmp(errors, "strict")))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3530 known_errorHandler = 1;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3531 else if (!strcmp(errors, "replace"))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3532 known_errorHandler = 2;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3533 else if (!strcmp(errors, "ignore"))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3534 known_errorHandler = 3;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3535 else if (!strcmp(errors, "xmlcharrefreplace"))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3536 known_errorHandler = 4;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3537 else
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3538 known_errorHandler = 0;
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3539 }
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3540 switch (known_errorHandler) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3541 case 1: /* strict */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3542 raise_encode_exception(&exc, encoding, s, length, collstart-s, collend-s, reason);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3543 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3544 case 2: /* replace */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3545 for (p = collstart; p < collend; ++p)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3546 *output++ = '?';
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3547 /* fall through */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3548 case 3: /* ignore */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3549 p = collend;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3550 break;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3551 case 4: /* xmlcharrefreplace */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3552 /* generate replacement (temporarily (mis)uses p) */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3553 for (p = collstart; p < collend; ++p)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3554 output += sprintf(output, "&#%d;", (int)*p);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3555 p = collend;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3556 break;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3557 default:
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3558 repunicode = unicode_encode_call_errorhandler(errors, &errorHandler,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3559 encoding, reason, s, length, &exc,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3560 collstart-s, collend-s, &newpos);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3561 if (repunicode == NULL)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3562 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3563 /* generate replacement */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3564 repsize = PyUnicode_GET_SIZE(repunicode);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3565 for (uni2 = PyUnicode_AS_UNICODE(repunicode); repsize-->0; ++uni2) {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3566 Py_UNICODE ch = *uni2;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3567 if (Py_UNICODE_ISSPACE(ch))
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3568 *output++ = ' ';
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3569 else {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3570 decimal = Py_UNICODE_TODECIMAL(ch);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3571 if (decimal >= 0)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3572 *output++ = '0' + decimal;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3573 else if (0 < ch && ch < 256)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3574 *output++ = (char)ch;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3575 else {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3576 Py_DECREF(repunicode);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3577 raise_encode_exception(&exc, encoding,
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3578 s, length, collstart-s, collend-s, reason);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3579 goto onError;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3580 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3581 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3582 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3583 p = s + newpos;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3584 Py_DECREF(repunicode);
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3585 }
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3586 }
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3587 /* 0-terminate the output string */
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3588 *output++ = '\0';
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3589 Py_XDECREF(exc);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3590 Py_XDECREF(errorHandler);
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3591 return 0;
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3592
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3593 onError:
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3594 Py_XDECREF(exc);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	3595 Py_XDECREF(errorHandler);
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3596 return -1;
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3597 }
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	3598
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3599 /* --- Helpers ------------------------------------------------------------ */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3600
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3601 static
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3602 int count(PyUnicodeObject *self,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3603 int start,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3604 int end,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3605 PyUnicodeObject *substring)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3606 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3607 int count = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3608
15910 f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15749 diff changeset	3609 if (start < 0)
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15749 diff changeset	3610 start += self->length;
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15749 diff changeset	3611 if (start < 0)
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15749 diff changeset	3612 start = 0;
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15749 diff changeset	3613 if (end > self->length)
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15749 diff changeset	3614 end = self->length;
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15749 diff changeset	3615 if (end < 0)
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15749 diff changeset	3616 end += self->length;
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15749 diff changeset	3617 if (end < 0)
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15749 diff changeset	3618 end = 0;
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15749 diff changeset	3619
12957 97dd6dc33503 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12939 diff changeset	3620 if (substring->length == 0)
97dd6dc33503 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12939 diff changeset	3621 return (end - start + 1);
97dd6dc33503 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12939 diff changeset	3622
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3623 end -= substring->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3624
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3625 while (start <= end)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3626 if (Py_UNICODE_MATCH(self, start, substring)) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3627 count++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3628 start += substring->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3629 } else
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3630 start++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3631
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3632 return count;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3633 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3634
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3635 int PyUnicode_Count(PyObject *str,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3636 PyObject *substr,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3637 int start,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3638 int end)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3639 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3640 int result;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3641
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3642 str = PyUnicode_FromObject(str);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3643 if (str == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3644 return -1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3645 substr = PyUnicode_FromObject(substr);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3646 if (substr == NULL) {
12957 97dd6dc33503 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12939 diff changeset	3647 Py_DECREF(str);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3648 return -1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3649 }
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3650
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3651 result = count((PyUnicodeObject *)str,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3652 start, end,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3653 (PyUnicodeObject *)substr);
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3654
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3655 Py_DECREF(str);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3656 Py_DECREF(substr);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3657 return result;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3658 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3659
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3660 static
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3661 int findstring(PyUnicodeObject *self,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3662 PyUnicodeObject *substring,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3663 int start,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3664 int end,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3665 int direction)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3666 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3667 if (start < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3668 start += self->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3669 if (start < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3670 start = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3671
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3672 if (end > self->length)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3673 end = self->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3674 if (end < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3675 end += self->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3676 if (end < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3677 end = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3678
24918 0d5d8e1cdc22 Fix some endcase bugs in unicode rfind()/rindex() and endswith(). Guido van Rossum <guido@python.org> parents: 24831 diff changeset	3679 if (substring->length == 0)
0d5d8e1cdc22 Fix some endcase bugs in unicode rfind()/rindex() and endswith(). Guido van Rossum <guido@python.org> parents: 24831 diff changeset	3680 return (direction > 0) ? start : end;
0d5d8e1cdc22 Fix some endcase bugs in unicode rfind()/rindex() and endswith(). Guido van Rossum <guido@python.org> parents: 24831 diff changeset	3681
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3682 end -= substring->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3683
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3684 if (direction < 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3685 for (; end >= start; end--)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3686 if (Py_UNICODE_MATCH(self, end, substring))
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3687 return end;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3688 } else {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3689 for (; start <= end; start++)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3690 if (Py_UNICODE_MATCH(self, start, substring))
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3691 return start;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3692 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3693
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3694 return -1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3695 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3696
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3697 int PyUnicode_Find(PyObject *str,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3698 PyObject *substr,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3699 int start,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3700 int end,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3701 int direction)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3702 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3703 int result;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3704
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3705 str = PyUnicode_FromObject(str);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3706 if (str == NULL)
23561 c5e8f89fd358 Fix for bug [ 561796 ] string.find causes lazy error Marc-André Lemburg <mal@egenix.com> parents: 23542 diff changeset	3707 return -2;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3708 substr = PyUnicode_FromObject(substr);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3709 if (substr == NULL) {
23562 eaca627f2a54 Fix a possible segfault. Found be Neal Norvitz. Marc-André Lemburg <mal@egenix.com> parents: 23561 diff changeset	3710 Py_DECREF(str);
23561 c5e8f89fd358 Fix for bug [ 561796 ] string.find causes lazy error Marc-André Lemburg <mal@egenix.com> parents: 23542 diff changeset	3711 return -2;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3712 }
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3713
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3714 result = findstring((PyUnicodeObject *)str,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3715 (PyUnicodeObject *)substr,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3716 start, end, direction);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3717 Py_DECREF(str);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3718 Py_DECREF(substr);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3719 return result;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3720 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3721
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3722 static
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3723 int tailmatch(PyUnicodeObject *self,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3724 PyUnicodeObject *substring,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3725 int start,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3726 int end,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3727 int direction)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3728 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3729 if (start < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3730 start += self->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3731 if (start < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3732 start = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3733
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3734 if (substring->length == 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3735 return 1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3736
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3737 if (end > self->length)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3738 end = self->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3739 if (end < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3740 end += self->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3741 if (end < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3742 end = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3743
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3744 end -= substring->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3745 if (end < start)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3746 return 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3747
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3748 if (direction > 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3749 if (Py_UNICODE_MATCH(self, end, substring))
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3750 return 1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3751 } else {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3752 if (Py_UNICODE_MATCH(self, start, substring))
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3753 return 1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3754 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3755
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3756 return 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3757 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3758
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3759 int PyUnicode_Tailmatch(PyObject *str,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3760 PyObject *substr,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3761 int start,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3762 int end,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3763 int direction)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3764 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3765 int result;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3766
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3767 str = PyUnicode_FromObject(str);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3768 if (str == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3769 return -1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3770 substr = PyUnicode_FromObject(substr);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3771 if (substr == NULL) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3772 Py_DECREF(substr);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3773 return -1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3774 }
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3775
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3776 result = tailmatch((PyUnicodeObject *)str,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3777 (PyUnicodeObject *)substr,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3778 start, end, direction);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3779 Py_DECREF(str);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3780 Py_DECREF(substr);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3781 return result;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3782 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3783
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3784 static
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3785 const Py_UNICODE findchar(const Py_UNICODE s,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3786 int size,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3787 Py_UNICODE ch)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3788 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3789 /* like wcschr, but doesn't stop at NULL characters */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3790
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3791 while (size-- > 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3792 if (*s == ch)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3793 return s;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3794 s++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3795 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3796
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3797 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3798 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3799
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3800 /* Apply fixfct filter to the Unicode object self and return a
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3801 reference to the modified object */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3802
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3803 static
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3804 PyObject fixup(PyUnicodeObject self,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3805 int (fixfct)(PyUnicodeObject s))
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3806 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3807
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3808 PyUnicodeObject *u;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3809
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	3810 u = (PyUnicodeObject*) PyUnicode_FromUnicode(NULL, self->length);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3811 if (u == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3812 return NULL;
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	3813
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	3814 Py_UNICODE_COPY(u->str, self->str, self->length);
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	3815
19885 72e6eb653312 More on bug 460020: disable many optimizations of unicode subclasses. Tim Peters <tim.peters@gmail.com> parents: 19849 diff changeset	3816 if (!fixfct(u) && PyUnicode_CheckExact(self)) {
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3817 /* fixfct should return TRUE if it modified the buffer. If
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3818 FALSE, return a reference to the original buffer instead
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3819 (to save space, not time) */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3820 Py_INCREF(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3821 Py_DECREF(u);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3822 return (PyObject*) self;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3823 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3824 return (PyObject*) u;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3825 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3826
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3827 static
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3828 int fixupper(PyUnicodeObject *self)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3829 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3830 int len = self->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3831 Py_UNICODE *s = self->str;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3832 int status = 0;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3833
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3834 while (len-- > 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3835 register Py_UNICODE ch;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3836
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3837 ch = Py_UNICODE_TOUPPER(*s);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3838 if (ch != *s) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3839 status = 1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3840 *s = ch;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3841 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3842 s++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3843 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3844
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3845 return status;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3846 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3847
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3848 static
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3849 int fixlower(PyUnicodeObject *self)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3850 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3851 int len = self->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3852 Py_UNICODE *s = self->str;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3853 int status = 0;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3854
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3855 while (len-- > 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3856 register Py_UNICODE ch;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3857
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3858 ch = Py_UNICODE_TOLOWER(*s);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3859 if (ch != *s) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3860 status = 1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3861 *s = ch;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3862 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3863 s++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3864 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3865
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3866 return status;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3867 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3868
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3869 static
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3870 int fixswapcase(PyUnicodeObject *self)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3871 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3872 int len = self->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3873 Py_UNICODE *s = self->str;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3874 int status = 0;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3875
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3876 while (len-- > 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3877 if (Py_UNICODE_ISUPPER(*s)) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3878 s = Py_UNICODE_TOLOWER(s);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3879 status = 1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3880 } else if (Py_UNICODE_ISLOWER(*s)) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3881 s = Py_UNICODE_TOUPPER(s);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3882 status = 1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3883 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3884 s++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3885 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3886
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3887 return status;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3888 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3889
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3890 static
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3891 int fixcapitalize(PyUnicodeObject *self)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3892 {
16332 bacbb45fe844 Fixed .capitalize() method of Unicode objects to work like the Marc-André Lemburg <mal@egenix.com> parents: 16226 diff changeset	3893 int len = self->length;
bacbb45fe844 Fixed .capitalize() method of Unicode objects to work like the Marc-André Lemburg <mal@egenix.com> parents: 16226 diff changeset	3894 Py_UNICODE *s = self->str;
bacbb45fe844 Fixed .capitalize() method of Unicode objects to work like the Marc-André Lemburg <mal@egenix.com> parents: 16226 diff changeset	3895 int status = 0;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3896
16332 bacbb45fe844 Fixed .capitalize() method of Unicode objects to work like the Marc-André Lemburg <mal@egenix.com> parents: 16226 diff changeset	3897 if (len == 0)
bacbb45fe844 Fixed .capitalize() method of Unicode objects to work like the Marc-André Lemburg <mal@egenix.com> parents: 16226 diff changeset	3898 return 0;
bacbb45fe844 Fixed .capitalize() method of Unicode objects to work like the Marc-André Lemburg <mal@egenix.com> parents: 16226 diff changeset	3899 if (Py_UNICODE_ISLOWER(*s)) {
bacbb45fe844 Fixed .capitalize() method of Unicode objects to work like the Marc-André Lemburg <mal@egenix.com> parents: 16226 diff changeset	3900 s = Py_UNICODE_TOUPPER(s);
bacbb45fe844 Fixed .capitalize() method of Unicode objects to work like the Marc-André Lemburg <mal@egenix.com> parents: 16226 diff changeset	3901 status = 1;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3902 }
16332 bacbb45fe844 Fixed .capitalize() method of Unicode objects to work like the Marc-André Lemburg <mal@egenix.com> parents: 16226 diff changeset	3903 s++;
bacbb45fe844 Fixed .capitalize() method of Unicode objects to work like the Marc-André Lemburg <mal@egenix.com> parents: 16226 diff changeset	3904 while (--len > 0) {
bacbb45fe844 Fixed .capitalize() method of Unicode objects to work like the Marc-André Lemburg <mal@egenix.com> parents: 16226 diff changeset	3905 if (Py_UNICODE_ISUPPER(*s)) {
bacbb45fe844 Fixed .capitalize() method of Unicode objects to work like the Marc-André Lemburg <mal@egenix.com> parents: 16226 diff changeset	3906 s = Py_UNICODE_TOLOWER(s);
bacbb45fe844 Fixed .capitalize() method of Unicode objects to work like the Marc-André Lemburg <mal@egenix.com> parents: 16226 diff changeset	3907 status = 1;
bacbb45fe844 Fixed .capitalize() method of Unicode objects to work like the Marc-André Lemburg <mal@egenix.com> parents: 16226 diff changeset	3908 }
bacbb45fe844 Fixed .capitalize() method of Unicode objects to work like the Marc-André Lemburg <mal@egenix.com> parents: 16226 diff changeset	3909 s++;
bacbb45fe844 Fixed .capitalize() method of Unicode objects to work like the Marc-André Lemburg <mal@egenix.com> parents: 16226 diff changeset	3910 }
bacbb45fe844 Fixed .capitalize() method of Unicode objects to work like the Marc-André Lemburg <mal@egenix.com> parents: 16226 diff changeset	3911 return status;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3912 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3913
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3914 static
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3915 int fixtitle(PyUnicodeObject *self)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3916 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3917 register Py_UNICODE *p = PyUnicode_AS_UNICODE(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3918 register Py_UNICODE *e;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3919 int previous_is_cased;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3920
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3921 /* Shortcut for single character strings */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3922 if (PyUnicode_GET_SIZE(self) == 1) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3923 Py_UNICODE ch = Py_UNICODE_TOTITLE(*p);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3924 if (*p != ch) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3925 *p = ch;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3926 return 1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3927 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3928 else
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3929 return 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3930 }
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3931
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3932 e = p + PyUnicode_GET_SIZE(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3933 previous_is_cased = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3934 for (; p < e; p++) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3935 register const Py_UNICODE ch = *p;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3936
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3937 if (previous_is_cased)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3938 *p = Py_UNICODE_TOLOWER(ch);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3939 else
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3940 *p = Py_UNICODE_TOTITLE(ch);
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3941
76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3942 if (Py_UNICODE_ISLOWER(ch) \|\|
76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3943 Py_UNICODE_ISUPPER(ch) \|\|
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3944 Py_UNICODE_ISTITLE(ch))
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3945 previous_is_cased = 1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3946 else
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3947 previous_is_cased = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3948 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3949 return 1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3950 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3951
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3952 PyObject PyUnicode_Join(PyObject separator,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3953 PyObject *seq)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3954 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3955 Py_UNICODE *sep;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3956 int seplen;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3957 PyUnicodeObject *res = NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3958 int reslen = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3959 Py_UNICODE *p;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3960 int sz = 100;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3961 int i;
17687 9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17640 diff changeset	3962 PyObject *it;
9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17640 diff changeset	3963
9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17640 diff changeset	3964 it = PyObject_GetIter(seq);
9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17640 diff changeset	3965 if (it == NULL)
9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17640 diff changeset	3966 return NULL;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3967
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3968 if (separator == NULL) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3969 Py_UNICODE blank = ' ';
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3970 sep = &blank;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3971 seplen = 1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3972 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3973 else {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3974 separator = PyUnicode_FromObject(separator);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3975 if (separator == NULL)
17687 9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17640 diff changeset	3976 goto onError;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3977 sep = PyUnicode_AS_UNICODE(separator);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3978 seplen = PyUnicode_GET_SIZE(separator);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3979 }
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	3980
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3981 res = _PyUnicode_New(sz);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3982 if (res == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3983 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3984 p = PyUnicode_AS_UNICODE(res);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3985 reslen = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3986
17687 9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17640 diff changeset	3987 for (i = 0; ; ++i) {
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3988 int itemlen;
17687 9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17640 diff changeset	3989 PyObject *item = PyIter_Next(it);
9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17640 diff changeset	3990 if (item == NULL) {
9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17640 diff changeset	3991 if (PyErr_Occurred())
9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17640 diff changeset	3992 goto onError;
9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17640 diff changeset	3993 break;
9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17640 diff changeset	3994 }
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3995 if (!PyUnicode_Check(item)) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	3996 PyObject *v;
20007 56ffee1eeeec Fix Unicode .join() method to raise a TypeError for sequence Marc-André Lemburg <mal@egenix.com> parents: 19999 diff changeset	3997 if (!PyString_Check(item)) {
56ffee1eeeec Fix Unicode .join() method to raise a TypeError for sequence Marc-André Lemburg <mal@egenix.com> parents: 19999 diff changeset	3998 PyErr_Format(PyExc_TypeError,
56ffee1eeeec Fix Unicode .join() method to raise a TypeError for sequence Marc-André Lemburg <mal@egenix.com> parents: 19999 diff changeset	3999 "sequence item %i: expected string or Unicode,"
56ffee1eeeec Fix Unicode .join() method to raise a TypeError for sequence Marc-André Lemburg <mal@egenix.com> parents: 19999 diff changeset	4000 " %.80s found",
56ffee1eeeec Fix Unicode .join() method to raise a TypeError for sequence Marc-André Lemburg <mal@egenix.com> parents: 19999 diff changeset	4001 i, item->ob_type->tp_name);
56ffee1eeeec Fix Unicode .join() method to raise a TypeError for sequence Marc-André Lemburg <mal@egenix.com> parents: 19999 diff changeset	4002 Py_DECREF(item);
56ffee1eeeec Fix Unicode .join() method to raise a TypeError for sequence Marc-André Lemburg <mal@egenix.com> parents: 19999 diff changeset	4003 goto onError;
56ffee1eeeec Fix Unicode .join() method to raise a TypeError for sequence Marc-André Lemburg <mal@egenix.com> parents: 19999 diff changeset	4004 }
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4005 v = PyUnicode_FromObject(item);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4006 Py_DECREF(item);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4007 item = v;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4008 if (item == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4009 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4010 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4011 itemlen = PyUnicode_GET_SIZE(item);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4012 while (reslen + itemlen + seplen >= sz) {
30431 cd0c3f916b34 Change checks of PyUnicode_Resize() return value for clarity. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30216 diff changeset	4013 if (_PyUnicode_Resize(&res, sz*2) < 0) {
20007 56ffee1eeeec Fix Unicode .join() method to raise a TypeError for sequence Marc-André Lemburg <mal@egenix.com> parents: 19999 diff changeset	4014 Py_DECREF(item);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4015 goto onError;
20007 56ffee1eeeec Fix Unicode .join() method to raise a TypeError for sequence Marc-André Lemburg <mal@egenix.com> parents: 19999 diff changeset	4016 }
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4017 sz *= 2;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4018 p = PyUnicode_AS_UNICODE(res) + reslen;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4019 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4020 if (i > 0) {
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	4021 Py_UNICODE_COPY(p, sep, seplen);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4022 p += seplen;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4023 reslen += seplen;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4024 }
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	4025 Py_UNICODE_COPY(p, PyUnicode_AS_UNICODE(item), itemlen);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4026 p += itemlen;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4027 reslen += itemlen;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4028 Py_DECREF(item);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4029 }
30431 cd0c3f916b34 Change checks of PyUnicode_Resize() return value for clarity. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30216 diff changeset	4030 if (_PyUnicode_Resize(&res, reslen) < 0)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4031 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4032
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4033 Py_XDECREF(separator);
17687 9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17640 diff changeset	4034 Py_DECREF(it);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4035 return (PyObject *)res;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4036
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4037 onError:
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4038 Py_XDECREF(separator);
17687 9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17640 diff changeset	4039 Py_XDECREF(res);
9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17640 diff changeset	4040 Py_DECREF(it);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4041 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4042 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4043
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	4044 static
76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	4045 PyUnicodeObject pad(PyUnicodeObject self,
76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	4046 int left,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4047 int right,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4048 Py_UNICODE fill)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4049 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4050 PyUnicodeObject *u;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4051
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4052 if (left < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4053 left = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4054 if (right < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4055 right = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4056
19885 72e6eb653312 More on bug 460020: disable many optimizations of unicode subclasses. Tim Peters <tim.peters@gmail.com> parents: 19849 diff changeset	4057 if (left == 0 && right == 0 && PyUnicode_CheckExact(self)) {
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4058 Py_INCREF(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4059 return self;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4060 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4061
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4062 u = _PyUnicode_New(left + self->length + right);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4063 if (u) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4064 if (left)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4065 Py_UNICODE_FILL(u->str, fill, left);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4066 Py_UNICODE_COPY(u->str + left, self->str, self->length);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4067 if (right)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4068 Py_UNICODE_FILL(u->str + left + self->length, fill, right);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4069 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4070
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4071 return u;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4072 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4073
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4074 #define SPLIT_APPEND(data, left, right) \
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4075 str = PyUnicode_FromUnicode((data) + (left), (right) - (left)); \
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4076 if (!str) \
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4077 goto onError; \
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4078 if (PyList_Append(list, str)) { \
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4079 Py_DECREF(str); \
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4080 goto onError; \
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4081 } \
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4082 else \
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4083 Py_DECREF(str);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4084
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4085 #define SPLIT_INSERT(data, left, right) \
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4086 str = PyUnicode_FromUnicode((data) + (left), (right) - (left)); \
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4087 if (!str) \
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4088 goto onError; \
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4089 if (PyList_Insert(list, 0, str)) { \
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4090 Py_DECREF(str); \
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4091 goto onError; \
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4092 } \
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4093 else \
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4094 Py_DECREF(str);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4095
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4096 static
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4097 PyObject split_whitespace(PyUnicodeObject self,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4098 PyObject *list,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4099 int maxcount)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4100 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4101 register int i;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4102 register int j;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4103 int len = self->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4104 PyObject *str;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4105
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4106 for (i = j = 0; i < len; ) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4107 /* find a token */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4108 while (i < len && Py_UNICODE_ISSPACE(self->str[i]))
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4109 i++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4110 j = i;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4111 while (i < len && !Py_UNICODE_ISSPACE(self->str[i]))
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4112 i++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4113 if (j < i) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4114 if (maxcount-- <= 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4115 break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4116 SPLIT_APPEND(self->str, j, i);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4117 while (i < len && Py_UNICODE_ISSPACE(self->str[i]))
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4118 i++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4119 j = i;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4120 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4121 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4122 if (j < len) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4123 SPLIT_APPEND(self->str, j, len);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4124 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4125 return list;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4126
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4127 onError:
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4128 Py_DECREF(list);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4129 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4130 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4131
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4132 PyObject PyUnicode_Splitlines(PyObject string,
12369 68e48bb94071 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12329 diff changeset	4133 int keepends)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4134 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4135 register int i;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4136 register int j;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4137 int len;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4138 PyObject *list;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4139 PyObject *str;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4140 Py_UNICODE *data;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4141
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4142 string = PyUnicode_FromObject(string);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4143 if (string == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4144 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4145 data = PyUnicode_AS_UNICODE(string);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4146 len = PyUnicode_GET_SIZE(string);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4147
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4148 list = PyList_New(0);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4149 if (!list)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4150 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4151
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4152 for (i = j = 0; i < len; ) {
12369 68e48bb94071 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12329 diff changeset	4153 int eol;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	4154
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4155 /* Find a line and append it */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4156 while (i < len && !Py_UNICODE_ISLINEBREAK(data[i]))
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4157 i++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4158
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4159 /* Skip the line break reading CRLF as one line break */
12369 68e48bb94071 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12329 diff changeset	4160 eol = i;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4161 if (i < len) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4162 if (data[i] == '\r' && i + 1 < len &&
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4163 data[i+1] == '\n')
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4164 i += 2;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4165 else
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4166 i++;
12369 68e48bb94071 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12329 diff changeset	4167 if (keepends)
68e48bb94071 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12329 diff changeset	4168 eol = i;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4169 }
12369 68e48bb94071 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12329 diff changeset	4170 SPLIT_APPEND(data, j, eol);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4171 j = i;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4172 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4173 if (j < len) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4174 SPLIT_APPEND(data, j, len);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4175 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4176
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4177 Py_DECREF(string);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4178 return list;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4179
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4180 onError:
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4181 Py_DECREF(list);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4182 Py_DECREF(string);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4183 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4184 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4185
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	4186 static
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4187 PyObject split_char(PyUnicodeObject self,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4188 PyObject *list,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4189 Py_UNICODE ch,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4190 int maxcount)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4191 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4192 register int i;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4193 register int j;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4194 int len = self->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4195 PyObject *str;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4196
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4197 for (i = j = 0; i < len; ) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4198 if (self->str[i] == ch) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4199 if (maxcount-- <= 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4200 break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4201 SPLIT_APPEND(self->str, j, i);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4202 i = j = i + 1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4203 } else
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4204 i++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4205 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4206 if (j <= len) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4207 SPLIT_APPEND(self->str, j, len);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4208 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4209 return list;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4210
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4211 onError:
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4212 Py_DECREF(list);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4213 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4214 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4215
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	4216 static
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4217 PyObject split_substring(PyUnicodeObject self,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4218 PyObject *list,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4219 PyUnicodeObject *substring,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4220 int maxcount)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4221 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4222 register int i;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4223 register int j;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4224 int len = self->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4225 int sublen = substring->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4226 PyObject *str;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4227
15609 0906c8e2c961 Fix off-by-one error in split_substring(). Fixes SF bug #122162. Guido van Rossum <guido@python.org> parents: 15579 diff changeset	4228 for (i = j = 0; i <= len - sublen; ) {
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4229 if (Py_UNICODE_MATCH(self, i, substring)) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4230 if (maxcount-- <= 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4231 break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4232 SPLIT_APPEND(self->str, j, i);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4233 i = j = i + sublen;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4234 } else
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4235 i++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4236 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4237 if (j <= len) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4238 SPLIT_APPEND(self->str, j, len);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4239 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4240 return list;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4241
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4242 onError:
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4243 Py_DECREF(list);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4244 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4245 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4246
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4247 static
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4248 PyObject rsplit_whitespace(PyUnicodeObject self,
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4249 PyObject *list,
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4250 int maxcount)
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4251 {
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4252 register int i;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4253 register int j;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4254 int len = self->length;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4255 PyObject *str;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4256
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4257 for (i = j = len - 1; i >= 0; ) {
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4258 /* find a token */
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4259 while (i >= 0 && Py_UNICODE_ISSPACE(self->str[i]))
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4260 i--;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4261 j = i;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4262 while (i >= 0 && !Py_UNICODE_ISSPACE(self->str[i]))
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4263 i--;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4264 if (j > i) {
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4265 if (maxcount-- <= 0)
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4266 break;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4267 SPLIT_INSERT(self->str, i + 1, j + 1);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4268 while (i >= 0 && Py_UNICODE_ISSPACE(self->str[i]))
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4269 i--;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4270 j = i;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4271 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4272 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4273 if (j >= 0) {
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4274 SPLIT_INSERT(self->str, 0, j + 1);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4275 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4276 return list;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4277
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4278 onError:
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4279 Py_DECREF(list);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4280 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4281 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4282
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4283 static
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4284 PyObject rsplit_char(PyUnicodeObject self,
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4285 PyObject *list,
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4286 Py_UNICODE ch,
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4287 int maxcount)
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4288 {
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4289 register int i;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4290 register int j;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4291 int len = self->length;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4292 PyObject *str;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4293
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4294 for (i = j = len - 1; i >= 0; ) {
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4295 if (self->str[i] == ch) {
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4296 if (maxcount-- <= 0)
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4297 break;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4298 SPLIT_INSERT(self->str, i + 1, j + 1);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4299 j = i = i - 1;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4300 } else
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4301 i--;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4302 }
31252 892116a886e0 Fix unicode.rsplit()'s bug that ignores separater on the end of string when Hye-Shik Chang <hyeshik@gmail.com> parents: 31248 diff changeset	4303 if (j >= -1) {
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4304 SPLIT_INSERT(self->str, 0, j + 1);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4305 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4306 return list;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4307
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4308 onError:
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4309 Py_DECREF(list);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4310 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4311 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4312
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4313 static
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4314 PyObject rsplit_substring(PyUnicodeObject self,
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4315 PyObject *list,
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4316 PyUnicodeObject *substring,
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4317 int maxcount)
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4318 {
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4319 register int i;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4320 register int j;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4321 int len = self->length;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4322 int sublen = substring->length;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4323 PyObject *str;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4324
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4325 for (i = len - sublen, j = len; i >= 0; ) {
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4326 if (Py_UNICODE_MATCH(self, i, substring)) {
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4327 if (maxcount-- <= 0)
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4328 break;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4329 SPLIT_INSERT(self->str, i + sublen, j);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4330 j = i;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4331 i -= sublen;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4332 } else
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4333 i--;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4334 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4335 if (j >= 0) {
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4336 SPLIT_INSERT(self->str, 0, j);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4337 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4338 return list;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4339
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4340 onError:
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4341 Py_DECREF(list);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4342 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4343 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4344
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4345 #undef SPLIT_APPEND
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4346 #undef SPLIT_INSERT
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4347
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4348 static
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4349 PyObject split(PyUnicodeObject self,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4350 PyUnicodeObject *substring,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4351 int maxcount)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4352 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4353 PyObject *list;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4354
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4355 if (maxcount < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4356 maxcount = INT_MAX;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4357
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4358 list = PyList_New(0);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4359 if (!list)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4360 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4361
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4362 if (substring == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4363 return split_whitespace(self,list,maxcount);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4364
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4365 else if (substring->length == 1)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4366 return split_char(self,list,substring->str[0],maxcount);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4367
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4368 else if (substring->length == 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4369 Py_DECREF(list);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4370 PyErr_SetString(PyExc_ValueError, "empty separator");
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4371 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4372 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4373 else
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4374 return split_substring(self,list,substring,maxcount);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4375 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4376
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	4377 static
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4378 PyObject rsplit(PyUnicodeObject self,
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4379 PyUnicodeObject *substring,
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4380 int maxcount)
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4381 {
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4382 PyObject *list;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4383
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4384 if (maxcount < 0)
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4385 maxcount = INT_MAX;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4386
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4387 list = PyList_New(0);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4388 if (!list)
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4389 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4390
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4391 if (substring == NULL)
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4392 return rsplit_whitespace(self,list,maxcount);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4393
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4394 else if (substring->length == 1)
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4395 return rsplit_char(self,list,substring->str[0],maxcount);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4396
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4397 else if (substring->length == 0) {
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4398 Py_DECREF(list);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4399 PyErr_SetString(PyExc_ValueError, "empty separator");
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4400 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4401 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4402 else
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4403 return rsplit_substring(self,list,substring,maxcount);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4404 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4405
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	4406 static
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4407 PyObject replace(PyUnicodeObject self,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4408 PyUnicodeObject *str1,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4409 PyUnicodeObject *str2,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4410 int maxcount)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4411 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4412 PyUnicodeObject *u;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4413
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4414 if (maxcount < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4415 maxcount = INT_MAX;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4416
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4417 if (str1->length == 1 && str2->length == 1) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4418 int i;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4419
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4420 /* replace characters */
19885 72e6eb653312 More on bug 460020: disable many optimizations of unicode subclasses. Tim Peters <tim.peters@gmail.com> parents: 19849 diff changeset	4421 if (!findchar(self->str, self->length, str1->str[0]) &&
72e6eb653312 More on bug 460020: disable many optimizations of unicode subclasses. Tim Peters <tim.peters@gmail.com> parents: 19849 diff changeset	4422 PyUnicode_CheckExact(self)) {
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4423 /* nothing to replace, return original string */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4424 Py_INCREF(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4425 u = self;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4426 } else {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4427 Py_UNICODE u1 = str1->str[0];
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4428 Py_UNICODE u2 = str2->str[0];
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	4429
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4430 u = (PyUnicodeObject*) PyUnicode_FromUnicode(
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	4431 NULL,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4432 self->length
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4433 );
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	4434 if (u != NULL) {
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	4435 Py_UNICODE_COPY(u->str, self->str,
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	4436 self->length);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4437 for (i = 0; i < u->length; i++)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4438 if (u->str[i] == u1) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4439 if (--maxcount < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4440 break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4441 u->str[i] = u2;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4442 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4443 }
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	4444 }
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4445
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4446 } else {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4447 int n, i;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4448 Py_UNICODE *p;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4449
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4450 /* replace strings */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4451 n = count(self, 0, self->length, str1);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4452 if (n > maxcount)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4453 n = maxcount;
25005 12bb6f0c60f8 Fix SF bug 599128, submitted by Inyeol Lee: .replace() would do the Guido van Rossum <guido@python.org> parents: 25004 diff changeset	4454 if (n == 0) {
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4455 /* nothing to replace, return original string */
25005 12bb6f0c60f8 Fix SF bug 599128, submitted by Inyeol Lee: .replace() would do the Guido van Rossum <guido@python.org> parents: 25004 diff changeset	4456 if (PyUnicode_CheckExact(self)) {
12bb6f0c60f8 Fix SF bug 599128, submitted by Inyeol Lee: .replace() would do the Guido van Rossum <guido@python.org> parents: 25004 diff changeset	4457 Py_INCREF(self);
12bb6f0c60f8 Fix SF bug 599128, submitted by Inyeol Lee: .replace() would do the Guido van Rossum <guido@python.org> parents: 25004 diff changeset	4458 u = self;
12bb6f0c60f8 Fix SF bug 599128, submitted by Inyeol Lee: .replace() would do the Guido van Rossum <guido@python.org> parents: 25004 diff changeset	4459 }
12bb6f0c60f8 Fix SF bug 599128, submitted by Inyeol Lee: .replace() would do the Guido van Rossum <guido@python.org> parents: 25004 diff changeset	4460 else {
12bb6f0c60f8 Fix SF bug 599128, submitted by Inyeol Lee: .replace() would do the Guido van Rossum <guido@python.org> parents: 25004 diff changeset	4461 u = (PyUnicodeObject *)
12bb6f0c60f8 Fix SF bug 599128, submitted by Inyeol Lee: .replace() would do the Guido van Rossum <guido@python.org> parents: 25004 diff changeset	4462 PyUnicode_FromUnicode(self->str, self->length);
12bb6f0c60f8 Fix SF bug 599128, submitted by Inyeol Lee: .replace() would do the Guido van Rossum <guido@python.org> parents: 25004 diff changeset	4463 }
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4464 } else {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4465 u = _PyUnicode_New(
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4466 self->length + n * (str2->length - str1->length));
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4467 if (u) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4468 i = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4469 p = u->str;
25004 762dd09edb83 Code by Inyeol Lee, submitted to SF bug 595350, to implement Guido van Rossum <guido@python.org> parents: 24918 diff changeset	4470 if (str1->length > 0) {
762dd09edb83 Code by Inyeol Lee, submitted to SF bug 595350, to implement Guido van Rossum <guido@python.org> parents: 24918 diff changeset	4471 while (i <= self->length - str1->length)
762dd09edb83 Code by Inyeol Lee, submitted to SF bug 595350, to implement Guido van Rossum <guido@python.org> parents: 24918 diff changeset	4472 if (Py_UNICODE_MATCH(self, i, str1)) {
762dd09edb83 Code by Inyeol Lee, submitted to SF bug 595350, to implement Guido van Rossum <guido@python.org> parents: 24918 diff changeset	4473 /* replace string segment */
762dd09edb83 Code by Inyeol Lee, submitted to SF bug 595350, to implement Guido van Rossum <guido@python.org> parents: 24918 diff changeset	4474 Py_UNICODE_COPY(p, str2->str, str2->length);
762dd09edb83 Code by Inyeol Lee, submitted to SF bug 595350, to implement Guido van Rossum <guido@python.org> parents: 24918 diff changeset	4475 p += str2->length;
762dd09edb83 Code by Inyeol Lee, submitted to SF bug 595350, to implement Guido van Rossum <guido@python.org> parents: 24918 diff changeset	4476 i += str1->length;
762dd09edb83 Code by Inyeol Lee, submitted to SF bug 595350, to implement Guido van Rossum <guido@python.org> parents: 24918 diff changeset	4477 if (--n <= 0) {
762dd09edb83 Code by Inyeol Lee, submitted to SF bug 595350, to implement Guido van Rossum <guido@python.org> parents: 24918 diff changeset	4478 /* copy remaining part */
762dd09edb83 Code by Inyeol Lee, submitted to SF bug 595350, to implement Guido van Rossum <guido@python.org> parents: 24918 diff changeset	4479 Py_UNICODE_COPY(p, self->str+i, self->length-i);
762dd09edb83 Code by Inyeol Lee, submitted to SF bug 595350, to implement Guido van Rossum <guido@python.org> parents: 24918 diff changeset	4480 break;
762dd09edb83 Code by Inyeol Lee, submitted to SF bug 595350, to implement Guido van Rossum <guido@python.org> parents: 24918 diff changeset	4481 }
762dd09edb83 Code by Inyeol Lee, submitted to SF bug 595350, to implement Guido van Rossum <guido@python.org> parents: 24918 diff changeset	4482 } else
762dd09edb83 Code by Inyeol Lee, submitted to SF bug 595350, to implement Guido van Rossum <guido@python.org> parents: 24918 diff changeset	4483 *p++ = self->str[i++];
762dd09edb83 Code by Inyeol Lee, submitted to SF bug 595350, to implement Guido van Rossum <guido@python.org> parents: 24918 diff changeset	4484 } else {
762dd09edb83 Code by Inyeol Lee, submitted to SF bug 595350, to implement Guido van Rossum <guido@python.org> parents: 24918 diff changeset	4485 while (n > 0) {
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4486 Py_UNICODE_COPY(p, str2->str, str2->length);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4487 p += str2->length;
25004 762dd09edb83 Code by Inyeol Lee, submitted to SF bug 595350, to implement Guido van Rossum <guido@python.org> parents: 24918 diff changeset	4488 if (--n <= 0)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4489 break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4490 *p++ = self->str[i++];
25004 762dd09edb83 Code by Inyeol Lee, submitted to SF bug 595350, to implement Guido van Rossum <guido@python.org> parents: 24918 diff changeset	4491 }
762dd09edb83 Code by Inyeol Lee, submitted to SF bug 595350, to implement Guido van Rossum <guido@python.org> parents: 24918 diff changeset	4492 Py_UNICODE_COPY(p, self->str+i, self->length-i);
762dd09edb83 Code by Inyeol Lee, submitted to SF bug 595350, to implement Guido van Rossum <guido@python.org> parents: 24918 diff changeset	4493 }
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4494 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4495 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4496 }
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	4497
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4498 return (PyObject *) u;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4499 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4500
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4501 /* --- Unicode Object Methods --------------------------------------------- */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4502
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	4503 PyDoc_STRVAR(title__doc__,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4504 "S.title() -> unicode\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4505 \n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4506 Return a titlecased version of S, i.e. words start with title case\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	4507 characters, all remaining cased characters have lower case.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4508
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4509 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	4510 unicode_title(PyUnicodeObject *self)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4511 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4512 return fixup(self, fixtitle);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4513 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4514
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	4515 PyDoc_STRVAR(capitalize__doc__,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4516 "S.capitalize() -> unicode\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4517 \n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4518 Return a capitalized version of S, i.e. make the first character\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	4519 have upper case.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4520
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4521 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	4522 unicode_capitalize(PyUnicodeObject *self)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4523 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4524 return fixup(self, fixcapitalize);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4525 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4526
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4527 #if 0
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	4528 PyDoc_STRVAR(capwords__doc__,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4529 "S.capwords() -> unicode\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4530 \n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4531 Apply .capitalize() to all words in S and return the result with\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	4532 normalized whitespace (all whitespace strings are replaced by ' ').");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4533
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4534 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	4535 unicode_capwords(PyUnicodeObject *self)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4536 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4537 PyObject *list;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4538 PyObject *item;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4539 int i;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4540
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4541 /* Split into words */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4542 list = split(self, NULL, -1);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4543 if (!list)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4544 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4545
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4546 /* Capitalize each word */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4547 for (i = 0; i < PyList_GET_SIZE(list); i++) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4548 item = fixup((PyUnicodeObject *)PyList_GET_ITEM(list, i),
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4549 fixcapitalize);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4550 if (item == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4551 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4552 Py_DECREF(PyList_GET_ITEM(list, i));
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4553 PyList_SET_ITEM(list, i, item);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4554 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4555
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4556 /* Join the words to form a new string */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4557 item = PyUnicode_Join(NULL, list);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4558
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4559 onError:
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4560 Py_DECREF(list);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4561 return (PyObject *)item;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4562 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4563 #endif
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4564
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4565 /* Argument converter. Coerces to a single unicode character */
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4566
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4567 static int
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4568 convert_uc(PyObject obj, void addr)
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4569 {
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4570 Py_UNICODE fillcharloc = (Py_UNICODE )addr;
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4571 PyObject *uniobj;
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4572 Py_UNICODE *unistr;
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4573
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4574 uniobj = PyUnicode_FromObject(obj);
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4575 if (uniobj == NULL) {
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4576 PyErr_SetString(PyExc_TypeError,
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4577 "The fill character cannot be converted to Unicode");
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4578 return 0;
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4579 }
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4580 if (PyUnicode_GET_SIZE(uniobj) != 1) {
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4581 PyErr_SetString(PyExc_TypeError,
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4582 "The fill character must be exactly one character long");
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4583 Py_DECREF(uniobj);
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4584 return 0;
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4585 }
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4586 unistr = PyUnicode_AS_UNICODE(uniobj);
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4587 *fillcharloc = unistr[0];
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4588 Py_DECREF(uniobj);
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4589 return 1;
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4590 }
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4591
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	4592 PyDoc_STRVAR(center__doc__,
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4593 "S.center(width[, fillchar]) -> unicode\n\
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4594 \n\
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4595 Return S centered in a Unicode string of length width. Padding is\n\
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4596 done using the specified fill character (default is a space)");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4597
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4598 static PyObject *
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4599 unicode_center(PyUnicodeObject self, PyObject args)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4600 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4601 int marg, left;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4602 int width;
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4603 Py_UNICODE fillchar = ' ';
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4604
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4605 if (!PyArg_ParseTuple(args, "i\|O&:center", &width, convert_uc, &fillchar))
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4606 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4607
19885 72e6eb653312 More on bug 460020: disable many optimizations of unicode subclasses. Tim Peters <tim.peters@gmail.com> parents: 19849 diff changeset	4608 if (self->length >= width && PyUnicode_CheckExact(self)) {
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4609 Py_INCREF(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4610 return (PyObject*) self;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4611 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4612
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4613 marg = width - self->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4614 left = marg / 2 + (marg & width & 1);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4615
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	4616 return (PyObject*) pad(self, left, marg - left, fillchar);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4617 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4618
13890 8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4619 #if 0
8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4620
8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4621 /* This code should go into some future Unicode collation support
8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4622 module. The basic comparison should compare ordinals on a naive
13946 7a99450da2d6 Clean up warning from Monterey compiler. Trent Mick <trentm@activestate.com> parents: 13890 diff changeset	4623 basis (this is what Java does and thus JPython too). */
13890 8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4624
13337 e101600adee4 Bill Tutt: Marc-André Lemburg <mal@egenix.com> parents: 13209 diff changeset	4625 /* speedy UTF-16 code point order comparison */
e101600adee4 Bill Tutt: Marc-André Lemburg <mal@egenix.com> parents: 13209 diff changeset	4626 /* gleaned from: */
e101600adee4 Bill Tutt: Marc-André Lemburg <mal@egenix.com> parents: 13209 diff changeset	4627 /* http://www-4.ibm.com/software/developer/library/utf16.html?dwzone=unicode */
e101600adee4 Bill Tutt: Marc-André Lemburg <mal@egenix.com> parents: 13209 diff changeset	4628
13411 9a8391054840 New surrogate support in the UTF-8 codec. By Bill Tutt. Marc-André Lemburg <mal@egenix.com> parents: 13401 diff changeset	4629 static short utf16Fixup[32] =
13337 e101600adee4 Bill Tutt: Marc-André Lemburg <mal@egenix.com> parents: 13209 diff changeset	4630 {
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	4631 0, 0, 0, 0, 0, 0, 0, 0,
13337 e101600adee4 Bill Tutt: Marc-André Lemburg <mal@egenix.com> parents: 13209 diff changeset	4632 0, 0, 0, 0, 0, 0, 0, 0,
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	4633 0, 0, 0, 0, 0, 0, 0, 0,
13411 9a8391054840 New surrogate support in the UTF-8 codec. By Bill Tutt. Marc-André Lemburg <mal@egenix.com> parents: 13401 diff changeset	4634 0, 0, 0, 0x2000, -0x800, -0x800, -0x800, -0x800
13337 e101600adee4 Bill Tutt: Marc-André Lemburg <mal@egenix.com> parents: 13209 diff changeset	4635 };
e101600adee4 Bill Tutt: Marc-André Lemburg <mal@egenix.com> parents: 13209 diff changeset	4636
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4637 static int
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4638 unicode_compare(PyUnicodeObject str1, PyUnicodeObject str2)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4639 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4640 int len1, len2;
13337 e101600adee4 Bill Tutt: Marc-André Lemburg <mal@egenix.com> parents: 13209 diff changeset	4641
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4642 Py_UNICODE *s1 = str1->str;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4643 Py_UNICODE *s2 = str2->str;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4644
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4645 len1 = str1->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4646 len2 = str2->length;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	4647
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4648 while (len1 > 0 && len2 > 0) {
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	4649 Py_UNICODE c1, c2;
13337 e101600adee4 Bill Tutt: Marc-André Lemburg <mal@egenix.com> parents: 13209 diff changeset	4650
e101600adee4 Bill Tutt: Marc-André Lemburg <mal@egenix.com> parents: 13209 diff changeset	4651 c1 = *s1++;
e101600adee4 Bill Tutt: Marc-André Lemburg <mal@egenix.com> parents: 13209 diff changeset	4652 c2 = *s2++;
18279 8b7ff44b4669 experimental UCS-4 support: made compare a bit more robust, in case Fredrik Lundh <fredrik@pythonware.com> parents: 18278 diff changeset	4653
13337 e101600adee4 Bill Tutt: Marc-André Lemburg <mal@egenix.com> parents: 13209 diff changeset	4654 if (c1 > (1<<11) * 26)
e101600adee4 Bill Tutt: Marc-André Lemburg <mal@egenix.com> parents: 13209 diff changeset	4655 c1 += utf16Fixup[c1>>11];
e101600adee4 Bill Tutt: Marc-André Lemburg <mal@egenix.com> parents: 13209 diff changeset	4656 if (c2 > (1<<11) * 26)
e101600adee4 Bill Tutt: Marc-André Lemburg <mal@egenix.com> parents: 13209 diff changeset	4657 c2 += utf16Fixup[c2>>11];
18279 8b7ff44b4669 experimental UCS-4 support: made compare a bit more robust, in case Fredrik Lundh <fredrik@pythonware.com> parents: 18278 diff changeset	4658 /* now c1 and c2 are in UTF-32-compatible order */
8b7ff44b4669 experimental UCS-4 support: made compare a bit more robust, in case Fredrik Lundh <fredrik@pythonware.com> parents: 18278 diff changeset	4659
8b7ff44b4669 experimental UCS-4 support: made compare a bit more robust, in case Fredrik Lundh <fredrik@pythonware.com> parents: 18278 diff changeset	4660 if (c1 != c2)
8b7ff44b4669 experimental UCS-4 support: made compare a bit more robust, in case Fredrik Lundh <fredrik@pythonware.com> parents: 18278 diff changeset	4661 return (c1 < c2) ? -1 : 1;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	4662
13337 e101600adee4 Bill Tutt: Marc-André Lemburg <mal@egenix.com> parents: 13209 diff changeset	4663 len1--; len2--;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4664 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4665
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4666 return (len1 < len2) ? -1 : (len1 != len2);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4667 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4668
13890 8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4669 #else
8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4670
8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4671 static int
8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4672 unicode_compare(PyUnicodeObject str1, PyUnicodeObject str2)
8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4673 {
8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4674 register int len1, len2;
8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4675
8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4676 Py_UNICODE *s1 = str1->str;
8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4677 Py_UNICODE *s2 = str2->str;
8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4678
8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4679 len1 = str1->length;
8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4680 len2 = str2->length;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	4681
13890 8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4682 while (len1 > 0 && len2 > 0) {
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	4683 Py_UNICODE c1, c2;
18279 8b7ff44b4669 experimental UCS-4 support: made compare a bit more robust, in case Fredrik Lundh <fredrik@pythonware.com> parents: 18278 diff changeset	4684
8b7ff44b4669 experimental UCS-4 support: made compare a bit more robust, in case Fredrik Lundh <fredrik@pythonware.com> parents: 18278 diff changeset	4685 c1 = *s1++;
8b7ff44b4669 experimental UCS-4 support: made compare a bit more robust, in case Fredrik Lundh <fredrik@pythonware.com> parents: 18278 diff changeset	4686 c2 = *s2++;
8b7ff44b4669 experimental UCS-4 support: made compare a bit more robust, in case Fredrik Lundh <fredrik@pythonware.com> parents: 18278 diff changeset	4687
8b7ff44b4669 experimental UCS-4 support: made compare a bit more robust, in case Fredrik Lundh <fredrik@pythonware.com> parents: 18278 diff changeset	4688 if (c1 != c2)
8b7ff44b4669 experimental UCS-4 support: made compare a bit more robust, in case Fredrik Lundh <fredrik@pythonware.com> parents: 18278 diff changeset	4689 return (c1 < c2) ? -1 : 1;
8b7ff44b4669 experimental UCS-4 support: made compare a bit more robust, in case Fredrik Lundh <fredrik@pythonware.com> parents: 18278 diff changeset	4690
13890 8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4691 len1--; len2--;
8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4692 }
8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4693
8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4694 return (len1 < len2) ? -1 : (len1 != len2);
8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4695 }
8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4696
8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4697 #endif
8f0fc0b5f784 Removing UTF-16 aware Unicode comparison code. This kind of compare Marc-André Lemburg <mal@egenix.com> parents: 13837 diff changeset	4698
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4699 int PyUnicode_Compare(PyObject *left,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4700 PyObject *right)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4701 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4702 PyUnicodeObject u = NULL, v = NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4703 int result;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4704
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4705 /* Coerce the two arguments */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4706 u = (PyUnicodeObject *)PyUnicode_FromObject(left);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4707 if (u == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4708 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4709 v = (PyUnicodeObject *)PyUnicode_FromObject(right);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4710 if (v == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4711 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4712
13620 5b727ab37092 Spelling fixes supplied by Rob W. W. Hooft. All these are fixes in either Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	4713 /* Shortcut for empty or interned objects */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4714 if (v == u) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4715 Py_DECREF(u);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4716 Py_DECREF(v);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4717 return 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4718 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4719
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4720 result = unicode_compare(u, v);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4721
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4722 Py_DECREF(u);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4723 Py_DECREF(v);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4724 return result;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4725
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4726 onError:
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4727 Py_XDECREF(u);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4728 Py_XDECREF(v);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4729 return -1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4730 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4731
11997 38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	4732 int PyUnicode_Contains(PyObject *container,
38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	4733 PyObject *element)
38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	4734 {
38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	4735 PyUnicodeObject u = NULL, v = NULL;
24598 12e146171f3d Committing patch #591250 which provides "str1 in str2" when str1 is a Barry Warsaw <barry@python.org> parents: 24392 diff changeset	4736 int result, size;
12e146171f3d Committing patch #591250 which provides "str1 in str2" when str1 is a Barry Warsaw <barry@python.org> parents: 24392 diff changeset	4737 register const Py_UNICODE lhs, end, *rhs;
11997 38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	4738
38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	4739 /* Coerce the two arguments */
38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	4740 v = (PyUnicodeObject *)PyUnicode_FromObject(element);
13049 0be4b7b650e3 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12957 diff changeset	4741 if (v == NULL) {
0be4b7b650e3 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12957 diff changeset	4742 PyErr_SetString(PyExc_TypeError,
24598 12e146171f3d Committing patch #591250 which provides "str1 in str2" when str1 is a Barry Warsaw <barry@python.org> parents: 24392 diff changeset	4743 "'in <string>' requires string as left operand");
11997 38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	4744 goto onError;
13049 0be4b7b650e3 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12957 diff changeset	4745 }
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	4746 u = (PyUnicodeObject *)PyUnicode_FromObject(container);
25895 509bb0b6dfa3 Fix for bug #626172: crash using unicode latin1 single char Marc-André Lemburg <mal@egenix.com> parents: 25719 diff changeset	4747 if (u == NULL)
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12193 diff changeset	4748 goto onError;
11997 38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	4749
24598 12e146171f3d Committing patch #591250 which provides "str1 in str2" when str1 is a Barry Warsaw <barry@python.org> parents: 24392 diff changeset	4750 size = PyUnicode_GET_SIZE(v);
12e146171f3d Committing patch #591250 which provides "str1 in str2" when str1 is a Barry Warsaw <barry@python.org> parents: 24392 diff changeset	4751 rhs = PyUnicode_AS_UNICODE(v);
12e146171f3d Committing patch #591250 which provides "str1 in str2" when str1 is a Barry Warsaw <barry@python.org> parents: 24392 diff changeset	4752 lhs = PyUnicode_AS_UNICODE(u);
12e146171f3d Committing patch #591250 which provides "str1 in str2" when str1 is a Barry Warsaw <barry@python.org> parents: 24392 diff changeset	4753
11997 38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	4754 result = 0;
24598 12e146171f3d Committing patch #591250 which provides "str1 in str2" when str1 is a Barry Warsaw <barry@python.org> parents: 24392 diff changeset	4755 if (size == 1) {
12e146171f3d Committing patch #591250 which provides "str1 in str2" when str1 is a Barry Warsaw <barry@python.org> parents: 24392 diff changeset	4756 end = lhs + PyUnicode_GET_SIZE(u);
12e146171f3d Committing patch #591250 which provides "str1 in str2" when str1 is a Barry Warsaw <barry@python.org> parents: 24392 diff changeset	4757 while (lhs < end) {
12e146171f3d Committing patch #591250 which provides "str1 in str2" when str1 is a Barry Warsaw <barry@python.org> parents: 24392 diff changeset	4758 if (lhs++ == rhs) {
12e146171f3d Committing patch #591250 which provides "str1 in str2" when str1 is a Barry Warsaw <barry@python.org> parents: 24392 diff changeset	4759 result = 1;
12e146171f3d Committing patch #591250 which provides "str1 in str2" when str1 is a Barry Warsaw <barry@python.org> parents: 24392 diff changeset	4760 break;
12e146171f3d Committing patch #591250 which provides "str1 in str2" when str1 is a Barry Warsaw <barry@python.org> parents: 24392 diff changeset	4761 }
12e146171f3d Committing patch #591250 which provides "str1 in str2" when str1 is a Barry Warsaw <barry@python.org> parents: 24392 diff changeset	4762 }
12e146171f3d Committing patch #591250 which provides "str1 in str2" when str1 is a Barry Warsaw <barry@python.org> parents: 24392 diff changeset	4763 }
12e146171f3d Committing patch #591250 which provides "str1 in str2" when str1 is a Barry Warsaw <barry@python.org> parents: 24392 diff changeset	4764 else {
12e146171f3d Committing patch #591250 which provides "str1 in str2" when str1 is a Barry Warsaw <barry@python.org> parents: 24392 diff changeset	4765 end = lhs + (PyUnicode_GET_SIZE(u) - size);
12e146171f3d Committing patch #591250 which provides "str1 in str2" when str1 is a Barry Warsaw <barry@python.org> parents: 24392 diff changeset	4766 while (lhs <= end) {
24608 b6707e159909 PyUnicode_Contains(): The memcmp() call didn't take into account the Barry Warsaw <barry@python.org> parents: 24598 diff changeset	4767 if (memcmp(lhs++, rhs, size * sizeof(Py_UNICODE)) == 0) {
24598 12e146171f3d Committing patch #591250 which provides "str1 in str2" when str1 is a Barry Warsaw <barry@python.org> parents: 24392 diff changeset	4768 result = 1;
12e146171f3d Committing patch #591250 which provides "str1 in str2" when str1 is a Barry Warsaw <barry@python.org> parents: 24392 diff changeset	4769 break;
12e146171f3d Committing patch #591250 which provides "str1 in str2" when str1 is a Barry Warsaw <barry@python.org> parents: 24392 diff changeset	4770 }
11997 38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	4771 }
38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	4772 }
38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	4773
38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	4774 Py_DECREF(u);
38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	4775 Py_DECREF(v);
38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	4776 return result;
38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	4777
38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	4778 onError:
38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	4779 Py_XDECREF(u);
38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	4780 Py_XDECREF(v);
38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	4781 return -1;
38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	4782 }
38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	4783
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4784 /* Concat to string or Unicode object giving a new Unicode object. */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4785
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4786 PyObject PyUnicode_Concat(PyObject left,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4787 PyObject *right)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4788 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4789 PyUnicodeObject u = NULL, v = NULL, *w;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4790
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4791 /* Coerce the two arguments */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4792 u = (PyUnicodeObject *)PyUnicode_FromObject(left);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4793 if (u == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4794 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4795 v = (PyUnicodeObject *)PyUnicode_FromObject(right);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4796 if (v == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4797 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4798
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4799 /* Shortcuts */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4800 if (v == unicode_empty) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4801 Py_DECREF(v);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4802 return (PyObject *)u;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4803 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4804 if (u == unicode_empty) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4805 Py_DECREF(u);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4806 return (PyObject *)v;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4807 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4808
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4809 /* Concat the two Unicode strings */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4810 w = _PyUnicode_New(u->length + v->length);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4811 if (w == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4812 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4813 Py_UNICODE_COPY(w->str, u->str, u->length);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4814 Py_UNICODE_COPY(w->str + u->length, v->str, v->length);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4815
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4816 Py_DECREF(u);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4817 Py_DECREF(v);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4818 return (PyObject *)w;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4819
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4820 onError:
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4821 Py_XDECREF(u);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4822 Py_XDECREF(v);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4823 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4824 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4825
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	4826 PyDoc_STRVAR(count__doc__,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4827 "S.count(sub[, start[, end]]) -> int\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4828 \n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4829 Return the number of occurrences of substring sub in Unicode string\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4830 S[start:end]. Optional arguments start and end are\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	4831 interpreted as in slice notation.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4832
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4833 static PyObject *
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4834 unicode_count(PyUnicodeObject self, PyObject args)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4835 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4836 PyUnicodeObject *substring;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4837 int start = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4838 int end = INT_MAX;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4839 PyObject *result;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4840
12629 3efeaa7521e4 Trent Mick: Guido van Rossum <guido@python.org> parents: 12582 diff changeset	4841 if (!PyArg_ParseTuple(args, "O\|O&O&:count", &substring,
3efeaa7521e4 Trent Mick: Guido van Rossum <guido@python.org> parents: 12582 diff changeset	4842 _PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end))
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4843 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4844
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4845 substring = (PyUnicodeObject *)PyUnicode_FromObject(
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4846 (PyObject *)substring);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4847 if (substring == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4848 return NULL;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	4849
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4850 if (start < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4851 start += self->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4852 if (start < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4853 start = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4854 if (end > self->length)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4855 end = self->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4856 if (end < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4857 end += self->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4858 if (end < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4859 end = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4860
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4861 result = PyInt_FromLong((long) count(self, start, end, substring));
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4862
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4863 Py_DECREF(substring);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4864 return result;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4865 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4866
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	4867 PyDoc_STRVAR(encode__doc__,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4868 "S.encode([encoding[,errors]]) -> string\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4869 \n\
12645 c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	4870 Return an encoded string version of S. Default encoding is the current\n\
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	4871 default string encoding. errors may be given to set a different error\n\
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	4872 handling scheme. Default is 'strict' meaning that encoding errors raise\n\
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	4873 a UnicodeEncodeError. Other possible values are 'ignore', 'replace' and\n\
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	4874 'xmlcharrefreplace' as well as any other name registered with\n\
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25005 diff changeset	4875 codecs.register_error that can handle UnicodeEncodeErrors.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4876
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4877 static PyObject *
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4878 unicode_encode(PyUnicodeObject self, PyObject args)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4879 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4880 char *encoding = NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4881 char *errors = NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4882 if (!PyArg_ParseTuple(args, "\|ss:encode", &encoding, &errors))
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4883 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4884 return PyUnicode_AsEncodedString((PyObject *)self, encoding, errors);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4885 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4886
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	4887 PyDoc_STRVAR(expandtabs__doc__,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4888 "S.expandtabs([tabsize]) -> unicode\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4889 \n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4890 Return a copy of S where all tab characters are expanded using spaces.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	4891 If tabsize is not given, a tab size of 8 characters is assumed.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4892
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4893 static PyObject*
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4894 unicode_expandtabs(PyUnicodeObject self, PyObject args)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4895 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4896 Py_UNICODE *e;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4897 Py_UNICODE *p;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4898 Py_UNICODE *q;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4899 int i, j;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4900 PyUnicodeObject *u;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4901 int tabsize = 8;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4902
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4903 if (!PyArg_ParseTuple(args, "\|i:expandtabs", &tabsize))
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4904 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4905
13620 5b727ab37092 Spelling fixes supplied by Rob W. W. Hooft. All these are fixes in either Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	4906 /* First pass: determine size of output string */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4907 i = j = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4908 e = self->str + self->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4909 for (p = self->str; p < e; p++)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4910 if (*p == '\t') {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4911 if (tabsize > 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4912 j += tabsize - (j % tabsize);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4913 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4914 else {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4915 j++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4916 if (p == '\n' \|\| p == '\r') {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4917 i += j;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4918 j = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4919 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4920 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4921
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4922 /* Second pass: create output string and fill it */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4923 u = _PyUnicode_New(i + j);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4924 if (!u)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4925 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4926
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4927 j = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4928 q = u->str;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4929
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4930 for (p = self->str; p < e; p++)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4931 if (*p == '\t') {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4932 if (tabsize > 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4933 i = tabsize - (j % tabsize);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4934 j += i;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4935 while (i--)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4936 *q++ = ' ';
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4937 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4938 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4939 else {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4940 j++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4941 q++ = p;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4942 if (p == '\n' \|\| p == '\r')
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4943 j = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4944 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4945
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4946 return (PyObject*) u;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4947 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4948
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	4949 PyDoc_STRVAR(find__doc__,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4950 "S.find(sub [,start [,end]]) -> int\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4951 \n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4952 Return the lowest index in S where substring sub is found,\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4953 such that sub is contained within s[start,end]. Optional\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4954 arguments start and end are interpreted as in slice notation.\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4955 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	4956 Return -1 on failure.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4957
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4958 static PyObject *
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4959 unicode_find(PyUnicodeObject self, PyObject args)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4960 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4961 PyUnicodeObject *substring;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4962 int start = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4963 int end = INT_MAX;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4964 PyObject *result;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4965
12629 3efeaa7521e4 Trent Mick: Guido van Rossum <guido@python.org> parents: 12582 diff changeset	4966 if (!PyArg_ParseTuple(args, "O\|O&O&:find", &substring,
3efeaa7521e4 Trent Mick: Guido van Rossum <guido@python.org> parents: 12582 diff changeset	4967 _PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end))
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4968 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4969 substring = (PyUnicodeObject *)PyUnicode_FromObject(
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4970 (PyObject *)substring);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4971 if (substring == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4972 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4973
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4974 result = PyInt_FromLong(findstring(self, substring, start, end, 1));
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4975
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4976 Py_DECREF(substring);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4977 return result;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4978 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4979
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4980 static PyObject *
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4981 unicode_getitem(PyUnicodeObject *self, int index)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4982 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4983 if (index < 0 \|\| index >= self->length) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4984 PyErr_SetString(PyExc_IndexError, "string index out of range");
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4985 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4986 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4987
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4988 return (PyObject*) PyUnicode_FromUnicode(&self->str[index], 1);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4989 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4990
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4991 static long
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4992 unicode_hash(PyUnicodeObject *self)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	4993 {
13522 acc4638f37d5 - changed hash calculation for unicode strings. the new Fredrik Lundh <fredrik@pythonware.com> parents: 13411 diff changeset	4994 /* Since Unicode objects compare equal to their ASCII string
acc4638f37d5 - changed hash calculation for unicode strings. the new Fredrik Lundh <fredrik@pythonware.com> parents: 13411 diff changeset	4995 counterparts, they should use the individual character values
acc4638f37d5 - changed hash calculation for unicode strings. the new Fredrik Lundh <fredrik@pythonware.com> parents: 13411 diff changeset	4996 as basis for their hash value. This is needed to assure that
acc4638f37d5 - changed hash calculation for unicode strings. the new Fredrik Lundh <fredrik@pythonware.com> parents: 13411 diff changeset	4997 strings and Unicode objects behave in the same way as
acc4638f37d5 - changed hash calculation for unicode strings. the new Fredrik Lundh <fredrik@pythonware.com> parents: 13411 diff changeset	4998 dictionary keys. */
acc4638f37d5 - changed hash calculation for unicode strings. the new Fredrik Lundh <fredrik@pythonware.com> parents: 13411 diff changeset	4999
acc4638f37d5 - changed hash calculation for unicode strings. the new Fredrik Lundh <fredrik@pythonware.com> parents: 13411 diff changeset	5000 register int len;
acc4638f37d5 - changed hash calculation for unicode strings. the new Fredrik Lundh <fredrik@pythonware.com> parents: 13411 diff changeset	5001 register Py_UNICODE *p;
acc4638f37d5 - changed hash calculation for unicode strings. the new Fredrik Lundh <fredrik@pythonware.com> parents: 13411 diff changeset	5002 register long x;
acc4638f37d5 - changed hash calculation for unicode strings. the new Fredrik Lundh <fredrik@pythonware.com> parents: 13411 diff changeset	5003
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5004 if (self->hash != -1)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5005 return self->hash;
13522 acc4638f37d5 - changed hash calculation for unicode strings. the new Fredrik Lundh <fredrik@pythonware.com> parents: 13411 diff changeset	5006 len = PyUnicode_GET_SIZE(self);
acc4638f37d5 - changed hash calculation for unicode strings. the new Fredrik Lundh <fredrik@pythonware.com> parents: 13411 diff changeset	5007 p = PyUnicode_AS_UNICODE(self);
acc4638f37d5 - changed hash calculation for unicode strings. the new Fredrik Lundh <fredrik@pythonware.com> parents: 13411 diff changeset	5008 x = *p << 7;
acc4638f37d5 - changed hash calculation for unicode strings. the new Fredrik Lundh <fredrik@pythonware.com> parents: 13411 diff changeset	5009 while (--len >= 0)
acc4638f37d5 - changed hash calculation for unicode strings. the new Fredrik Lundh <fredrik@pythonware.com> parents: 13411 diff changeset	5010 x = (1000003x) ^ p++;
acc4638f37d5 - changed hash calculation for unicode strings. the new Fredrik Lundh <fredrik@pythonware.com> parents: 13411 diff changeset	5011 x ^= PyUnicode_GET_SIZE(self);
acc4638f37d5 - changed hash calculation for unicode strings. the new Fredrik Lundh <fredrik@pythonware.com> parents: 13411 diff changeset	5012 if (x == -1)
acc4638f37d5 - changed hash calculation for unicode strings. the new Fredrik Lundh <fredrik@pythonware.com> parents: 13411 diff changeset	5013 x = -2;
acc4638f37d5 - changed hash calculation for unicode strings. the new Fredrik Lundh <fredrik@pythonware.com> parents: 13411 diff changeset	5014 self->hash = x;
acc4638f37d5 - changed hash calculation for unicode strings. the new Fredrik Lundh <fredrik@pythonware.com> parents: 13411 diff changeset	5015 return x;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5016 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5017
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5018 PyDoc_STRVAR(index__doc__,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5019 "S.index(sub [,start [,end]]) -> int\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5020 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5021 Like S.find() but raise ValueError when the substring is not found.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5022
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5023 static PyObject *
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5024 unicode_index(PyUnicodeObject self, PyObject args)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5025 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5026 int result;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5027 PyUnicodeObject *substring;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5028 int start = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5029 int end = INT_MAX;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5030
12629 3efeaa7521e4 Trent Mick: Guido van Rossum <guido@python.org> parents: 12582 diff changeset	5031 if (!PyArg_ParseTuple(args, "O\|O&O&:index", &substring,
3efeaa7521e4 Trent Mick: Guido van Rossum <guido@python.org> parents: 12582 diff changeset	5032 _PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end))
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5033 return NULL;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	5034
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5035 substring = (PyUnicodeObject *)PyUnicode_FromObject(
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5036 (PyObject *)substring);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5037 if (substring == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5038 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5039
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5040 result = findstring(self, substring, start, end, 1);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5041
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5042 Py_DECREF(substring);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5043 if (result < 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5044 PyErr_SetString(PyExc_ValueError, "substring not found");
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5045 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5046 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5047 return PyInt_FromLong(result);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5048 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5049
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5050 PyDoc_STRVAR(islower__doc__,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5051 "S.islower() -> bool\n\
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5052 \n\
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5053 Return True if all cased characters in S are lowercase and there is\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5054 at least one cased character in S, False otherwise.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5055
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5056 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	5057 unicode_islower(PyUnicodeObject *self)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5058 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5059 register const Py_UNICODE *p = PyUnicode_AS_UNICODE(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5060 register const Py_UNICODE *e;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5061 int cased;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5062
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5063 /* Shortcut for single character strings */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5064 if (PyUnicode_GET_SIZE(self) == 1)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5065 return PyBool_FromLong(Py_UNICODE_ISLOWER(*p));
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5066
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12909 diff changeset	5067 /* Special case for empty strings */
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12909 diff changeset	5068 if (PyString_GET_SIZE(self) == 0)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5069 return PyBool_FromLong(0);
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12909 diff changeset	5070
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5071 e = p + PyUnicode_GET_SIZE(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5072 cased = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5073 for (; p < e; p++) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5074 register const Py_UNICODE ch = *p;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	5075
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5076 if (Py_UNICODE_ISUPPER(ch) \|\| Py_UNICODE_ISTITLE(ch))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5077 return PyBool_FromLong(0);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5078 else if (!cased && Py_UNICODE_ISLOWER(ch))
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5079 cased = 1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5080 }
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5081 return PyBool_FromLong(cased);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5082 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5083
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5084 PyDoc_STRVAR(isupper__doc__,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5085 "S.isupper() -> bool\n\
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5086 \n\
30707 9e21e56bf5f3 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30653 diff changeset	5087 Return True if all cased characters in S are uppercase and there is\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5088 at least one cased character in S, False otherwise.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5089
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5090 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	5091 unicode_isupper(PyUnicodeObject *self)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5092 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5093 register const Py_UNICODE *p = PyUnicode_AS_UNICODE(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5094 register const Py_UNICODE *e;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5095 int cased;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5096
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5097 /* Shortcut for single character strings */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5098 if (PyUnicode_GET_SIZE(self) == 1)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5099 return PyBool_FromLong(Py_UNICODE_ISUPPER(*p) != 0);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5100
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12909 diff changeset	5101 /* Special case for empty strings */
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12909 diff changeset	5102 if (PyString_GET_SIZE(self) == 0)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5103 return PyBool_FromLong(0);
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12909 diff changeset	5104
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5105 e = p + PyUnicode_GET_SIZE(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5106 cased = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5107 for (; p < e; p++) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5108 register const Py_UNICODE ch = *p;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	5109
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5110 if (Py_UNICODE_ISLOWER(ch) \|\| Py_UNICODE_ISTITLE(ch))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5111 return PyBool_FromLong(0);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5112 else if (!cased && Py_UNICODE_ISUPPER(ch))
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5113 cased = 1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5114 }
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5115 return PyBool_FromLong(cased);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5116 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5117
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5118 PyDoc_STRVAR(istitle__doc__,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5119 "S.istitle() -> bool\n\
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5120 \n\
30707 9e21e56bf5f3 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30653 diff changeset	5121 Return True if S is a titlecased string and there is at least one\n\
9e21e56bf5f3 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30653 diff changeset	5122 character in S, i.e. upper- and titlecase characters may only\n\
9e21e56bf5f3 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30653 diff changeset	5123 follow uncased characters and lowercase characters only cased ones.\n\
9e21e56bf5f3 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30653 diff changeset	5124 Return False otherwise.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5125
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5126 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	5127 unicode_istitle(PyUnicodeObject *self)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5128 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5129 register const Py_UNICODE *p = PyUnicode_AS_UNICODE(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5130 register const Py_UNICODE *e;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5131 int cased, previous_is_cased;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5132
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5133 /* Shortcut for single character strings */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5134 if (PyUnicode_GET_SIZE(self) == 1)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5135 return PyBool_FromLong((Py_UNICODE_ISTITLE(*p) != 0) \|\|
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5136 (Py_UNICODE_ISUPPER(*p) != 0));
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5137
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12909 diff changeset	5138 /* Special case for empty strings */
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12909 diff changeset	5139 if (PyString_GET_SIZE(self) == 0)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5140 return PyBool_FromLong(0);
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12909 diff changeset	5141
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5142 e = p + PyUnicode_GET_SIZE(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5143 cased = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5144 previous_is_cased = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5145 for (; p < e; p++) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5146 register const Py_UNICODE ch = *p;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	5147
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5148 if (Py_UNICODE_ISUPPER(ch) \|\| Py_UNICODE_ISTITLE(ch)) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5149 if (previous_is_cased)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5150 return PyBool_FromLong(0);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5151 previous_is_cased = 1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5152 cased = 1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5153 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5154 else if (Py_UNICODE_ISLOWER(ch)) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5155 if (!previous_is_cased)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5156 return PyBool_FromLong(0);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5157 previous_is_cased = 1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5158 cased = 1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5159 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5160 else
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5161 previous_is_cased = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5162 }
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5163 return PyBool_FromLong(cased);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5164 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5165
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5166 PyDoc_STRVAR(isspace__doc__,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5167 "S.isspace() -> bool\n\
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5168 \n\
30707 9e21e56bf5f3 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30653 diff changeset	5169 Return True if all characters in S are whitespace\n\
9e21e56bf5f3 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30653 diff changeset	5170 and there is at least one character in S, False otherwise.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5171
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5172 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	5173 unicode_isspace(PyUnicodeObject *self)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5174 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5175 register const Py_UNICODE *p = PyUnicode_AS_UNICODE(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5176 register const Py_UNICODE *e;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5177
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5178 /* Shortcut for single character strings */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5179 if (PyUnicode_GET_SIZE(self) == 1 &&
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5180 Py_UNICODE_ISSPACE(*p))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5181 return PyBool_FromLong(1);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5182
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12909 diff changeset	5183 /* Special case for empty strings */
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12909 diff changeset	5184 if (PyString_GET_SIZE(self) == 0)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5185 return PyBool_FromLong(0);
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12909 diff changeset	5186
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5187 e = p + PyUnicode_GET_SIZE(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5188 for (; p < e; p++) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5189 if (!Py_UNICODE_ISSPACE(*p))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5190 return PyBool_FromLong(0);
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5191 }
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5192 return PyBool_FromLong(1);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5193 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5194
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5195 PyDoc_STRVAR(isalpha__doc__,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5196 "S.isalpha() -> bool\n\
13356 9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5197 \n\
30707 9e21e56bf5f3 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30653 diff changeset	5198 Return True if all characters in S are alphabetic\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5199 and there is at least one character in S, False otherwise.");
13356 9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5200
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5201 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	5202 unicode_isalpha(PyUnicodeObject *self)
13356 9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5203 {
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5204 register const Py_UNICODE *p = PyUnicode_AS_UNICODE(self);
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5205 register const Py_UNICODE *e;
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5206
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5207 /* Shortcut for single character strings */
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5208 if (PyUnicode_GET_SIZE(self) == 1 &&
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5209 Py_UNICODE_ISALPHA(*p))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5210 return PyBool_FromLong(1);
13356 9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5211
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5212 /* Special case for empty strings */
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5213 if (PyString_GET_SIZE(self) == 0)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5214 return PyBool_FromLong(0);
13356 9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5215
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5216 e = p + PyUnicode_GET_SIZE(self);
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5217 for (; p < e; p++) {
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5218 if (!Py_UNICODE_ISALPHA(*p))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5219 return PyBool_FromLong(0);
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5220 }
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5221 return PyBool_FromLong(1);
13356 9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5222 }
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5223
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5224 PyDoc_STRVAR(isalnum__doc__,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5225 "S.isalnum() -> bool\n\
13356 9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5226 \n\
30707 9e21e56bf5f3 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30653 diff changeset	5227 Return True if all characters in S are alphanumeric\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5228 and there is at least one character in S, False otherwise.");
13356 9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5229
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5230 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	5231 unicode_isalnum(PyUnicodeObject *self)
13356 9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5232 {
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5233 register const Py_UNICODE *p = PyUnicode_AS_UNICODE(self);
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5234 register const Py_UNICODE *e;
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5235
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5236 /* Shortcut for single character strings */
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5237 if (PyUnicode_GET_SIZE(self) == 1 &&
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5238 Py_UNICODE_ISALNUM(*p))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5239 return PyBool_FromLong(1);
13356 9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5240
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5241 /* Special case for empty strings */
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5242 if (PyString_GET_SIZE(self) == 0)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5243 return PyBool_FromLong(0);
13356 9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5244
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5245 e = p + PyUnicode_GET_SIZE(self);
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5246 for (; p < e; p++) {
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5247 if (!Py_UNICODE_ISALNUM(*p))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5248 return PyBool_FromLong(0);
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5249 }
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5250 return PyBool_FromLong(1);
13356 9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5251 }
9a1b961e0c3a Added new .isalpha() and .isalnum() methods which provide interfaces Marc-André Lemburg <mal@egenix.com> parents: 13337 diff changeset	5252
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5253 PyDoc_STRVAR(isdecimal__doc__,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5254 "S.isdecimal() -> bool\n\
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5255 \n\
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5256 Return True if there are only decimal characters in S,\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5257 False otherwise.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5258
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5259 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	5260 unicode_isdecimal(PyUnicodeObject *self)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5261 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5262 register const Py_UNICODE *p = PyUnicode_AS_UNICODE(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5263 register const Py_UNICODE *e;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5264
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5265 /* Shortcut for single character strings */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5266 if (PyUnicode_GET_SIZE(self) == 1 &&
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5267 Py_UNICODE_ISDECIMAL(*p))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5268 return PyBool_FromLong(1);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5269
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12909 diff changeset	5270 /* Special case for empty strings */
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12909 diff changeset	5271 if (PyString_GET_SIZE(self) == 0)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5272 return PyBool_FromLong(0);
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12909 diff changeset	5273
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5274 e = p + PyUnicode_GET_SIZE(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5275 for (; p < e; p++) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5276 if (!Py_UNICODE_ISDECIMAL(*p))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5277 return PyBool_FromLong(0);
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5278 }
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5279 return PyBool_FromLong(1);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5280 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5281
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5282 PyDoc_STRVAR(isdigit__doc__,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5283 "S.isdigit() -> bool\n\
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5284 \n\
30707 9e21e56bf5f3 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30653 diff changeset	5285 Return True if all characters in S are digits\n\
9e21e56bf5f3 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30653 diff changeset	5286 and there is at least one character in S, False otherwise.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5287
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5288 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	5289 unicode_isdigit(PyUnicodeObject *self)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5290 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5291 register const Py_UNICODE *p = PyUnicode_AS_UNICODE(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5292 register const Py_UNICODE *e;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5293
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5294 /* Shortcut for single character strings */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5295 if (PyUnicode_GET_SIZE(self) == 1 &&
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5296 Py_UNICODE_ISDIGIT(*p))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5297 return PyBool_FromLong(1);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5298
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12909 diff changeset	5299 /* Special case for empty strings */
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12909 diff changeset	5300 if (PyString_GET_SIZE(self) == 0)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5301 return PyBool_FromLong(0);
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12909 diff changeset	5302
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5303 e = p + PyUnicode_GET_SIZE(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5304 for (; p < e; p++) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5305 if (!Py_UNICODE_ISDIGIT(*p))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5306 return PyBool_FromLong(0);
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5307 }
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5308 return PyBool_FromLong(1);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5309 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5310
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5311 PyDoc_STRVAR(isnumeric__doc__,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5312 "S.isnumeric() -> bool\n\
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5313 \n\
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5314 Return True if there are only numeric characters in S,\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5315 False otherwise.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5316
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5317 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	5318 unicode_isnumeric(PyUnicodeObject *self)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5319 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5320 register const Py_UNICODE *p = PyUnicode_AS_UNICODE(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5321 register const Py_UNICODE *e;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5322
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5323 /* Shortcut for single character strings */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5324 if (PyUnicode_GET_SIZE(self) == 1 &&
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5325 Py_UNICODE_ISNUMERIC(*p))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5326 return PyBool_FromLong(1);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5327
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12909 diff changeset	5328 /* Special case for empty strings */
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12909 diff changeset	5329 if (PyString_GET_SIZE(self) == 0)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5330 return PyBool_FromLong(0);
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12909 diff changeset	5331
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5332 e = p + PyUnicode_GET_SIZE(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5333 for (; p < e; p++) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5334 if (!Py_UNICODE_ISNUMERIC(*p))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5335 return PyBool_FromLong(0);
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5336 }
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	5337 return PyBool_FromLong(1);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5338 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5339
32197 3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5340 PyDoc_STRVAR(iswide__doc__,
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5341 "S.iswide() -> bool\n\
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5342 \n\
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5343 Return True if all characters in S are wide width\n\
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5344 and there is at least one character in S, False otherwise.");
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5345
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5346 static PyObject*
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5347 unicode_iswide(PyUnicodeObject *self)
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5348 {
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5349 register const Py_UNICODE *p = PyUnicode_AS_UNICODE(self);
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5350 register const Py_UNICODE *e;
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5351
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5352 /* Shortcut for single character strings */
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5353 if (PyUnicode_GET_SIZE(self) == 1 &&
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5354 Py_UNICODE_ISWIDE(*p))
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5355 Py_RETURN_TRUE;
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5356
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5357 /* Special case for empty strings */
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5358 if (PyString_GET_SIZE(self) == 0)
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5359 Py_RETURN_FALSE;
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5360
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5361 e = p + PyUnicode_GET_SIZE(self);
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5362 for (; p < e; p++) {
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5363 if (!Py_UNICODE_ISWIDE(*p))
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5364 Py_RETURN_FALSE;
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5365 }
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5366 Py_RETURN_TRUE;
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5367 }
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5368
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5369 PyDoc_STRVAR(join__doc__,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5370 "S.join(sequence) -> unicode\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5371 \n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5372 Return a string which is the concatenation of the strings in the\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5373 sequence. The separator between elements is S.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5374
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5375 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	5376 unicode_join(PyObject self, PyObject data)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5377 {
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	5378 return PyUnicode_Join(self, data);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5379 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5380
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5381 static int
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5382 unicode_length(PyUnicodeObject *self)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5383 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5384 return self->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5385 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5386
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5387 PyDoc_STRVAR(ljust__doc__,
32197 3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5388 "S.ljust(width[, fillchar]) -> int\n\
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5389 \n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5390 Return S left justified in a Unicode string of length width. Padding is\n\
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	5391 done using the specified fill character (default is a space).");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5392
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5393 static PyObject *
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5394 unicode_ljust(PyUnicodeObject self, PyObject args)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5395 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5396 int width;
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	5397 Py_UNICODE fillchar = ' ';
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	5398
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	5399 if (!PyArg_ParseTuple(args, "i\|O&:ljust", &width, convert_uc, &fillchar))
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5400 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5401
19885 72e6eb653312 More on bug 460020: disable many optimizations of unicode subclasses. Tim Peters <tim.peters@gmail.com> parents: 19849 diff changeset	5402 if (self->length >= width && PyUnicode_CheckExact(self)) {
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5403 Py_INCREF(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5404 return (PyObject*) self;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5405 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5406
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	5407 return (PyObject*) pad(self, 0, width - self->length, fillchar);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5408 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5409
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5410 PyDoc_STRVAR(lower__doc__,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5411 "S.lower() -> unicode\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5412 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5413 Return a copy of the string S converted to lowercase.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5414
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5415 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	5416 unicode_lower(PyUnicodeObject *self)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5417 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5418 return fixup(self, fixlower);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5419 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5420
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5421 #define LEFTSTRIP 0
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5422 #define RIGHTSTRIP 1
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5423 #define BOTHSTRIP 2
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5424
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5425 /* Arrays indexed by above */
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5426 static const char *stripformat[] = {"\|O:lstrip", "\|O:rstrip", "\|O:strip"};
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5427
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5428 #define STRIPNAME(i) (stripformat[i]+3)
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5429
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5430 static const Py_UNICODE *
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5431 unicode_memchr(const Py_UNICODE *s, Py_UNICODE c, size_t n)
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5432 {
23228 6db6e3dc8366 unicode_memchr(): Squashed gratuitous int-vs-size_t mismatch (which Tim Peters <tim.peters@gmail.com> parents: 23225 diff changeset	5433 size_t i;
6db6e3dc8366 unicode_memchr(): Squashed gratuitous int-vs-size_t mismatch (which Tim Peters <tim.peters@gmail.com> parents: 23225 diff changeset	5434 for (i = 0; i < n; ++i)
6db6e3dc8366 unicode_memchr(): Squashed gratuitous int-vs-size_t mismatch (which Tim Peters <tim.peters@gmail.com> parents: 23225 diff changeset	5435 if (s[i] == c)
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5436 return s+i;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5437 return NULL;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5438 }
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5439
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5440 /* externally visible for str.strip(unicode) */
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5441 PyObject *
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5442 _PyUnicode_XStrip(PyUnicodeObject self, int striptype, PyObject sepobj)
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5443 {
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5444 Py_UNICODE *s = PyUnicode_AS_UNICODE(self);
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5445 int len = PyUnicode_GET_SIZE(self);
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5446 Py_UNICODE *sep = PyUnicode_AS_UNICODE(sepobj);
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5447 int seplen = PyUnicode_GET_SIZE(sepobj);
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5448 int i, j;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5449
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5450 i = 0;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5451 if (striptype != RIGHTSTRIP) {
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5452 while (i < len && unicode_memchr(sep, s[i], seplen)) {
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5453 i++;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5454 }
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5455 }
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5456
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5457 j = len;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5458 if (striptype != LEFTSTRIP) {
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5459 do {
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5460 j--;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5461 } while (j >= i && unicode_memchr(sep, s[j], seplen));
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5462 j++;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5463 }
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5464
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5465 if (i == 0 && j == len && PyUnicode_CheckExact(self)) {
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5466 Py_INCREF(self);
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5467 return (PyObject*)self;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5468 }
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5469 else
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5470 return PyUnicode_FromUnicode(s+i, j-i);
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5471 }
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5472
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5473
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5474 static PyObject *
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5475 do_strip(PyUnicodeObject *self, int striptype)
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5476 {
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5477 Py_UNICODE *s = PyUnicode_AS_UNICODE(self);
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5478 int len = PyUnicode_GET_SIZE(self), i, j;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5479
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5480 i = 0;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5481 if (striptype != RIGHTSTRIP) {
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5482 while (i < len && Py_UNICODE_ISSPACE(s[i])) {
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5483 i++;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5484 }
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5485 }
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5486
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5487 j = len;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5488 if (striptype != LEFTSTRIP) {
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5489 do {
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5490 j--;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5491 } while (j >= i && Py_UNICODE_ISSPACE(s[j]));
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5492 j++;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5493 }
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5494
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5495 if (i == 0 && j == len && PyUnicode_CheckExact(self)) {
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5496 Py_INCREF(self);
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5497 return (PyObject*)self;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5498 }
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5499 else
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5500 return PyUnicode_FromUnicode(s+i, j-i);
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5501 }
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5502
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5503
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5504 static PyObject *
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5505 do_argstrip(PyUnicodeObject self, int striptype, PyObject args)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5506 {
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5507 PyObject *sep = NULL;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5508
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5509 if (!PyArg_ParseTuple(args, (char *)stripformat[striptype], &sep))
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5510 return NULL;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5511
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5512 if (sep != NULL && sep != Py_None) {
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5513 if (PyUnicode_Check(sep))
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5514 return _PyUnicode_XStrip(self, striptype, sep);
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5515 else if (PyString_Check(sep)) {
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5516 PyObject *res;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5517 sep = PyUnicode_FromObject(sep);
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5518 if (sep==NULL)
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5519 return NULL;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5520 res = _PyUnicode_XStrip(self, striptype, sep);
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5521 Py_DECREF(sep);
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5522 return res;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5523 }
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5524 else {
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5525 PyErr_Format(PyExc_TypeError,
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5526 "%s arg must be None, unicode or str",
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5527 STRIPNAME(striptype));
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5528 return NULL;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5529 }
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5530 }
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5531
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5532 return do_strip(self, striptype);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5533 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5534
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5535
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5536 PyDoc_STRVAR(strip__doc__,
28575 215f1f4851a4 Attempt to make all the various string strip methods the same. Neal Norwitz <nnorwitz@gmail.com>* parents: 28559 diff changeset	5537 "S.strip([chars]) -> unicode\n\
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5538 \n\
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5539 Return a copy of the string S with leading and trailing\n\
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5540 whitespace removed.\n\
28575 215f1f4851a4 Attempt to make all the various string strip methods the same. Neal Norwitz <nnorwitz@gmail.com>* parents: 28559 diff changeset	5541 If chars is given and not None, remove characters in chars instead.\n\
215f1f4851a4 Attempt to make all the various string strip methods the same. Neal Norwitz <nnorwitz@gmail.com>* parents: 28559 diff changeset	5542 If chars is a str, it will be converted to unicode before stripping");
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5543
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5544 static PyObject *
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5545 unicode_strip(PyUnicodeObject self, PyObject args)
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5546 {
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5547 if (PyTuple_GET_SIZE(args) == 0)
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5548 return do_strip(self, BOTHSTRIP); /* Common case */
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5549 else
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5550 return do_argstrip(self, BOTHSTRIP, args);
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5551 }
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5552
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5553
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5554 PyDoc_STRVAR(lstrip__doc__,
28575 215f1f4851a4 Attempt to make all the various string strip methods the same. Neal Norwitz <nnorwitz@gmail.com>* parents: 28559 diff changeset	5555 "S.lstrip([chars]) -> unicode\n\
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5556 \n\
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5557 Return a copy of the string S with leading whitespace removed.\n\
28575 215f1f4851a4 Attempt to make all the various string strip methods the same. Neal Norwitz <nnorwitz@gmail.com>* parents: 28559 diff changeset	5558 If chars is given and not None, remove characters in chars instead.\n\
215f1f4851a4 Attempt to make all the various string strip methods the same. Neal Norwitz <nnorwitz@gmail.com>* parents: 28559 diff changeset	5559 If chars is a str, it will be converted to unicode before stripping");
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5560
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5561 static PyObject *
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5562 unicode_lstrip(PyUnicodeObject self, PyObject args)
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5563 {
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5564 if (PyTuple_GET_SIZE(args) == 0)
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5565 return do_strip(self, LEFTSTRIP); /* Common case */
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5566 else
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5567 return do_argstrip(self, LEFTSTRIP, args);
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5568 }
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5569
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5570
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5571 PyDoc_STRVAR(rstrip__doc__,
28575 215f1f4851a4 Attempt to make all the various string strip methods the same. Neal Norwitz <nnorwitz@gmail.com>* parents: 28559 diff changeset	5572 "S.rstrip([chars]) -> unicode\n\
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5573 \n\
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5574 Return a copy of the string S with trailing whitespace removed.\n\
28575 215f1f4851a4 Attempt to make all the various string strip methods the same. Neal Norwitz <nnorwitz@gmail.com>* parents: 28559 diff changeset	5575 If chars is given and not None, remove characters in chars instead.\n\
215f1f4851a4 Attempt to make all the various string strip methods the same. Neal Norwitz <nnorwitz@gmail.com>* parents: 28559 diff changeset	5576 If chars is a str, it will be converted to unicode before stripping");
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5577
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5578 static PyObject *
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5579 unicode_rstrip(PyUnicodeObject self, PyObject args)
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5580 {
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5581 if (PyTuple_GET_SIZE(args) == 0)
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5582 return do_strip(self, RIGHTSTRIP); /* Common case */
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5583 else
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5584 return do_argstrip(self, RIGHTSTRIP, args);
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5585 }
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5586
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	5587
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5588 static PyObject*
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5589 unicode_repeat(PyUnicodeObject *str, int len)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5590 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5591 PyUnicodeObject *u;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5592 Py_UNICODE *p;
14492 7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14388 diff changeset	5593 int nchars;
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14388 diff changeset	5594 size_t nbytes;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5595
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5596 if (len < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5597 len = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5598
19885 72e6eb653312 More on bug 460020: disable many optimizations of unicode subclasses. Tim Peters <tim.peters@gmail.com> parents: 19849 diff changeset	5599 if (len == 1 && PyUnicode_CheckExact(str)) {
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5600 /* no repeat, return original string */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5601 Py_INCREF(str);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5602 return (PyObject*) str;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5603 }
14492 7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14388 diff changeset	5604
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14388 diff changeset	5605 /* ensure # of chars needed doesn't overflow int and # of bytes
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14388 diff changeset	5606 * needed doesn't overflow size_t
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14388 diff changeset	5607 */
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14388 diff changeset	5608 nchars = len * str->length;
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14388 diff changeset	5609 if (len && nchars / len != str->length) {
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14388 diff changeset	5610 PyErr_SetString(PyExc_OverflowError,
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14388 diff changeset	5611 "repeated string is too long");
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14388 diff changeset	5612 return NULL;
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14388 diff changeset	5613 }
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14388 diff changeset	5614 nbytes = (nchars + 1) * sizeof(Py_UNICODE);
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14388 diff changeset	5615 if (nbytes / sizeof(Py_UNICODE) != (size_t)(nchars + 1)) {
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14388 diff changeset	5616 PyErr_SetString(PyExc_OverflowError,
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14388 diff changeset	5617 "repeated string is too long");
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14388 diff changeset	5618 return NULL;
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14388 diff changeset	5619 }
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14388 diff changeset	5620 u = _PyUnicode_New(nchars);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5621 if (!u)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5622 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5623
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5624 p = u->str;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5625
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5626 while (len-- > 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5627 Py_UNICODE_COPY(p, str->str, str->length);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5628 p += str->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5629 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5630
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5631 return (PyObject*) u;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5632 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5633
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5634 PyObject PyUnicode_Replace(PyObject obj,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5635 PyObject *subobj,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5636 PyObject *replobj,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5637 int maxcount)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5638 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5639 PyObject *self;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5640 PyObject *str1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5641 PyObject *str2;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5642 PyObject *result;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5643
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5644 self = PyUnicode_FromObject(obj);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5645 if (self == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5646 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5647 str1 = PyUnicode_FromObject(subobj);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5648 if (str1 == NULL) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5649 Py_DECREF(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5650 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5651 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5652 str2 = PyUnicode_FromObject(replobj);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5653 if (str2 == NULL) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5654 Py_DECREF(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5655 Py_DECREF(str1);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5656 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5657 }
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	5658 result = replace((PyUnicodeObject *)self,
76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	5659 (PyUnicodeObject *)str1,
76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	5660 (PyUnicodeObject *)str2,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5661 maxcount);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5662 Py_DECREF(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5663 Py_DECREF(str1);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5664 Py_DECREF(str2);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5665 return result;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5666 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5667
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5668 PyDoc_STRVAR(replace__doc__,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5669 "S.replace (old, new[, maxsplit]) -> unicode\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5670 \n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5671 Return a copy of S with all occurrences of substring\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5672 old replaced by new. If the optional argument maxsplit is\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5673 given, only the first maxsplit occurrences are replaced.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5674
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5675 static PyObject*
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5676 unicode_replace(PyUnicodeObject self, PyObject args)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5677 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5678 PyUnicodeObject *str1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5679 PyUnicodeObject *str2;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5680 int maxcount = -1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5681 PyObject *result;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5682
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5683 if (!PyArg_ParseTuple(args, "OO\|i:replace", &str1, &str2, &maxcount))
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5684 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5685 str1 = (PyUnicodeObject )PyUnicode_FromObject((PyObject )str1);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5686 if (str1 == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5687 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5688 str2 = (PyUnicodeObject )PyUnicode_FromObject((PyObject )str2);
27774 bfc524379307 Fix two refcounting bugs Walter Dörwald <walter@livinglogic.de> parents: 27555 diff changeset	5689 if (str2 == NULL) {
bfc524379307 Fix two refcounting bugs Walter Dörwald <walter@livinglogic.de> parents: 27555 diff changeset	5690 Py_DECREF(str1);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5691 return NULL;
27774 bfc524379307 Fix two refcounting bugs Walter Dörwald <walter@livinglogic.de> parents: 27555 diff changeset	5692 }
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5693
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5694 result = replace(self, str1, str2, maxcount);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5695
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5696 Py_DECREF(str1);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5697 Py_DECREF(str2);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5698 return result;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5699 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5700
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5701 static
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5702 PyObject unicode_repr(PyObject unicode)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5703 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5704 return unicodeescape_string(PyUnicode_AS_UNICODE(unicode),
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5705 PyUnicode_GET_SIZE(unicode),
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5706 1);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5707 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5708
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5709 PyDoc_STRVAR(rfind__doc__,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5710 "S.rfind(sub [,start [,end]]) -> int\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5711 \n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5712 Return the highest index in S where substring sub is found,\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5713 such that sub is contained within s[start,end]. Optional\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5714 arguments start and end are interpreted as in slice notation.\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5715 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5716 Return -1 on failure.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5717
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5718 static PyObject *
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5719 unicode_rfind(PyUnicodeObject self, PyObject args)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5720 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5721 PyUnicodeObject *substring;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5722 int start = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5723 int end = INT_MAX;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5724 PyObject *result;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5725
12629 3efeaa7521e4 Trent Mick: Guido van Rossum <guido@python.org> parents: 12582 diff changeset	5726 if (!PyArg_ParseTuple(args, "O\|O&O&:rfind", &substring,
3efeaa7521e4 Trent Mick: Guido van Rossum <guido@python.org> parents: 12582 diff changeset	5727 _PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end))
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5728 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5729 substring = (PyUnicodeObject *)PyUnicode_FromObject(
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5730 (PyObject *)substring);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5731 if (substring == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5732 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5733
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5734 result = PyInt_FromLong(findstring(self, substring, start, end, -1));
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5735
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5736 Py_DECREF(substring);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5737 return result;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5738 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5739
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5740 PyDoc_STRVAR(rindex__doc__,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5741 "S.rindex(sub [,start [,end]]) -> int\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5742 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5743 Like S.rfind() but raise ValueError when the substring is not found.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5744
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5745 static PyObject *
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5746 unicode_rindex(PyUnicodeObject self, PyObject args)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5747 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5748 int result;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5749 PyUnicodeObject *substring;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5750 int start = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5751 int end = INT_MAX;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5752
12629 3efeaa7521e4 Trent Mick: Guido van Rossum <guido@python.org> parents: 12582 diff changeset	5753 if (!PyArg_ParseTuple(args, "O\|O&O&:rindex", &substring,
3efeaa7521e4 Trent Mick: Guido van Rossum <guido@python.org> parents: 12582 diff changeset	5754 _PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end))
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5755 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5756 substring = (PyUnicodeObject *)PyUnicode_FromObject(
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5757 (PyObject *)substring);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5758 if (substring == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5759 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5760
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5761 result = findstring(self, substring, start, end, -1);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5762
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5763 Py_DECREF(substring);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5764 if (result < 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5765 PyErr_SetString(PyExc_ValueError, "substring not found");
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5766 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5767 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5768 return PyInt_FromLong(result);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5769 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5770
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5771 PyDoc_STRVAR(rjust__doc__,
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	5772 "S.rjust(width[, fillchar]) -> unicode\n\
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5773 \n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5774 Return S right justified in a Unicode string of length width. Padding is\n\
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	5775 done using the specified fill character (default is a space).");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5776
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5777 static PyObject *
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5778 unicode_rjust(PyUnicodeObject self, PyObject args)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5779 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5780 int width;
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	5781 Py_UNICODE fillchar = ' ';
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	5782
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	5783 if (!PyArg_ParseTuple(args, "i\|O&:rjust", &width, convert_uc, &fillchar))
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5784 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5785
19885 72e6eb653312 More on bug 460020: disable many optimizations of unicode subclasses. Tim Peters <tim.peters@gmail.com> parents: 19849 diff changeset	5786 if (self->length >= width && PyUnicode_CheckExact(self)) {
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5787 Py_INCREF(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5788 return (PyObject*) self;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5789 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5790
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30765 diff changeset	5791 return (PyObject*) pad(self, width - self->length, 0, fillchar);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5792 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5793
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5794 static PyObject*
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5795 unicode_slice(PyUnicodeObject *self, int start, int end)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5796 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5797 /* standard clamping */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5798 if (start < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5799 start = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5800 if (end < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5801 end = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5802 if (end > self->length)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5803 end = self->length;
19885 72e6eb653312 More on bug 460020: disable many optimizations of unicode subclasses. Tim Peters <tim.peters@gmail.com> parents: 19849 diff changeset	5804 if (start == 0 && end == self->length && PyUnicode_CheckExact(self)) {
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5805 /* full slice, return original string */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5806 Py_INCREF(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5807 return (PyObject*) self;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5808 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5809 if (start > end)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5810 start = end;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5811 /* copy slice */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5812 return (PyObject*) PyUnicode_FromUnicode(self->str + start,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5813 end - start);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5814 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5815
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5816 PyObject PyUnicode_Split(PyObject s,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5817 PyObject *sep,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5818 int maxsplit)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5819 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5820 PyObject *result;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	5821
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5822 s = PyUnicode_FromObject(s);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5823 if (s == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5824 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5825 if (sep != NULL) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5826 sep = PyUnicode_FromObject(sep);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5827 if (sep == NULL) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5828 Py_DECREF(s);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5829 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5830 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5831 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5832
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5833 result = split((PyUnicodeObject )s, (PyUnicodeObject )sep, maxsplit);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5834
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5835 Py_DECREF(s);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5836 Py_XDECREF(sep);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5837 return result;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5838 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5839
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5840 PyDoc_STRVAR(split__doc__,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5841 "S.split([sep [,maxsplit]]) -> list of strings\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5842 \n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5843 Return a list of the words in S, using sep as the\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5844 delimiter string. If maxsplit is given, at most maxsplit\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5845 splits are done. If sep is not specified, any whitespace string\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5846 is a separator.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5847
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5848 static PyObject*
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5849 unicode_split(PyUnicodeObject self, PyObject args)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5850 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5851 PyObject *substring = Py_None;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5852 int maxcount = -1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5853
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5854 if (!PyArg_ParseTuple(args, "\|Oi:split", &substring, &maxcount))
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5855 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5856
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5857 if (substring == Py_None)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5858 return split(self, NULL, maxcount);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5859 else if (PyUnicode_Check(substring))
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5860 return split(self, (PyUnicodeObject *)substring, maxcount);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5861 else
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5862 return PyUnicode_Split((PyObject *)self, substring, maxcount);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5863 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5864
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5865 PyObject PyUnicode_RSplit(PyObject s,
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5866 PyObject *sep,
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5867 int maxsplit)
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5868 {
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5869 PyObject *result;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5870
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5871 s = PyUnicode_FromObject(s);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5872 if (s == NULL)
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5873 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5874 if (sep != NULL) {
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5875 sep = PyUnicode_FromObject(sep);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5876 if (sep == NULL) {
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5877 Py_DECREF(s);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5878 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5879 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5880 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5881
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5882 result = rsplit((PyUnicodeObject )s, (PyUnicodeObject )sep, maxsplit);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5883
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5884 Py_DECREF(s);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5885 Py_XDECREF(sep);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5886 return result;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5887 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5888
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5889 PyDoc_STRVAR(rsplit__doc__,
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5890 "S.rsplit([sep [,maxsplit]]) -> list of strings\n\
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5891 \n\
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5892 Return a list of the words in S, using sep as the\n\
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5893 delimiter string, starting at the end of the string and\n\
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5894 working to the front. If maxsplit is given, at most maxsplit\n\
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5895 splits are done. If sep is not specified, any whitespace string\n\
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5896 is a separator.");
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5897
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5898 static PyObject*
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5899 unicode_rsplit(PyUnicodeObject self, PyObject args)
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5900 {
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5901 PyObject *substring = Py_None;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5902 int maxcount = -1;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5903
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5904 if (!PyArg_ParseTuple(args, "\|Oi:rsplit", &substring, &maxcount))
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5905 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5906
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5907 if (substring == Py_None)
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5908 return rsplit(self, NULL, maxcount);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5909 else if (PyUnicode_Check(substring))
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5910 return rsplit(self, (PyUnicodeObject *)substring, maxcount);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5911 else
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5912 return PyUnicode_RSplit((PyObject *)self, substring, maxcount);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5913 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	5914
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5915 PyDoc_STRVAR(splitlines__doc__,
12369 68e48bb94071 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12329 diff changeset	5916 "S.splitlines([keepends]]) -> list of strings\n\
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5917 \n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5918 Return a list of the lines in S, breaking at line boundaries.\n\
12369 68e48bb94071 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12329 diff changeset	5919 Line breaks are not included in the resulting list unless keepends\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5920 is given and true.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5921
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5922 static PyObject*
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5923 unicode_splitlines(PyUnicodeObject self, PyObject args)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5924 {
12369 68e48bb94071 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12329 diff changeset	5925 int keepends = 0;
68e48bb94071 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12329 diff changeset	5926
68e48bb94071 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12329 diff changeset	5927 if (!PyArg_ParseTuple(args, "\|i:splitlines", &keepends))
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5928 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5929
12369 68e48bb94071 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12329 diff changeset	5930 return PyUnicode_Splitlines((PyObject *)self, keepends);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5931 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5932
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5933 static
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5934 PyObject unicode_str(PyUnicodeObject self)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5935 {
12645 c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	5936 return PyUnicode_AsEncodedString((PyObject *)self, NULL, NULL);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5937 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5938
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5939 PyDoc_STRVAR(swapcase__doc__,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5940 "S.swapcase() -> unicode\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5941 \n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5942 Return a copy of S with uppercase characters converted to lowercase\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5943 and vice versa.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5944
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5945 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	5946 unicode_swapcase(PyUnicodeObject *self)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5947 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5948 return fixup(self, fixswapcase);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5949 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5950
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5951 PyDoc_STRVAR(translate__doc__,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5952 "S.translate(table) -> unicode\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5953 \n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5954 Return a copy of the string S, where all characters have been mapped\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5955 through the given translation table, which must be a mapping of\n\
25120 953ebe0c0c25 Change the unicode.translate docstring to document that Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	5956 Unicode ordinals to Unicode ordinals, Unicode strings or None.\n\
953ebe0c0c25 Change the unicode.translate docstring to document that Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	5957 Unmapped characters are left untouched. Characters mapped to None\n\
953ebe0c0c25 Change the unicode.translate docstring to document that Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	5958 are deleted.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5959
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5960 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	5961 unicode_translate(PyUnicodeObject self, PyObject table)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5962 {
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	5963 return PyUnicode_TranslateCharmap(self->str,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5964 self->length,
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	5965 table,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5966 "ignore");
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5967 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5968
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5969 PyDoc_STRVAR(upper__doc__,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5970 "S.upper() -> unicode\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5971 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5972 Return a copy of S converted to uppercase.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5973
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5974 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	5975 unicode_upper(PyUnicodeObject *self)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5976 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5977 return fixup(self, fixupper);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5978 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5979
32197 3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5980 PyDoc_STRVAR(width__doc__,
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5981 "S.width() -> unicode\n\
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5982 \n\
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5983 Return a fixed-width representation length of S.");
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5984
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5985 static PyObject*
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5986 unicode_width(PyObject *self)
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5987 {
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5988 int width = PyUnicode_GetWidth(self);
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5989 if (width == -1)
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5990 return NULL;
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5991 else
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5992 return PyInt_FromLong((long)width);
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5993 }
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	5994
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5995 PyDoc_STRVAR(zfill__doc__,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5996 "S.zfill(width) -> unicode\n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5997 \n\
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	5998 Pad a numeric string x with zeros on the left, to fill a field\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	5999 of the specified width. The string x is never truncated.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6000
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6001 static PyObject *
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6002 unicode_zfill(PyUnicodeObject self, PyObject args)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6003 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6004 int fill;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6005 PyUnicodeObject *u;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6006
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6007 int width;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6008 if (!PyArg_ParseTuple(args, "i:zfill", &width))
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6009 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6010
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6011 if (self->length >= width) {
23051 19ea00feda33 Return the orginal string only if it's a real str or unicode Walter Dörwald <walter@livinglogic.de> parents: 23045 diff changeset	6012 if (PyUnicode_CheckExact(self)) {
19ea00feda33 Return the orginal string only if it's a real str or unicode Walter Dörwald <walter@livinglogic.de> parents: 23045 diff changeset	6013 Py_INCREF(self);
19ea00feda33 Return the orginal string only if it's a real str or unicode Walter Dörwald <walter@livinglogic.de> parents: 23045 diff changeset	6014 return (PyObject*) self;
19ea00feda33 Return the orginal string only if it's a real str or unicode Walter Dörwald <walter@livinglogic.de> parents: 23045 diff changeset	6015 }
19ea00feda33 Return the orginal string only if it's a real str or unicode Walter Dörwald <walter@livinglogic.de> parents: 23045 diff changeset	6016 else
19ea00feda33 Return the orginal string only if it's a real str or unicode Walter Dörwald <walter@livinglogic.de> parents: 23045 diff changeset	6017 return PyUnicode_FromUnicode(
19ea00feda33 Return the orginal string only if it's a real str or unicode Walter Dörwald <walter@livinglogic.de> parents: 23045 diff changeset	6018 PyUnicode_AS_UNICODE(self),
19ea00feda33 Return the orginal string only if it's a real str or unicode Walter Dörwald <walter@livinglogic.de> parents: 23045 diff changeset	6019 PyUnicode_GET_SIZE(self)
19ea00feda33 Return the orginal string only if it's a real str or unicode Walter Dörwald <walter@livinglogic.de> parents: 23045 diff changeset	6020 );
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6021 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6022
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6023 fill = width - self->length;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6024
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6025 u = pad(self, fill, 0, '0');
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6026
23045 8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 22981 diff changeset	6027 if (u == NULL)
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 22981 diff changeset	6028 return NULL;
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 22981 diff changeset	6029
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6030 if (u->str[fill] == '+' \|\| u->str[fill] == '-') {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6031 /* move sign to beginning of string */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6032 u->str[0] = u->str[fill];
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6033 u->str[fill] = '0';
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6034 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6035
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6036 return (PyObject*) u;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6037 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6038
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6039 #if 0
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6040 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6041 unicode_freelistsize(PyUnicodeObject *self)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6042 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6043 return PyInt_FromLong(unicode_freelist_size);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6044 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6045 #endif
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6046
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	6047 PyDoc_STRVAR(startswith__doc__,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	6048 "S.startswith(prefix[, start[, end]]) -> bool\n\
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6049 \n\
28559 aff080f2efb4 Reformat a few docstrings that caused line wraps in help() output. Guido van Rossum <guido@python.org> parents: 28494 diff changeset	6050 Return True if S starts with the specified prefix, False otherwise.\n\
aff080f2efb4 Reformat a few docstrings that caused line wraps in help() output. Guido van Rossum <guido@python.org> parents: 28494 diff changeset	6051 With optional start, test S beginning at that position.\n\
aff080f2efb4 Reformat a few docstrings that caused line wraps in help() output. Guido van Rossum <guido@python.org> parents: 28494 diff changeset	6052 With optional end, stop comparing S at that position.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6053
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6054 static PyObject *
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6055 unicode_startswith(PyUnicodeObject *self,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6056 PyObject *args)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6057 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6058 PyUnicodeObject *substring;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6059 int start = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6060 int end = INT_MAX;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6061 PyObject *result;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6062
12629 3efeaa7521e4 Trent Mick: Guido van Rossum <guido@python.org> parents: 12582 diff changeset	6063 if (!PyArg_ParseTuple(args, "O\|O&O&:startswith", &substring,
3efeaa7521e4 Trent Mick: Guido van Rossum <guido@python.org> parents: 12582 diff changeset	6064 _PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end))
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6065 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6066 substring = (PyUnicodeObject *)PyUnicode_FromObject(
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6067 (PyObject *)substring);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6068 if (substring == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6069 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6070
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	6071 result = PyBool_FromLong(tailmatch(self, substring, start, end, -1));
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6072
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6073 Py_DECREF(substring);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6074 return result;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6075 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6076
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6077
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	6078 PyDoc_STRVAR(endswith__doc__,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	6079 "S.endswith(suffix[, start[, end]]) -> bool\n\
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6080 \n\
28559 aff080f2efb4 Reformat a few docstrings that caused line wraps in help() output. Guido van Rossum <guido@python.org> parents: 28494 diff changeset	6081 Return True if S ends with the specified suffix, False otherwise.\n\
aff080f2efb4 Reformat a few docstrings that caused line wraps in help() output. Guido van Rossum <guido@python.org> parents: 28494 diff changeset	6082 With optional start, test S beginning at that position.\n\
aff080f2efb4 Reformat a few docstrings that caused line wraps in help() output. Guido van Rossum <guido@python.org> parents: 28494 diff changeset	6083 With optional end, stop comparing S at that position.");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6084
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6085 static PyObject *
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6086 unicode_endswith(PyUnicodeObject *self,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6087 PyObject *args)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6088 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6089 PyUnicodeObject *substring;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6090 int start = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6091 int end = INT_MAX;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6092 PyObject *result;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6093
12629 3efeaa7521e4 Trent Mick: Guido van Rossum <guido@python.org> parents: 12582 diff changeset	6094 if (!PyArg_ParseTuple(args, "O\|O&O&:endswith", &substring,
3efeaa7521e4 Trent Mick: Guido van Rossum <guido@python.org> parents: 12582 diff changeset	6095 _PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end))
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6096 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6097 substring = (PyUnicodeObject *)PyUnicode_FromObject(
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6098 (PyObject *)substring);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6099 if (substring == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6100 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6101
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22521 diff changeset	6102 result = PyBool_FromLong(tailmatch(self, substring, start, end, +1));
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6103
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6104 Py_DECREF(substring);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6105 return result;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6106 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6107
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6108
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27175 diff changeset	6109
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27175 diff changeset	6110 static PyObject *
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27175 diff changeset	6111 unicode_getnewargs(PyUnicodeObject *v)
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27175 diff changeset	6112 {
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27175 diff changeset	6113 return Py_BuildValue("(u#)", v->str, v->length);
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27175 diff changeset	6114 }
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27175 diff changeset	6115
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27175 diff changeset	6116
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6117 static PyMethodDef unicode_methods[] = {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6118
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6119 /* Order is according to common usage: often used methods should
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6120 appear first, since lookup is done sequentially. */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6121
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6122 {"encode", (PyCFunction) unicode_encode, METH_VARARGS, encode__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6123 {"replace", (PyCFunction) unicode_replace, METH_VARARGS, replace__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6124 {"split", (PyCFunction) unicode_split, METH_VARARGS, split__doc__},
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	6125 {"rsplit", (PyCFunction) unicode_rsplit, METH_VARARGS, rsplit__doc__},
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6126 {"join", (PyCFunction) unicode_join, METH_O, join__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6127 {"capitalize", (PyCFunction) unicode_capitalize, METH_NOARGS, capitalize__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6128 {"title", (PyCFunction) unicode_title, METH_NOARGS, title__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6129 {"center", (PyCFunction) unicode_center, METH_VARARGS, center__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6130 {"count", (PyCFunction) unicode_count, METH_VARARGS, count__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6131 {"expandtabs", (PyCFunction) unicode_expandtabs, METH_VARARGS, expandtabs__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6132 {"find", (PyCFunction) unicode_find, METH_VARARGS, find__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6133 {"index", (PyCFunction) unicode_index, METH_VARARGS, index__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6134 {"ljust", (PyCFunction) unicode_ljust, METH_VARARGS, ljust__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6135 {"lower", (PyCFunction) unicode_lower, METH_NOARGS, lower__doc__},
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	6136 {"lstrip", (PyCFunction) unicode_lstrip, METH_VARARGS, lstrip__doc__},
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6137 /* {"maketrans", (PyCFunction) unicode_maketrans, METH_VARARGS, maketrans__doc__}, */
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6138 {"rfind", (PyCFunction) unicode_rfind, METH_VARARGS, rfind__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6139 {"rindex", (PyCFunction) unicode_rindex, METH_VARARGS, rindex__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6140 {"rjust", (PyCFunction) unicode_rjust, METH_VARARGS, rjust__doc__},
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	6141 {"rstrip", (PyCFunction) unicode_rstrip, METH_VARARGS, rstrip__doc__},
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6142 {"splitlines", (PyCFunction) unicode_splitlines, METH_VARARGS, splitlines__doc__},
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23205 diff changeset	6143 {"strip", (PyCFunction) unicode_strip, METH_VARARGS, strip__doc__},
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6144 {"swapcase", (PyCFunction) unicode_swapcase, METH_NOARGS, swapcase__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6145 {"translate", (PyCFunction) unicode_translate, METH_O, translate__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6146 {"upper", (PyCFunction) unicode_upper, METH_NOARGS, upper__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6147 {"startswith", (PyCFunction) unicode_startswith, METH_VARARGS, startswith__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6148 {"endswith", (PyCFunction) unicode_endswith, METH_VARARGS, endswith__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6149 {"islower", (PyCFunction) unicode_islower, METH_NOARGS, islower__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6150 {"isupper", (PyCFunction) unicode_isupper, METH_NOARGS, isupper__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6151 {"istitle", (PyCFunction) unicode_istitle, METH_NOARGS, istitle__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6152 {"isspace", (PyCFunction) unicode_isspace, METH_NOARGS, isspace__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6153 {"isdecimal", (PyCFunction) unicode_isdecimal, METH_NOARGS, isdecimal__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6154 {"isdigit", (PyCFunction) unicode_isdigit, METH_NOARGS, isdigit__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6155 {"isnumeric", (PyCFunction) unicode_isnumeric, METH_NOARGS, isnumeric__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6156 {"isalpha", (PyCFunction) unicode_isalpha, METH_NOARGS, isalpha__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6157 {"isalnum", (PyCFunction) unicode_isalnum, METH_NOARGS, isalnum__doc__},
32197 3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	6158 {"iswide", (PyCFunction) unicode_iswide, METH_NOARGS, iswide__doc__},
3a84e23b042f - SF #962502: Add two more methods for unicode type; width() and Hye-Shik Chang <hyeshik@gmail.com> parents: 31873 diff changeset	6159 {"width", (PyCFunction) unicode_width, METH_NOARGS, width__doc__},
23045 8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 22981 diff changeset	6160 {"zfill", (PyCFunction) unicode_zfill, METH_VARARGS, zfill__doc__},
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6161 #if 0
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6162 {"capwords", (PyCFunction) unicode_capwords, METH_NOARGS, capwords__doc__},
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6163 #endif
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6164
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6165 #if 0
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6166 /* This one is just used for debugging the implementation. */
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19121 diff changeset	6167 {"freelistsize", (PyCFunction) unicode_freelistsize, METH_NOARGS},
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6168 #endif
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6169
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27175 diff changeset	6170 {"__getnewargs__", (PyCFunction)unicode_getnewargs, METH_NOARGS},
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6171 {NULL, NULL}
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6172 };
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6173
26274 958d07085dcf Add nb_remainder (i.e. __mod__) slot to unicode type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	6174 static PyObject *
958d07085dcf Add nb_remainder (i.e. __mod__) slot to unicode type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	6175 unicode_mod(PyObject v, PyObject w)
958d07085dcf Add nb_remainder (i.e. __mod__) slot to unicode type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	6176 {
958d07085dcf Add nb_remainder (i.e. __mod__) slot to unicode type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	6177 if (!PyUnicode_Check(v)) {
958d07085dcf Add nb_remainder (i.e. __mod__) slot to unicode type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	6178 Py_INCREF(Py_NotImplemented);
958d07085dcf Add nb_remainder (i.e. __mod__) slot to unicode type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	6179 return Py_NotImplemented;
958d07085dcf Add nb_remainder (i.e. __mod__) slot to unicode type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	6180 }
958d07085dcf Add nb_remainder (i.e. __mod__) slot to unicode type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	6181 return PyUnicode_Format(v, w);
958d07085dcf Add nb_remainder (i.e. __mod__) slot to unicode type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	6182 }
958d07085dcf Add nb_remainder (i.e. __mod__) slot to unicode type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	6183
958d07085dcf Add nb_remainder (i.e. __mod__) slot to unicode type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	6184 static PyNumberMethods unicode_as_number = {
958d07085dcf Add nb_remainder (i.e. __mod__) slot to unicode type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	6185 0, /nb_add/
958d07085dcf Add nb_remainder (i.e. __mod__) slot to unicode type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	6186 0, /nb_subtract/
958d07085dcf Add nb_remainder (i.e. __mod__) slot to unicode type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	6187 0, /nb_multiply/
958d07085dcf Add nb_remainder (i.e. __mod__) slot to unicode type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	6188 0, /nb_divide/
958d07085dcf Add nb_remainder (i.e. __mod__) slot to unicode type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	6189 unicode_mod, /nb_remainder/
958d07085dcf Add nb_remainder (i.e. __mod__) slot to unicode type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	6190 };
958d07085dcf Add nb_remainder (i.e. __mod__) slot to unicode type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	6191
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6192 static PySequenceMethods unicode_as_sequence = {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6193 (inquiry) unicode_length, /* sq_length */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6194 (binaryfunc) PyUnicode_Concat, /* sq_concat */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6195 (intargfunc) unicode_repeat, /* sq_repeat */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6196 (intargfunc) unicode_getitem, /* sq_item */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6197 (intintargfunc) unicode_slice, /* sq_slice */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6198 0, /* sq_ass_item */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6199 0, /* sq_ass_slice */
11997 38310eb0659e Add sq_contains implementation. Guido van Rossum <guido@python.org> parents: 11968 diff changeset	6200 (objobjproc)PyUnicode_Contains, /sq_contains/
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6201 };
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6202
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6203 static PyObject*
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6204 unicode_subscript(PyUnicodeObject* self, PyObject* item)
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6205 {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6206 if (PyInt_Check(item)) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6207 long i = PyInt_AS_LONG(item);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6208 if (i < 0)
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6209 i += PyString_GET_SIZE(self);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6210 return unicode_getitem(self, i);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6211 } else if (PyLong_Check(item)) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6212 long i = PyLong_AsLong(item);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6213 if (i == -1 && PyErr_Occurred())
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6214 return NULL;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6215 if (i < 0)
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6216 i += PyString_GET_SIZE(self);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6217 return unicode_getitem(self, i);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6218 } else if (PySlice_Check(item)) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6219 int start, stop, step, slicelength, cur, i;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6220 Py_UNICODE* source_buf;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6221 Py_UNICODE* result_buf;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6222 PyObject* result;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6223
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6224 if (PySlice_GetIndicesEx((PySliceObject*)item, PyString_GET_SIZE(self),
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6225 &start, &stop, &step, &slicelength) < 0) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6226 return NULL;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6227 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6228
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6229 if (slicelength <= 0) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6230 return PyUnicode_FromUnicode(NULL, 0);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6231 } else {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6232 source_buf = PyUnicode_AS_UNICODE((PyObject*)self);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6233 result_buf = PyMem_MALLOC(slicelength*sizeof(Py_UNICODE));
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6234
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6235 for (cur = start, i = 0; i < slicelength; cur += step, i++) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6236 result_buf[i] = source_buf[cur];
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6237 }
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	6238
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6239 result = PyUnicode_FromUnicode(result_buf, slicelength);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6240 PyMem_FREE(result_buf);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6241 return result;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6242 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6243 } else {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6244 PyErr_SetString(PyExc_TypeError, "string indices must be integers");
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6245 return NULL;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6246 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6247 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6248
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6249 static PyMappingMethods unicode_as_mapping = {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6250 (inquiry)unicode_length, /* mp_length */
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6251 (binaryfunc)unicode_subscript, /* mp_subscript */
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6252 (objobjargproc)0, /* mp_ass_subscript */
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6253 };
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	6254
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6255 static int
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6256 unicode_buffer_getreadbuf(PyUnicodeObject *self,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6257 int index,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6258 const void **ptr)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6259 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6260 if (index != 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6261 PyErr_SetString(PyExc_SystemError,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6262 "accessing non-existent unicode segment");
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6263 return -1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6264 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6265 ptr = (void ) self->str;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6266 return PyUnicode_GET_DATA_SIZE(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6267 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6268
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6269 static int
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6270 unicode_buffer_getwritebuf(PyUnicodeObject *self, int index,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6271 const void **ptr)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6272 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6273 PyErr_SetString(PyExc_TypeError,
23837 359a57e96d5e Fix typo in exception message Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	6274 "cannot use unicode as modifiable buffer");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6275 return -1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6276 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6277
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6278 static int
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6279 unicode_buffer_getsegcount(PyUnicodeObject *self,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6280 int *lenp)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6281 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6282 if (lenp)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6283 *lenp = PyUnicode_GET_DATA_SIZE(self);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6284 return 1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6285 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6286
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6287 static int
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6288 unicode_buffer_getcharbuf(PyUnicodeObject *self,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6289 int index,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6290 const void **ptr)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6291 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6292 PyObject *str;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	6293
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6294 if (index != 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6295 PyErr_SetString(PyExc_SystemError,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6296 "accessing non-existent unicode segment");
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6297 return -1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6298 }
13837 2badb322355f This patch finalizes the move from UTF-8 to a default encoding in Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	6299 str = _PyUnicode_AsDefaultEncodedString((PyObject *)self, NULL);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6300 if (str == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6301 return -1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6302 ptr = (void ) PyString_AS_STRING(str);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6303 return PyString_GET_SIZE(str);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6304 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6305
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6306 /* Helpers for PyUnicode_Format() */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6307
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6308 static PyObject *
13660 a1ce07218781 Miscelaneous ANSIfications. I'm assuming here 'main' should take (int, Thomas Wouters <thomas@python.org> parents: 13635 diff changeset	6309 getnextarg(PyObject args, int arglen, int p_argidx)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6310 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6311 int argidx = *p_argidx;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6312 if (argidx < arglen) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6313 (*p_argidx)++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6314 if (arglen < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6315 return args;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6316 else
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6317 return PyTuple_GetItem(args, argidx);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6318 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6319 PyErr_SetString(PyExc_TypeError,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6320 "not enough arguments for format string");
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6321 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6322 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6323
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6324 #define F_LJUST (1<<0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6325 #define F_SIGN (1<<1)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6326 #define F_BLANK (1<<2)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6327 #define F_ALT (1<<3)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6328 #define F_ZERO (1<<4)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6329
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6330 static
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6331 int usprintf(register Py_UNICODE buffer, char format, ...)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6332 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6333 register int i;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6334 int len;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6335 va_list va;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6336 char *charbuffer;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6337 va_start(va, format);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6338
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6339 /* First, format the string as char array, then expand to Py_UNICODE
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6340 array. */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6341 charbuffer = (char *)buffer;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6342 len = vsprintf(charbuffer, format, va);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6343 for (i = len - 1; i >= 0; i--)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6344 buffer[i] = (Py_UNICODE) charbuffer[i];
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6345
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6346 va_end(va);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6347 return len;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6348 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6349
24736 ff05eef3a6d1 Implement stage B0 of PEP 237: add warnings for operations that Guido van Rossum <guido@python.org> parents: 24703 diff changeset	6350 /* XXX To save some code duplication, formatfloat/long/int could have been
ff05eef3a6d1 Implement stage B0 of PEP 237: add warnings for operations that Guido van Rossum <guido@python.org> parents: 24703 diff changeset	6351 shared with stringobject.c, converting from 8-bit to Unicode after the
ff05eef3a6d1 Implement stage B0 of PEP 237: add warnings for operations that Guido van Rossum <guido@python.org> parents: 24703 diff changeset	6352 formatting is done. */
ff05eef3a6d1 Implement stage B0 of PEP 237: add warnings for operations that Guido van Rossum <guido@python.org> parents: 24703 diff changeset	6353
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6354 static int
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6355 formatfloat(Py_UNICODE *buf,
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6356 size_t buflen,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6357 int flags,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6358 int prec,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6359 int type,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6360 PyObject *v)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6361 {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6362 /* fmt = '%#.' + `prec` + `type`
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6363 worst case length = 3 + 10 (len of INT_MAX) + 1 = 14 (use 20)*/
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6364 char fmt[20];
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6365 double x;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	6366
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6367 x = PyFloat_AsDouble(v);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6368 if (x == -1.0 && PyErr_Occurred())
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6369 return -1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6370 if (prec < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6371 prec = 6;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6372 if (type == 'f' && (fabs(x) / 1e25) >= 1e25)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6373 type = 'g';
26825 e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26274 diff changeset	6374 /* Worst case length calc to ensure no buffer overrun:
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26274 diff changeset	6375
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26274 diff changeset	6376 'g' formats:
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26274 diff changeset	6377 fmt = %#.<prec>g
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26274 diff changeset	6378 buf = '-' + [0-9]*prec + '.' + 'e+' + (longest exp
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26274 diff changeset	6379 for any double rep.)
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26274 diff changeset	6380 len = 1 + prec + 1 + 2 + 5 = 9 + prec
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26274 diff changeset	6381
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26274 diff changeset	6382 'f' formats:
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26274 diff changeset	6383 buf = '-' + [0-9]x + '.' + [0-9]prec (with x < 50)
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26274 diff changeset	6384 len = 1 + 50 + 1 + prec = 52 + prec
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26274 diff changeset	6385
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26274 diff changeset	6386 If prec=0 the effective precision is 1 (the leading digit is
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	6387 always given), therefore increase the length by one.
26825 e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26274 diff changeset	6388
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26274 diff changeset	6389 */
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26274 diff changeset	6390 if ((type == 'g' && buflen <= (size_t)10 + (size_t)prec) \|\|
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26274 diff changeset	6391 (type == 'f' && buflen <= (size_t)53 + (size_t)prec)) {
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26274 diff changeset	6392 PyErr_SetString(PyExc_OverflowError,
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26274 diff changeset	6393 "formatted float is too long (precision too large?)");
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26274 diff changeset	6394 return -1;
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26274 diff changeset	6395 }
21082 c8d775b9ff92 formatfloat(), formatint(): Conversion of sprintf() to PyOS_snprintf() Barry Warsaw <barry@python.org> parents: 21067 diff changeset	6396 PyOS_snprintf(fmt, sizeof(fmt), "%%%s.%d%c",
26825 e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26274 diff changeset	6397 (flags&F_ALT) ? "#" : "",
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26274 diff changeset	6398 prec, type);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6399 return usprintf(buf, fmt, x);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6400 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6401
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6402 static PyObject*
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6403 formatlong(PyObject *val, int flags, int prec, int type)
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6404 {
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6405 char *buf;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6406 int i, len;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6407 PyObject str; / temporary string object. */
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6408 PyUnicodeObject *result;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6409
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6410 str = _PyString_FormatLong(val, flags, prec, type, &buf, &len);
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6411 if (!str)
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6412 return NULL;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6413 result = _PyUnicode_New(len);
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6414 for (i = 0; i < len; i++)
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6415 result->str[i] = buf[i];
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6416 result->str[len] = 0;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6417 Py_DECREF(str);
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6418 return (PyObject*)result;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6419 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6420
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6421 static int
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6422 formatint(Py_UNICODE *buf,
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6423 size_t buflen,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6424 int flags,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6425 int prec,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6426 int type,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6427 PyObject *v)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6428 {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6429 /* fmt = '%#.' + `prec` + 'l' + `type`
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6430 * worst case length = 3 + 19 (worst len of INT_MAX on 64-bit machine)
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6431 * + 1 + 1
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6432 * = 24
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6433 */
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6434 char fmt[64]; /* plenty big enough! */
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	6435 char *sign;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6436 long x;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6437
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6438 x = PyInt_AsLong(v);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6439 if (x == -1 && PyErr_Occurred())
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6440 return -1;
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	6441 if (x < 0 && type == 'u') {
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	6442 type = 'd';
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	6443 }
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	6444 if (x < 0 && (type == 'x' \|\| type == 'X' \|\| type == 'o'))
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	6445 sign = "-";
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	6446 else
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	6447 sign = "";
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6448 if (prec < 0)
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6449 prec = 1;
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6450
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	6451 /* buf = '+'/'-'/'' + '0'/'0x'/'' + '[0-9]'*max(prec, len(x in octal))
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	6452 * worst case buf = '-0x' + [0-9]*prec, where prec >= 11
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	6453 */
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	6454 if (buflen <= 14 \|\| buflen <= (size_t)3 + (size_t)prec) {
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6455 PyErr_SetString(PyExc_OverflowError,
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6456 "formatted integer is too long (precision too large?)");
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6457 return -1;
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6458 }
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6459
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6460 if ((flags & F_ALT) &&
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6461 (type == 'x' \|\| type == 'X')) {
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	6462 /* When converting under %#x or %#X, there are a number
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6463 * of issues that cause pain:
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6464 * - when 0 is being converted, the C standard leaves off
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6465 * the '0x' or '0X', which is inconsistent with other
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6466 * %#x/%#X conversions and inconsistent with Python's
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6467 * hex() function
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6468 * - there are platforms that violate the standard and
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6469 * convert 0 with the '0x' or '0X'
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6470 * (Metrowerks, Compaq Tru64)
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6471 * - there are platforms that give '0x' when converting
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	6472 * under %#X, but convert 0 in accordance with the
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6473 * standard (OS/2 EMX)
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	6474 *
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6475 * We can achieve the desired consistency by inserting our
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6476 * own '0x' or '0X' prefix, and substituting %x/%X in place
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6477 * of %#x/%#X.
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6478 *
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6479 * Note that this is the same approach as used in
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6480 * formatint() in stringobject.c
22053 49197fd76362 OS/2 EMX port changes (Objects part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21886 diff changeset	6481 */
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	6482 PyOS_snprintf(fmt, sizeof(fmt), "%s0%c%%.%dl%c",
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	6483 sign, type, prec, type);
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6484 }
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6485 else {
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	6486 PyOS_snprintf(fmt, sizeof(fmt), "%s%%%s.%dl%c",
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	6487 sign, (flags&F_ALT) ? "#" : "",
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6488 prec, type);
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	6489 }
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	6490 if (sign[0])
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	6491 return usprintf(buf, fmt, -x);
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	6492 else
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	6493 return usprintf(buf, fmt, x);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6494 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6495
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6496 static int
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6497 formatchar(Py_UNICODE *buf,
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6498 size_t buflen,
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6499 PyObject *v)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6500 {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6501 /* presume that the buffer is at least 2 characters long */
12899 9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	6502 if (PyUnicode_Check(v)) {
9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	6503 if (PyUnicode_GET_SIZE(v) != 1)
9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	6504 goto onError;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6505 buf[0] = PyUnicode_AS_UNICODE(v)[0];
12899 9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	6506 }
9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	6507
9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	6508 else if (PyString_Check(v)) {
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	6509 if (PyString_GET_SIZE(v) != 1)
12899 9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	6510 goto onError;
9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	6511 buf[0] = (Py_UNICODE)PyString_AS_STRING(v)[0];
9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	6512 }
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6513
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6514 else {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6515 /* Integer input truncated to a character */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6516 long x;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6517 x = PyInt_AsLong(v);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6518 if (x == -1 && PyErr_Occurred())
12899 9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	6519 goto onError;
24737 eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	6520 #ifdef Py_UNICODE_WIDE
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	6521 if (x < 0 \|\| x > 0x10ffff) {
28494 32bea41fef68 Change formatchar(), so that u"%c" % 0xffffffff now raises Walter Dörwald <walter@livinglogic.de> parents: 28242 diff changeset	6522 PyErr_SetString(PyExc_OverflowError,
24737 eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	6523 "%c arg not in range(0x110000) "
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	6524 "(wide Python build)");
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	6525 return -1;
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	6526 }
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	6527 #else
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	6528 if (x < 0 \|\| x > 0xffff) {
28494 32bea41fef68 Change formatchar(), so that u"%c" % 0xffffffff now raises Walter Dörwald <walter@livinglogic.de> parents: 28242 diff changeset	6529 PyErr_SetString(PyExc_OverflowError,
24737 eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	6530 "%c arg not in range(0x10000) "
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	6531 "(narrow Python build)");
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	6532 return -1;
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	6533 }
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	6534 #endif
eaa87632b1e8 Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level. Marc-André Lemburg <mal@egenix.com> parents: 24736 diff changeset	6535 buf[0] = (Py_UNICODE) x;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6536 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6537 buf[1] = '\0';
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6538 return 1;
12899 9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	6539
9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	6540 onError:
9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	6541 PyErr_SetString(PyExc_TypeError,
9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	6542 "%c requires int or char");
9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	6543 return -1;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6544 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6545
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6546 /* fmt%(v1,v2,...) is roughly equivalent to sprintf(fmt, v1, v2, ...)
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6547
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6548 FORMATBUFLEN is the length of the buffer in which the floats, ints, &
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6549 chars are formatted. XXX This is a magic number. Each formatting
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6550 routine does bounds checking to ensure no overflow, but a better
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6551 solution may be to malloc a buffer of appropriate size for each
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6552 format. For now, the current solution is sufficient.
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6553 */
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6554 #define FORMATBUFLEN (size_t)120
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6555
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6556 PyObject PyUnicode_Format(PyObject format,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6557 PyObject *args)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6558 {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6559 Py_UNICODE fmt, res;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6560 int fmtcnt, rescnt, reslen, arglen, argidx;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6561 int args_owned = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6562 PyUnicodeObject *result = NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6563 PyObject *dict = NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6564 PyObject *uformat;
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	6565
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6566 if (format == NULL \|\| args == NULL) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6567 PyErr_BadInternalCall();
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6568 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6569 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6570 uformat = PyUnicode_FromObject(format);
12645 c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	6571 if (uformat == NULL)
c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	6572 return NULL;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6573 fmt = PyUnicode_AS_UNICODE(uformat);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6574 fmtcnt = PyUnicode_GET_SIZE(uformat);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6575
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6576 reslen = rescnt = fmtcnt + 100;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6577 result = _PyUnicode_New(reslen);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6578 if (result == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6579 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6580 res = PyUnicode_AS_UNICODE(result);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6581
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6582 if (PyTuple_Check(args)) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6583 arglen = PyTuple_Size(args);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6584 argidx = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6585 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6586 else {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6587 arglen = -1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6588 argidx = -2;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6589 }
26164 63a08639dae2 Fix SF # 635969, No error "not all arguments converted" Neal Norwitz <nnorwitz@gmail.com> parents: 25895 diff changeset	6590 if (args->ob_type->tp_as_mapping && !PyTuple_Check(args) &&
63a08639dae2 Fix SF # 635969, No error "not all arguments converted" Neal Norwitz <nnorwitz@gmail.com> parents: 25895 diff changeset	6591 !PyObject_TypeCheck(args, &PyBaseString_Type))
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6592 dict = args;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6593
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6594 while (--fmtcnt >= 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6595 if (*fmt != '%') {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6596 if (--rescnt < 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6597 rescnt = fmtcnt + 100;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6598 reslen += rescnt;
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	6599 if (_PyUnicode_Resize(&result, reslen) < 0)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6600 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6601 res = PyUnicode_AS_UNICODE(result) + reslen - rescnt;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6602 --rescnt;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6603 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6604 res++ = fmt++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6605 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6606 else {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6607 /* Got a format specifier */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6608 int flags = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6609 int width = -1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6610 int prec = -1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6611 Py_UNICODE c = '\0';
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6612 Py_UNICODE fill;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6613 PyObject *v = NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6614 PyObject *temp = NULL;
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6615 Py_UNICODE *pbuf;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6616 Py_UNICODE sign;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6617 int len;
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6618 Py_UNICODE formatbuf[FORMATBUFLEN]; /* For format{float,int,char}() */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6619
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6620 fmt++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6621 if (*fmt == '(') {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6622 Py_UNICODE *keystart;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6623 int keylen;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6624 PyObject *key;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6625 int pcount = 1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6626
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6627 if (dict == NULL) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6628 PyErr_SetString(PyExc_TypeError,
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	6629 "format requires a mapping");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6630 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6631 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6632 ++fmt;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6633 --fmtcnt;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6634 keystart = fmt;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6635 /* Skip over balanced parentheses */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6636 while (pcount > 0 && --fmtcnt >= 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6637 if (*fmt == ')')
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6638 --pcount;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6639 else if (*fmt == '(')
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6640 ++pcount;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6641 fmt++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6642 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6643 keylen = fmt - keystart - 1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6644 if (fmtcnt < 0 \|\| pcount > 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6645 PyErr_SetString(PyExc_ValueError,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6646 "incomplete format key");
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6647 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6648 }
21028 3dfbbf42bf16 Fix for bug #438164: %-formatting using Unicode objects. Marc-André Lemburg <mal@egenix.com> parents: 20563 diff changeset	6649 #if 0
12645 c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	6650 /* keys are converted to strings using UTF-8 and
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6651 then looked up since Python uses strings to hold
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6652 variables names etc. in its namespaces and we
12645 c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	6653 wouldn't want to break common idioms. */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6654 key = PyUnicode_EncodeUTF8(keystart,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6655 keylen,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6656 NULL);
21028 3dfbbf42bf16 Fix for bug #438164: %-formatting using Unicode objects. Marc-André Lemburg <mal@egenix.com> parents: 20563 diff changeset	6657 #else
3dfbbf42bf16 Fix for bug #438164: %-formatting using Unicode objects. Marc-André Lemburg <mal@egenix.com> parents: 20563 diff changeset	6658 key = PyUnicode_FromUnicode(keystart, keylen);
3dfbbf42bf16 Fix for bug #438164: %-formatting using Unicode objects. Marc-André Lemburg <mal@egenix.com> parents: 20563 diff changeset	6659 #endif
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6660 if (key == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6661 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6662 if (args_owned) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6663 Py_DECREF(args);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6664 args_owned = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6665 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6666 args = PyObject_GetItem(dict, key);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6667 Py_DECREF(key);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6668 if (args == NULL) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6669 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6670 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6671 args_owned = 1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6672 arglen = -1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6673 argidx = -2;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6674 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6675 while (--fmtcnt >= 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6676 switch (c = *fmt++) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6677 case '-': flags \|= F_LJUST; continue;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6678 case '+': flags \|= F_SIGN; continue;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6679 case ' ': flags \|= F_BLANK; continue;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6680 case '#': flags \|= F_ALT; continue;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6681 case '0': flags \|= F_ZERO; continue;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6682 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6683 break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6684 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6685 if (c == '*') {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6686 v = getnextarg(args, arglen, &argidx);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6687 if (v == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6688 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6689 if (!PyInt_Check(v)) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6690 PyErr_SetString(PyExc_TypeError,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6691 "* wants int");
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6692 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6693 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6694 width = PyInt_AsLong(v);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6695 if (width < 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6696 flags \|= F_LJUST;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6697 width = -width;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6698 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6699 if (--fmtcnt >= 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6700 c = *fmt++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6701 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6702 else if (c >= '0' && c <= '9') {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6703 width = c - '0';
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6704 while (--fmtcnt >= 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6705 c = *fmt++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6706 if (c < '0' \|\| c > '9')
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6707 break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6708 if ((width*10) / 10 != width) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6709 PyErr_SetString(PyExc_ValueError,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6710 "width too big");
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6711 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6712 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6713 width = width*10 + (c - '0');
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6714 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6715 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6716 if (c == '.') {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6717 prec = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6718 if (--fmtcnt >= 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6719 c = *fmt++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6720 if (c == '*') {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6721 v = getnextarg(args, arglen, &argidx);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6722 if (v == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6723 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6724 if (!PyInt_Check(v)) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6725 PyErr_SetString(PyExc_TypeError,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6726 "* wants int");
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6727 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6728 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6729 prec = PyInt_AsLong(v);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6730 if (prec < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6731 prec = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6732 if (--fmtcnt >= 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6733 c = *fmt++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6734 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6735 else if (c >= '0' && c <= '9') {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6736 prec = c - '0';
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6737 while (--fmtcnt >= 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6738 c = Py_CHARMASK(*fmt++);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6739 if (c < '0' \|\| c > '9')
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6740 break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6741 if ((prec*10) / 10 != prec) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6742 PyErr_SetString(PyExc_ValueError,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6743 "prec too big");
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6744 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6745 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6746 prec = prec*10 + (c - '0');
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6747 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6748 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6749 } /* prec */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6750 if (fmtcnt >= 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6751 if (c == 'h' \|\| c == 'l' \|\| c == 'L') {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6752 if (--fmtcnt >= 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6753 c = *fmt++;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6754 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6755 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6756 if (fmtcnt < 0) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6757 PyErr_SetString(PyExc_ValueError,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6758 "incomplete format");
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6759 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6760 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6761 if (c != '%') {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6762 v = getnextarg(args, arglen, &argidx);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6763 if (v == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6764 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6765 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6766 sign = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6767 fill = ' ';
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6768 switch (c) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6769
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6770 case '%':
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6771 pbuf = formatbuf;
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6772 /* presume that buffer length is at least 1 */
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6773 pbuf[0] = '%';
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6774 len = 1;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6775 break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6776
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6777 case 's':
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6778 case 'r':
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6779 if (PyUnicode_Check(v) && c == 's') {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6780 temp = v;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6781 Py_INCREF(temp);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6782 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6783 else {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6784 PyObject *unicode;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6785 if (c == 's')
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6786 temp = PyObject_Str(v);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6787 else
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6788 temp = PyObject_Repr(v);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6789 if (temp == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6790 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6791 if (!PyString_Check(temp)) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6792 /* XXX Note: this should never happen, since
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6793 PyObject_Repr() and PyObject_Str() assure
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6794 this */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6795 Py_DECREF(temp);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6796 PyErr_SetString(PyExc_TypeError,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6797 "%s argument has non-string str()");
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6798 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6799 }
12645 c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	6800 unicode = PyUnicode_Decode(PyString_AS_STRING(temp),
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6801 PyString_GET_SIZE(temp),
12645 c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	6802 NULL,
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6803 "strict");
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6804 Py_DECREF(temp);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6805 temp = unicode;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6806 if (temp == NULL)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6807 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6808 }
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6809 pbuf = PyUnicode_AS_UNICODE(temp);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6810 len = PyUnicode_GET_SIZE(temp);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6811 if (prec >= 0 && len > prec)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6812 len = prec;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6813 break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6814
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6815 case 'i':
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6816 case 'd':
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6817 case 'u':
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6818 case 'o':
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6819 case 'x':
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6820 case 'X':
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6821 if (c == 'i')
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6822 c = 'd';
15455 d0146d128897 Fox for SF bug #123859: %[duxXo] long formats inconsistent. Tim Peters <tim.peters@gmail.com> parents: 15001 diff changeset	6823 if (PyLong_Check(v)) {
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6824 temp = formatlong(v, flags, prec, c);
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6825 if (!temp)
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6826 goto onError;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6827 pbuf = PyUnicode_AS_UNICODE(temp);
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6828 len = PyUnicode_GET_SIZE(temp);
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6829 sign = 1;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6830 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6831 else {
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6832 pbuf = formatbuf;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6833 len = formatint(pbuf, sizeof(formatbuf)/sizeof(Py_UNICODE),
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6834 flags, prec, c, v);
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6835 if (len < 0)
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6836 goto onError;
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	6837 sign = 1;
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6838 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6839 if (flags & F_ZERO)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6840 fill = '0';
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6841 break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6842
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6843 case 'e':
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6844 case 'E':
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6845 case 'f':
30216 7ab1a41f16da SF bug #795506: Wrong handling of string format code for float values. Raymond Hettinger <python@rcn.com> parents: 30164 diff changeset	6846 case 'F':
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6847 case 'g':
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6848 case 'G':
30216 7ab1a41f16da SF bug #795506: Wrong handling of string format code for float values. Raymond Hettinger <python@rcn.com> parents: 30164 diff changeset	6849 if (c == 'F')
7ab1a41f16da SF bug #795506: Wrong handling of string format code for float values. Raymond Hettinger <python@rcn.com> parents: 30164 diff changeset	6850 c = 'f';
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6851 pbuf = formatbuf;
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6852 len = formatfloat(pbuf, sizeof(formatbuf)/sizeof(Py_UNICODE),
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6853 flags, prec, c, v);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6854 if (len < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6855 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6856 sign = 1;
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6857 if (flags & F_ZERO)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6858 fill = '0';
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6859 break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6860
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6861 case 'c':
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6862 pbuf = formatbuf;
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6863 len = formatchar(pbuf, sizeof(formatbuf)/sizeof(Py_UNICODE), v);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6864 if (len < 0)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6865 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6866 break;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6867
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6868 default:
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6869 PyErr_Format(PyExc_ValueError,
15579 31d78f361530 [ Patch #102852 ] Make % error a bit more informative by indicates the Andrew M. Kuchling <amk@amk.ca> parents: 15455 diff changeset	6870 "unsupported format character '%c' (0x%x) "
31d78f361530 [ Patch #102852 ] Make % error a bit more informative by indicates the Andrew M. Kuchling <amk@amk.ca> parents: 15455 diff changeset	6871 "at index %i",
30441 76e998aee644 On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type, Tim Peters <tim.peters@gmail.com> parents: 30439 diff changeset	6872 (31<=c && c<=126) ? (char)c : '?',
25375 4df0e691f4da Add cast to avoid compiler warning. Marc-André Lemburg <mal@egenix.com> parents: 25248 diff changeset	6873 (int)c,
25233 8d751b62ecc4 Fix warnings on 64-bit platforms about casts from pointers to ints. Guido van Rossum <guido@python.org> parents: 25120 diff changeset	6874 (int)(fmt -1 - PyUnicode_AS_UNICODE(uformat)));
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6875 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6876 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6877 if (sign) {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6878 if (pbuf == '-' \|\| pbuf == '+') {
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 13110 diff changeset	6879 sign = *pbuf++;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6880 len--;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6881 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6882 else if (flags & F_SIGN)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6883 sign = '+';
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6884 else if (flags & F_BLANK)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6885 sign = ' ';
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6886 else
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6887 sign = 0;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6888 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6889 if (width < len)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6890 width = len;
25719 f532e9b69551 Fix a nasty endcase reported by Armin Rigo in SF bug 618623: Guido van Rossum <guido@python.org> parents: 25375 diff changeset	6891 if (rescnt - (sign != 0) < width) {
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6892 reslen -= rescnt;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6893 rescnt = width + fmtcnt + 100;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6894 reslen += rescnt;
25719 f532e9b69551 Fix a nasty endcase reported by Armin Rigo in SF bug 618623: Guido van Rossum <guido@python.org> parents: 25375 diff changeset	6895 if (reslen < 0) {
f532e9b69551 Fix a nasty endcase reported by Armin Rigo in SF bug 618623: Guido van Rossum <guido@python.org> parents: 25375 diff changeset	6896 Py_DECREF(result);
f532e9b69551 Fix a nasty endcase reported by Armin Rigo in SF bug 618623: Guido van Rossum <guido@python.org> parents: 25375 diff changeset	6897 return PyErr_NoMemory();
f532e9b69551 Fix a nasty endcase reported by Armin Rigo in SF bug 618623: Guido van Rossum <guido@python.org> parents: 25375 diff changeset	6898 }
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	6899 if (_PyUnicode_Resize(&result, reslen) < 0)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6900 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6901 res = PyUnicode_AS_UNICODE(result)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6902 + reslen - rescnt;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6903 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6904 if (sign) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6905 if (fill != ' ')
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6906 *res++ = sign;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6907 rescnt--;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6908 if (width > len)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6909 width--;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6910 }
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6911 if ((flags & F_ALT) && (c == 'x' \|\| c == 'X')) {
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6912 assert(pbuf[0] == '0');
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	6913 assert(pbuf[1] == c);
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	6914 if (fill != ' ') {
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	6915 res++ = pbuf++;
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	6916 res++ = pbuf++;
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6917 }
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	6918 rescnt -= 2;
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	6919 width -= 2;
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	6920 if (width < 0)
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	6921 width = 0;
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	6922 len -= 2;
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6923 }
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6924 if (width > len && !(flags & F_LJUST)) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6925 do {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6926 --rescnt;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6927 *res++ = fill;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6928 } while (--width > len);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6929 }
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6930 if (fill == ' ') {
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6931 if (sign)
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6932 *res++ = sign;
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	6933 if ((flags & F_ALT) && (c == 'x' \|\| c == 'X')) {
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6934 assert(pbuf[0] == '0');
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	6935 assert(pbuf[1] == c);
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6936 res++ = pbuf++;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6937 res++ = pbuf++;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6938 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14492 diff changeset	6939 }
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	6940 Py_UNICODE_COPY(res, pbuf, len);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6941 res += len;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6942 rescnt -= len;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6943 while (--width >= len) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6944 --rescnt;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6945 *res++ = ' ';
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6946 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6947 if (dict && (argidx < arglen) && c != '%') {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6948 PyErr_SetString(PyExc_TypeError,
23494 76f376bea5e5 Patch 549187. Improve string formatting error message. Raymond Hettinger <python@rcn.com> parents: 23295 diff changeset	6949 "not all arguments converted during string formatting");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6950 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6951 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6952 Py_XDECREF(temp);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6953 } /* '%' */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6954 } /* until end */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6955 if (argidx < arglen && !dict) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6956 PyErr_SetString(PyExc_TypeError,
23494 76f376bea5e5 Patch 549187. Improve string formatting error message. Raymond Hettinger <python@rcn.com> parents: 23295 diff changeset	6957 "not all arguments converted during string formatting");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6958 goto onError;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6959 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6960
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6961 if (args_owned) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6962 Py_DECREF(args);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6963 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6964 Py_DECREF(uformat);
30431 cd0c3f916b34 Change checks of PyUnicode_Resize() return value for clarity. Jeremy Hylton <jeremy@alum.mit.edu> parents: 30216 diff changeset	6965 if (_PyUnicode_Resize(&result, reslen - rescnt) < 0)
12329 3cc77848a62a Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	6966 goto onError;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6967 return (PyObject *)result;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6968
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6969 onError:
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6970 Py_XDECREF(result);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6971 Py_DECREF(uformat);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6972 if (args_owned) {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6973 Py_DECREF(args);
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6974 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6975 return NULL;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6976 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6977
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6978 static PyBufferProcs unicode_as_buffer = {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6979 (getreadbufferproc) unicode_buffer_getreadbuf,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6980 (getwritebufferproc) unicode_buffer_getwritebuf,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6981 (getsegcountproc) unicode_buffer_getsegcount,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6982 (getcharbufferproc) unicode_buffer_getcharbuf,
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6983 };
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	6984
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24071 diff changeset	6985 static PyObject *
19593 a80b4b006eb7 Make unicode subclassable. Guido van Rossum <guido@python.org> parents: 19301 diff changeset	6986 unicode_subtype_new(PyTypeObject type, PyObject args, PyObject *kwds);
a80b4b006eb7 Make unicode subclassable. Guido van Rossum <guido@python.org> parents: 19301 diff changeset	6987
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	6988 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	6989 unicode_new(PyTypeObject type, PyObject args, PyObject *kwds)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	6990 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	6991 PyObject *x = NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	6992 static char *kwlist[] = {"string", "encoding", "errors", 0};
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	6993 char *encoding = NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	6994 char *errors = NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	6995
19593 a80b4b006eb7 Make unicode subclassable. Guido van Rossum <guido@python.org> parents: 19301 diff changeset	6996 if (type != &PyUnicode_Type)
a80b4b006eb7 Make unicode subclassable. Guido van Rossum <guido@python.org> parents: 19301 diff changeset	6997 return unicode_subtype_new(type, args, kwds);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	6998 if (!PyArg_ParseTupleAndKeywords(args, kwds, "\|Oss:unicode",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	6999 kwlist, &x, &encoding, &errors))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7000 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7001 if (x == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7002 return (PyObject *)_PyUnicode_New(0);
20554 0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	7003 if (encoding == NULL && errors == NULL)
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	7004 return PyObject_Unicode(x);
0336ee5b46d4 SF patch #470578: Fixes to synchronize unicode() and str() Guido van Rossum <guido@python.org> parents: 20277 diff changeset	7005 else
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7006 return PyUnicode_FromEncodedObject(x, encoding, errors);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7007 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7008
19593 a80b4b006eb7 Make unicode subclassable. Guido van Rossum <guido@python.org> parents: 19301 diff changeset	7009 static PyObject *
a80b4b006eb7 Make unicode subclassable. Guido van Rossum <guido@python.org> parents: 19301 diff changeset	7010 unicode_subtype_new(PyTypeObject type, PyObject args, PyObject *kwds)
a80b4b006eb7 Make unicode subclassable. Guido van Rossum <guido@python.org> parents: 19301 diff changeset	7011 {
19886 3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19885 diff changeset	7012 PyUnicodeObject tmp, pnew;
19593 a80b4b006eb7 Make unicode subclassable. Guido van Rossum <guido@python.org> parents: 19301 diff changeset	7013 int n;
a80b4b006eb7 Make unicode subclassable. Guido van Rossum <guido@python.org> parents: 19301 diff changeset	7014
a80b4b006eb7 Make unicode subclassable. Guido van Rossum <guido@python.org> parents: 19301 diff changeset	7015 assert(PyType_IsSubtype(type, &PyUnicode_Type));
a80b4b006eb7 Make unicode subclassable. Guido van Rossum <guido@python.org> parents: 19301 diff changeset	7016 tmp = (PyUnicodeObject *)unicode_new(&PyUnicode_Type, args, kwds);
a80b4b006eb7 Make unicode subclassable. Guido van Rossum <guido@python.org> parents: 19301 diff changeset	7017 if (tmp == NULL)
a80b4b006eb7 Make unicode subclassable. Guido van Rossum <guido@python.org> parents: 19301 diff changeset	7018 return NULL;
a80b4b006eb7 Make unicode subclassable. Guido van Rossum <guido@python.org> parents: 19301 diff changeset	7019 assert(PyUnicode_Check(tmp));
19886 3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19885 diff changeset	7020 pnew = (PyUnicodeObject *) type->tp_alloc(type, n = tmp->length);
29641 4909aa64405f SF patch 703666: Several objects don't decref tmp on failure in subtype_new Raymond Hettinger <python@rcn.com> parents: 29164 diff changeset	7021 if (pnew == NULL) {
4909aa64405f SF patch 703666: Several objects don't decref tmp on failure in subtype_new Raymond Hettinger <python@rcn.com> parents: 29164 diff changeset	7022 Py_DECREF(tmp);
19593 a80b4b006eb7 Make unicode subclassable. Guido van Rossum <guido@python.org> parents: 19301 diff changeset	7023 return NULL;
29641 4909aa64405f SF patch 703666: Several objects don't decref tmp on failure in subtype_new Raymond Hettinger <python@rcn.com> parents: 29164 diff changeset	7024 }
19886 3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19885 diff changeset	7025 pnew->str = PyMem_NEW(Py_UNICODE, n+1);
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19885 diff changeset	7026 if (pnew->str == NULL) {
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19885 diff changeset	7027 _Py_ForgetReference((PyObject *)pnew);
22981 dc1fb19d990d Remove PyMalloc_. Neil Schemenauer <nascheme@enme.ucalgary.ca>* parents: 22938 diff changeset	7028 PyObject_Del(pnew);
29641 4909aa64405f SF patch 703666: Several objects don't decref tmp on failure in subtype_new Raymond Hettinger <python@rcn.com> parents: 29164 diff changeset	7029 Py_DECREF(tmp);
27826 7dffcc498c45 Add more missing PyErr_NoMemory() after failled memory allocs Neal Norwitz <nnorwitz@gmail.com> parents: 27774 diff changeset	7030 return PyErr_NoMemory();
19593 a80b4b006eb7 Make unicode subclassable. Guido van Rossum <guido@python.org> parents: 19301 diff changeset	7031 }
19886 3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19885 diff changeset	7032 Py_UNICODE_COPY(pnew->str, tmp->str, n+1);
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19885 diff changeset	7033 pnew->length = n;
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19885 diff changeset	7034 pnew->hash = tmp->hash;
19593 a80b4b006eb7 Make unicode subclassable. Guido van Rossum <guido@python.org> parents: 19301 diff changeset	7035 Py_DECREF(tmp);
19886 3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19885 diff changeset	7036 return (PyObject *)pnew;
19593 a80b4b006eb7 Make unicode subclassable. Guido van Rossum <guido@python.org> parents: 19301 diff changeset	7037 }
a80b4b006eb7 Make unicode subclassable. Guido van Rossum <guido@python.org> parents: 19301 diff changeset	7038
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	7039 PyDoc_STRVAR(unicode_doc,
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7040 "unicode(string [, encoding[, errors]]) -> object\n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7041 \n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7042 Create a new Unicode object from the given encoded string.\n\
24392 0a327b768868 tighten up the unicode object's docstring a tad Skip Montanaro <skip@pobox.com> parents: 24280 diff changeset	7043 encoding defaults to the current default string encoding.\n\
0a327b768868 tighten up the unicode object's docstring a tad Skip Montanaro <skip@pobox.com> parents: 24280 diff changeset	7044 errors can be 'strict', 'replace' or 'ignore' and defaults to 'strict'.");
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7045
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7046 PyTypeObject PyUnicode_Type = {
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7047 PyObject_HEAD_INIT(&PyType_Type)
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7048 0, /* ob_size */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7049 "unicode", /* tp_name */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7050 sizeof(PyUnicodeObject), /* tp_size */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7051 0, /* tp_itemsize */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7052 /* Slots */
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20018 diff changeset	7053 (destructor)unicode_dealloc, /* tp_dealloc */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7054 0, /* tp_print */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7055 0, /* tp_getattr */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7056 0, /* tp_setattr */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7057 (cmpfunc) unicode_compare, /* tp_compare */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7058 (reprfunc) unicode_repr, /* tp_repr */
26274 958d07085dcf Add nb_remainder (i.e. __mod__) slot to unicode type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	7059 &unicode_as_number, /* tp_as_number */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7060 &unicode_as_sequence, /* tp_as_sequence */
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23562 diff changeset	7061 &unicode_as_mapping, /* tp_as_mapping */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7062 (hashfunc) unicode_hash, /* tp_hash*/
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7063 0, /* tp_call*/
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7064 (reprfunc) unicode_str, /* tp_str */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7065 PyObject_GenericGetAttr, /* tp_getattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7066 0, /* tp_setattro */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7067 &unicode_as_buffer, /* tp_as_buffer */
26274 958d07085dcf Add nb_remainder (i.e. __mod__) slot to unicode type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	7068 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_CHECKTYPES \|
958d07085dcf Add nb_remainder (i.e. __mod__) slot to unicode type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	7069 Py_TPFLAGS_BASETYPE, /* tp_flags */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7070 unicode_doc, /* tp_doc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7071 0, /* tp_traverse */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7072 0, /* tp_clear */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7073 0, /* tp_richcompare */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7074 0, /* tp_weaklistoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7075 0, /* tp_iter */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7076 0, /* tp_iternext */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7077 unicode_methods, /* tp_methods */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7078 0, /* tp_members */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7079 0, /* tp_getset */
23542 220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	7080 &PyBaseString_Type, /* tp_base */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7081 0, /* tp_dict */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7082 0, /* tp_descr_get */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7083 0, /* tp_descr_set */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7084 0, /* tp_dictoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7085 0, /* tp_init */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7086 0, /* tp_alloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	7087 unicode_new, /* tp_new */
22981 dc1fb19d990d Remove PyMalloc_. Neil Schemenauer <nascheme@enme.ucalgary.ca>* parents: 22938 diff changeset	7088 PyObject_Del, /* tp_free */
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7089 };
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7090
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7091 /* Initialize the Unicode implementation */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7092
13660 a1ce07218781 Miscelaneous ANSIfications. I'm assuming here 'main' should take (int, Thomas Wouters <thomas@python.org> parents: 13635 diff changeset	7093 void _PyUnicode_Init(void)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7094 {
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	7095 int i;
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	7096
12645 c4eb70d24a87 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12629 diff changeset	7097 /* Init the implementation */
12899 9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	7098 unicode_freelist = NULL;
9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	7099 unicode_freelist_size = 0;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7100 unicode_empty = _PyUnicode_New(0);
12876 243593f11fcf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12646 diff changeset	7101 strcpy(unicode_default_encoding, "ascii");
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	7102 for (i = 0; i < 256; i++)
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	7103 unicode_latin1[i] = NULL;
23542 220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	7104 if (PyType_Ready(&PyUnicode_Type) < 0)
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	7105 Py_FatalError("Can't initialize 'unicode'");
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7106 }
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7107
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7108 /* Finalize the Unicode implementation */
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7109
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7110 void
13660 a1ce07218781 Miscelaneous ANSIfications. I'm assuming here 'main' should take (int, Thomas Wouters <thomas@python.org> parents: 13635 diff changeset	7111 _PyUnicode_Fini(void)
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7112 {
15001 a349b89bf10e _PyUnicode_Fini(): Initialize the local freelist walking variable `u' Barry Warsaw <barry@python.org> parents: 14998 diff changeset	7113 PyUnicodeObject *u;
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	7114 int i;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7115
14998 c16bdf555c79 In _PyUnicode_Fini(), decref unicode_empty before tearng down the free Guido van Rossum <guido@python.org> parents: 14869 diff changeset	7116 Py_XDECREF(unicode_empty);
c16bdf555c79 In _PyUnicode_Fini(), decref unicode_empty before tearng down the free Guido van Rossum <guido@python.org> parents: 14869 diff changeset	7117 unicode_empty = NULL;
15001 a349b89bf10e _PyUnicode_Fini(): Initialize the local freelist walking variable `u' Barry Warsaw <barry@python.org> parents: 14998 diff changeset	7118
17618 b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	7119 for (i = 0; i < 256; i++) {
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	7120 if (unicode_latin1[i]) {
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	7121 Py_DECREF(unicode_latin1[i]);
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	7122 unicode_latin1[i] = NULL;
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	7123 }
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	7124 }
b44ba7c01217 This patch originated from an idea by Martin v. Loewis who submitted a Marc-André Lemburg <mal@egenix.com> parents: 17600 diff changeset	7125
15001 a349b89bf10e _PyUnicode_Fini(): Initialize the local freelist walking variable `u' Barry Warsaw <barry@python.org> parents: 14998 diff changeset	7126 for (u = unicode_freelist; u != NULL;) {
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7127 PyUnicodeObject *v = u;
13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7128 u = (PyUnicodeObject *)u;
12329 3cc77848a62a Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12320 diff changeset	7129 if (v->str)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12568 diff changeset	7130 PyMem_DEL(v->str);
13837 2badb322355f This patch finalizes the move from UTF-8 to a default encoding in Marc-André Lemburg <mal@egenix.com> parents: 13828 diff changeset	7131 Py_XDECREF(v->defenc);
22981 dc1fb19d990d Remove PyMalloc_. Neil Schemenauer <nascheme@enme.ucalgary.ca>* parents: 22938 diff changeset	7132 PyObject_Del(v);
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7133 }
12899 9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	7134 unicode_freelist = NULL;
9df91f91e5cc Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12876 diff changeset	7135 unicode_freelist_size = 0;
11968 13bc68faeb65 Unicode implementation by Marc-Andre Lemburg based on original code by Guido van Rossum <guido@python.org> parents: diff changeset	7136 }
29164 4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	7137
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	7138 /*
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	7139 Local variables:
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	7140 c-basic-offset: 4
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	7141 indent-tabs-mode: nil
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	7142 End:
4d9017ef7b5f Consider \U-escapes in raw-unicode-escape. Fixes #444514. Martin v. Löwis <martin@v.loewis.de> parents: 28575 diff changeset	7143 */

Mercurial > cpython-lru_cache-weakref

annotate Objects/unicodeobject.c @ 32260:cdad005bc030 legacy-trunk