Mercurial > cpython-lru_cache-weakref
annotate Objects/unicodeobject.c @ 58765:2ba7677bfa95 legacy-trunk
testCopysign was defined twice in test_math; combine the definitions
| author | Mark Dickinson <dickinsm@gmail.com> |
|---|---|
| date | Sat, 06 Feb 2010 23:11:25 +0000 |
| parents | 5e8930f370d5 |
| children | 32b21061ee9f |
| 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 |
|
38335
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
7 Major speed upgrades to the method implementations at the Reykjavik |
|
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
8 NeedForSpeed sprint, by Fredrik Lundh and Andrew Dalke. |
|
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
9 |
|
13828
254f8b7c4a83
Changing the CNRI copyright notice according to CNRI's instructions.
Guido van Rossum <guido@python.org>
parents:
13761
diff
changeset
|
10 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
|
11 |
|
16029
55d89a8fe963
refactored the unicodeobject/ucnhash interface, to hide the
Fredrik Lundh <fredrik@pythonware.com>
parents:
15952
diff
changeset
|
12 -------------------------------------------------------------------- |
|
55d89a8fe963
refactored the unicodeobject/ucnhash interface, to hide the
Fredrik Lundh <fredrik@pythonware.com>
parents:
15952
diff
changeset
|
13 The original string type implementation is: |
|
55d89a8fe963
refactored the unicodeobject/ucnhash interface, to hide the
Fredrik Lundh <fredrik@pythonware.com>
parents:
15952
diff
changeset
|
14 |
|
51218
aa07a123194a
fix indentation in comment
Benjamin Peterson <benjamin@python.org>
parents:
51213
diff
changeset
|
15 Copyright (c) 1999 by Secret Labs AB |
|
aa07a123194a
fix indentation in comment
Benjamin Peterson <benjamin@python.org>
parents:
51213
diff
changeset
|
16 Copyright (c) 1999 by Fredrik Lundh |
|
16029
55d89a8fe963
refactored the unicodeobject/ucnhash interface, to hide the
Fredrik Lundh <fredrik@pythonware.com>
parents:
15952
diff
changeset
|
17 |
|
55d89a8fe963
refactored the unicodeobject/ucnhash interface, to hide the
Fredrik Lundh <fredrik@pythonware.com>
parents:
15952
diff
changeset
|
18 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
|
19 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
|
20 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
|
21 |
|
55d89a8fe963
refactored the unicodeobject/ucnhash interface, to hide the
Fredrik Lundh <fredrik@pythonware.com>
parents:
15952
diff
changeset
|
22 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
|
23 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
|
24 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
|
25 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
|
26 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
|
27 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
|
28 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
|
29 permission. |
|
55d89a8fe963
refactored the unicodeobject/ucnhash interface, to hide the
Fredrik Lundh <fredrik@pythonware.com>
parents:
15952
diff
changeset
|
30 |
|
55d89a8fe963
refactored the unicodeobject/ucnhash interface, to hide the
Fredrik Lundh <fredrik@pythonware.com>
parents:
15952
diff
changeset
|
31 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
|
32 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
|
33 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
|
34 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
|
35 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
|
36 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
|
37 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
|
38 -------------------------------------------------------------------- |
|
55d89a8fe963
refactored the unicodeobject/ucnhash interface, to hide the
Fredrik Lundh <fredrik@pythonware.com>
parents:
15952
diff
changeset
|
39 |
|
55d89a8fe963
refactored the unicodeobject/ucnhash interface, to hide the
Fredrik Lundh <fredrik@pythonware.com>
parents:
15952
diff
changeset
|
40 */ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
41 |
|
37702
9b22d8b7bcaa
Make Py_BuildValue, PyObject_CallFunction and
Martin v. Löwis <martin@v.loewis.de>
parents:
37668
diff
changeset
|
42 #define PY_SSIZE_T_CLEAN |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
43 #include "Python.h" |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
44 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
45 #include "unicodeobject.h" |
|
13209
b11e0a898de0
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
13196
diff
changeset
|
46 #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
|
47 |
|
24071
8142f8d668a0
Patch #569753: Remove support for WIN16.
Martin v. Löwis <martin@v.loewis.de>
parents:
23837
diff
changeset
|
48 #ifdef MS_WINDOWS |
|
12067
bcab189ddf86
MBCS codecs. (Win32 only.) By Mark Hammond.
Guido van Rossum <guido@python.org>
parents:
12025
diff
changeset
|
49 #include <windows.h> |
|
bcab189ddf86
MBCS codecs. (Win32 only.) By Mark Hammond.
Guido van Rossum <guido@python.org>
parents:
12025
diff
changeset
|
50 #endif |
| 12329 | 51 |
|
11968
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 */ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
53 |
|
45191
920a7633ae08
Unified naming convention for free lists and their limits. All free lists
Christian Heimes <christian@cheimes.de>
parents:
45053
diff
changeset
|
54 #define PyUnicode_MAXFREELIST 1024 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
55 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
56 /* 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
|
57 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
58 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
|
59 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
|
60 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
|
61 |
|
45191
920a7633ae08
Unified naming convention for free lists and their limits. All free lists
Christian Heimes <christian@cheimes.de>
parents:
45053
diff
changeset
|
62 At worst this will result in PyUnicode_MAXFREELIST * |
| 12329 | 63 (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
|
64 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
|
65 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
66 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
|
67 |
| 12329 | 68 Note: This is an experimental feature ! If you get core dumps when |
| 69 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
|
70 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
71 */ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
72 |
| 12329 | 73 #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
|
74 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
75 /* 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
|
76 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
77 #ifdef WORDS_BIGENDIAN |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
78 # 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
|
79 #else |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
80 # 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
|
81 #endif |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
82 |
|
12899
9df91f91e5cc
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12876
diff
changeset
|
83 /* --- Globals ------------------------------------------------------------ |
|
9df91f91e5cc
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12876
diff
changeset
|
84 |
|
9df91f91e5cc
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12876
diff
changeset
|
85 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
|
86 not be used before calling that API. |
|
9df91f91e5cc
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12876
diff
changeset
|
87 |
|
9df91f91e5cc
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12876
diff
changeset
|
88 */ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
89 |
|
37655
2f3f2e32dfd9
spread the extern "C" { } magic pixie dust around. Python itself builds now
Anthony Baxter <anthonybaxter@gmail.com>
parents:
37596
diff
changeset
|
90 |
|
2f3f2e32dfd9
spread the extern "C" { } magic pixie dust around. Python itself builds now
Anthony Baxter <anthonybaxter@gmail.com>
parents:
37596
diff
changeset
|
91 #ifdef __cplusplus |
|
2f3f2e32dfd9
spread the extern "C" { } magic pixie dust around. Python itself builds now
Anthony Baxter <anthonybaxter@gmail.com>
parents:
37596
diff
changeset
|
92 extern "C" { |
|
2f3f2e32dfd9
spread the extern "C" { } magic pixie dust around. Python itself builds now
Anthony Baxter <anthonybaxter@gmail.com>
parents:
37596
diff
changeset
|
93 #endif |
|
2f3f2e32dfd9
spread the extern "C" { } magic pixie dust around. Python itself builds now
Anthony Baxter <anthonybaxter@gmail.com>
parents:
37596
diff
changeset
|
94 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
95 /* Free list for Unicode objects */ |
|
45191
920a7633ae08
Unified naming convention for free lists and their limits. All free lists
Christian Heimes <christian@cheimes.de>
parents:
45053
diff
changeset
|
96 static PyUnicodeObject *free_list; |
|
920a7633ae08
Unified naming convention for free lists and their limits. All free lists
Christian Heimes <christian@cheimes.de>
parents:
45053
diff
changeset
|
97 static int numfree; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
98 |
|
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
|
99 /* 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
|
100 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
|
101 |
|
b44ba7c01217
This patch originated from an idea by Martin v. Loewis who submitted a
Marc-André Lemburg <mal@egenix.com>
parents:
17600
diff
changeset
|
102 /* 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
|
103 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
|
104 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
|
105 |
|
12645
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
106 /* 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
|
107 parameter; it is initialized by _PyUnicode_Init(). |
|
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
108 |
|
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
109 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
|
110 PyUnicode_GetDefaultEncoding() APIs to access this global. |
|
12645
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
111 |
|
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
112 */ |
|
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
113 static char unicode_default_encoding[100]; |
|
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
114 |
|
45053
26278796d4da
Patch #1970 by Antoine Pitrou: Speedup unicode whitespace and linebreak detection. The speedup is about 25% for split() (571 / 457 usec) and 35% (175 / 127 usec )for splitlines()
Christian Heimes <christian@cheimes.de>
parents:
44945
diff
changeset
|
115 /* Fast detection of the most frequent whitespace characters */ |
|
26278796d4da
Patch #1970 by Antoine Pitrou: Speedup unicode whitespace and linebreak detection. The speedup is about 25% for split() (571 / 457 usec) and 35% (175 / 127 usec )for splitlines()
Christian Heimes <christian@cheimes.de>
parents:
44945
diff
changeset
|
116 const unsigned char _Py_ascii_whitespace[] = { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
117 0, 0, 0, 0, 0, 0, 0, 0, |
|
49386
642f20b22577
Merged revisions 66748 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
49115
diff
changeset
|
118 /* case 0x0009: * HORIZONTAL TABULATION */ |
|
642f20b22577
Merged revisions 66748 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
49115
diff
changeset
|
119 /* case 0x000A: * LINE FEED */ |
|
642f20b22577
Merged revisions 66748 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
49115
diff
changeset
|
120 /* case 0x000B: * VERTICAL TABULATION */ |
|
642f20b22577
Merged revisions 66748 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
49115
diff
changeset
|
121 /* case 0x000C: * FORM FEED */ |
|
642f20b22577
Merged revisions 66748 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
49115
diff
changeset
|
122 /* case 0x000D: * CARRIAGE RETURN */ |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
123 0, 1, 1, 1, 1, 1, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
124 0, 0, 0, 0, 0, 0, 0, 0, |
|
49386
642f20b22577
Merged revisions 66748 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
49115
diff
changeset
|
125 /* case 0x001C: * FILE SEPARATOR */ |
|
642f20b22577
Merged revisions 66748 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
49115
diff
changeset
|
126 /* case 0x001D: * GROUP SEPARATOR */ |
|
642f20b22577
Merged revisions 66748 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
49115
diff
changeset
|
127 /* case 0x001E: * RECORD SEPARATOR */ |
|
642f20b22577
Merged revisions 66748 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
49115
diff
changeset
|
128 /* case 0x001F: * UNIT SEPARATOR */ |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
129 0, 0, 0, 0, 1, 1, 1, 1, |
|
49386
642f20b22577
Merged revisions 66748 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
49115
diff
changeset
|
130 /* case 0x0020: * SPACE */ |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
131 1, 0, 0, 0, 0, 0, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
132 0, 0, 0, 0, 0, 0, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
133 0, 0, 0, 0, 0, 0, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
134 0, 0, 0, 0, 0, 0, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
135 |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
136 0, 0, 0, 0, 0, 0, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
137 0, 0, 0, 0, 0, 0, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
138 0, 0, 0, 0, 0, 0, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
139 0, 0, 0, 0, 0, 0, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
140 0, 0, 0, 0, 0, 0, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
141 0, 0, 0, 0, 0, 0, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
142 0, 0, 0, 0, 0, 0, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
143 0, 0, 0, 0, 0, 0, 0, 0 |
|
45053
26278796d4da
Patch #1970 by Antoine Pitrou: Speedup unicode whitespace and linebreak detection. The speedup is about 25% for split() (571 / 457 usec) and 35% (175 / 127 usec )for splitlines()
Christian Heimes <christian@cheimes.de>
parents:
44945
diff
changeset
|
144 }; |
|
26278796d4da
Patch #1970 by Antoine Pitrou: Speedup unicode whitespace and linebreak detection. The speedup is about 25% for split() (571 / 457 usec) and 35% (175 / 127 usec )for splitlines()
Christian Heimes <christian@cheimes.de>
parents:
44945
diff
changeset
|
145 |
|
26278796d4da
Patch #1970 by Antoine Pitrou: Speedup unicode whitespace and linebreak detection. The speedup is about 25% for split() (571 / 457 usec) and 35% (175 / 127 usec )for splitlines()
Christian Heimes <christian@cheimes.de>
parents:
44945
diff
changeset
|
146 /* Same for linebreaks */ |
|
26278796d4da
Patch #1970 by Antoine Pitrou: Speedup unicode whitespace and linebreak detection. The speedup is about 25% for split() (571 / 457 usec) and 35% (175 / 127 usec )for splitlines()
Christian Heimes <christian@cheimes.de>
parents:
44945
diff
changeset
|
147 static unsigned char ascii_linebreak[] = { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
148 0, 0, 0, 0, 0, 0, 0, 0, |
|
49386
642f20b22577
Merged revisions 66748 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
49115
diff
changeset
|
149 /* 0x000A, * LINE FEED */ |
|
642f20b22577
Merged revisions 66748 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
49115
diff
changeset
|
150 /* 0x000D, * CARRIAGE RETURN */ |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
151 0, 0, 1, 0, 0, 1, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
152 0, 0, 0, 0, 0, 0, 0, 0, |
|
49386
642f20b22577
Merged revisions 66748 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
49115
diff
changeset
|
153 /* 0x001C, * FILE SEPARATOR */ |
|
642f20b22577
Merged revisions 66748 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
49115
diff
changeset
|
154 /* 0x001D, * GROUP SEPARATOR */ |
|
642f20b22577
Merged revisions 66748 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
49115
diff
changeset
|
155 /* 0x001E, * RECORD SEPARATOR */ |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
156 0, 0, 0, 0, 1, 1, 1, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
157 0, 0, 0, 0, 0, 0, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
158 0, 0, 0, 0, 0, 0, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
159 0, 0, 0, 0, 0, 0, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
160 0, 0, 0, 0, 0, 0, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
161 |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
162 0, 0, 0, 0, 0, 0, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
163 0, 0, 0, 0, 0, 0, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
164 0, 0, 0, 0, 0, 0, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
165 0, 0, 0, 0, 0, 0, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
166 0, 0, 0, 0, 0, 0, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
167 0, 0, 0, 0, 0, 0, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
168 0, 0, 0, 0, 0, 0, 0, 0, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
169 0, 0, 0, 0, 0, 0, 0, 0 |
|
45053
26278796d4da
Patch #1970 by Antoine Pitrou: Speedup unicode whitespace and linebreak detection. The speedup is about 25% for split() (571 / 457 usec) and 35% (175 / 127 usec )for splitlines()
Christian Heimes <christian@cheimes.de>
parents:
44945
diff
changeset
|
170 }; |
|
26278796d4da
Patch #1970 by Antoine Pitrou: Speedup unicode whitespace and linebreak detection. The speedup is about 25% for split() (571 / 457 usec) and 35% (175 / 127 usec )for splitlines()
Christian Heimes <christian@cheimes.de>
parents:
44945
diff
changeset
|
171 |
|
26278796d4da
Patch #1970 by Antoine Pitrou: Speedup unicode whitespace and linebreak detection. The speedup is about 25% for split() (571 / 457 usec) and 35% (175 / 127 usec )for splitlines()
Christian Heimes <christian@cheimes.de>
parents:
44945
diff
changeset
|
172 |
|
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
|
173 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
|
174 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
|
175 { |
|
18324
3ba7a358ce02
use Py_UNICODE_WIDE instead of USE_UCS4_STORAGE and Py_UNICODE_SIZE
Fredrik Lundh <fredrik@pythonware.com>
parents:
18298
diff
changeset
|
176 #ifdef Py_UNICODE_WIDE |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
177 return 0x10FFFF; |
|
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
|
178 #else |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
179 /* This is actually an illegal character, so it should |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
180 not be passed to unichr. */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
181 return 0xFFFF; |
|
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
|
182 #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
|
183 } |
|
982163c4e9d2
Encode surrogates in UTF-8 even for a wide Py_UNICODE.
Martin v. Löwis <martin@v.loewis.de>
parents:
18295
diff
changeset
|
184 |
|
38257
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
185 /* --- Bloom Filters ----------------------------------------------------- */ |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
186 |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
187 /* stuff to implement simple "bloom filters" for Unicode characters. |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
188 to keep things simple, we use a single bitmask, using the least 5 |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
189 bits from each unicode characters as the bit index. */ |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
190 |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
191 /* the linebreak mask is set up by Unicode_Init below */ |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
192 |
|
58297
9225ea677c4b
Sanitize bloom filter macros
Antoine Pitrou <solipsis@pitrou.net>
parents:
58290
diff
changeset
|
193 #if LONG_BIT >= 128 |
|
9225ea677c4b
Sanitize bloom filter macros
Antoine Pitrou <solipsis@pitrou.net>
parents:
58290
diff
changeset
|
194 #define BLOOM_WIDTH 128 |
|
9225ea677c4b
Sanitize bloom filter macros
Antoine Pitrou <solipsis@pitrou.net>
parents:
58290
diff
changeset
|
195 #elif LONG_BIT >= 64 |
|
9225ea677c4b
Sanitize bloom filter macros
Antoine Pitrou <solipsis@pitrou.net>
parents:
58290
diff
changeset
|
196 #define BLOOM_WIDTH 64 |
|
9225ea677c4b
Sanitize bloom filter macros
Antoine Pitrou <solipsis@pitrou.net>
parents:
58290
diff
changeset
|
197 #elif LONG_BIT >= 32 |
|
9225ea677c4b
Sanitize bloom filter macros
Antoine Pitrou <solipsis@pitrou.net>
parents:
58290
diff
changeset
|
198 #define BLOOM_WIDTH 32 |
|
9225ea677c4b
Sanitize bloom filter macros
Antoine Pitrou <solipsis@pitrou.net>
parents:
58290
diff
changeset
|
199 #else |
|
9225ea677c4b
Sanitize bloom filter macros
Antoine Pitrou <solipsis@pitrou.net>
parents:
58290
diff
changeset
|
200 #error "LONG_BIT is smaller than 32" |
|
9225ea677c4b
Sanitize bloom filter macros
Antoine Pitrou <solipsis@pitrou.net>
parents:
58290
diff
changeset
|
201 #endif |
|
9225ea677c4b
Sanitize bloom filter macros
Antoine Pitrou <solipsis@pitrou.net>
parents:
58290
diff
changeset
|
202 |
|
38257
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
203 #define BLOOM_MASK unsigned long |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
204 |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
205 static BLOOM_MASK bloom_linebreak; |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
206 |
|
58297
9225ea677c4b
Sanitize bloom filter macros
Antoine Pitrou <solipsis@pitrou.net>
parents:
58290
diff
changeset
|
207 #define BLOOM_ADD(mask, ch) ((mask |= (1UL << ((ch) & (BLOOM_WIDTH - 1))))) |
|
9225ea677c4b
Sanitize bloom filter macros
Antoine Pitrou <solipsis@pitrou.net>
parents:
58290
diff
changeset
|
208 #define BLOOM(mask, ch) ((mask & (1UL << ((ch) & (BLOOM_WIDTH - 1))))) |
|
38257
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
209 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
210 #define BLOOM_LINEBREAK(ch) \ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
211 ((ch) < 128U ? ascii_linebreak[(ch)] : \ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
212 (BLOOM(bloom_linebreak, (ch)) && Py_UNICODE_ISLINEBREAK(ch))) |
|
38257
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
213 |
|
38440
5b0753b9d16a
needforspeed: replace improvements, changed to Py_LOCAL_INLINE
Fredrik Lundh <fredrik@pythonware.com>
parents:
38427
diff
changeset
|
214 Py_LOCAL_INLINE(BLOOM_MASK) make_bloom_mask(Py_UNICODE* ptr, Py_ssize_t len) |
|
38257
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
215 { |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
216 /* calculate simple bloom-style bitmask for a given unicode string */ |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
217 |
|
58297
9225ea677c4b
Sanitize bloom filter macros
Antoine Pitrou <solipsis@pitrou.net>
parents:
58290
diff
changeset
|
218 BLOOM_MASK mask; |
|
38257
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
219 Py_ssize_t i; |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
220 |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
221 mask = 0; |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
222 for (i = 0; i < len; i++) |
|
58288
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
223 BLOOM_ADD(mask, ptr[i]); |
|
38257
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
224 |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
225 return mask; |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
226 } |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
227 |
|
38440
5b0753b9d16a
needforspeed: replace improvements, changed to Py_LOCAL_INLINE
Fredrik Lundh <fredrik@pythonware.com>
parents:
38427
diff
changeset
|
228 Py_LOCAL_INLINE(int) unicode_member(Py_UNICODE chr, Py_UNICODE* set, Py_ssize_t setlen) |
|
38257
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
229 { |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
230 Py_ssize_t i; |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
231 |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
232 for (i = 0; i < setlen; i++) |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
233 if (set[i] == chr) |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
234 return 1; |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
235 |
|
38270
1dc5657f1745
return 0 on misses, not -1.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38257
diff
changeset
|
236 return 0; |
|
38257
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
237 } |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
238 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
239 #define BLOOM_MEMBER(mask, chr, set, setlen) \ |
|
38257
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
240 BLOOM(mask, chr) && unicode_member(chr, set, setlen) |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
241 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
242 /* --- Unicode Object ----------------------------------------------------- */ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
243 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
244 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
|
245 int unicode_resize(register PyUnicodeObject *unicode, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
246 Py_ssize_t length) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
247 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
248 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
|
249 |
| 12329 | 250 /* 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
|
251 if (unicode->length == length) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
252 goto reset; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
253 |
|
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
|
254 /* 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
|
255 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
|
256 instead ! */ |
|
38335
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
257 |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
258 if (unicode == unicode_empty || |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
259 (unicode->length == 1 && |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
260 unicode->str[0] < 256U && |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
261 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
|
262 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
|
263 "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
|
264 return -1; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
265 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
266 |
|
38335
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
267 /* We allocate one more byte to make sure the string is Ux0000 terminated. |
|
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
268 The overallocation is also used by fastsearch, which assumes that it's |
| 38405 | 269 safe to look at str[length] (without making any assumptions about what |
|
38335
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
270 it contains). */ |
|
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
271 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
272 oldstr = unicode->str; |
|
45804
d33cadb595f6
Issue 2321: reduce memory usage (increase the memory that is returned
Neal Norwitz <nnorwitz@gmail.com>
parents:
45731
diff
changeset
|
273 unicode->str = PyObject_REALLOC(unicode->str, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
274 sizeof(Py_UNICODE) * (length + 1)); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
275 if (!unicode->str) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
276 unicode->str = (Py_UNICODE *)oldstr; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
277 PyErr_NoMemory(); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
278 return -1; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
279 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
280 unicode->str[length] = 0; |
|
37662
0678ce9fb6b2
Change more ints to Py_ssize_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
37661
diff
changeset
|
281 unicode->length = length; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
282 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
283 reset: |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
284 /* 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
|
285 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
|
286 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
|
287 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
|
288 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
289 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
|
290 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
291 return 0; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
292 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
293 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
294 /* 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
|
295 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
|
296 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
297 XXX This allocator could further be enhanced by assuring that the |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
298 free list never reduces its size below 1. |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
299 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
300 */ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
301 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
302 static |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
303 PyUnicodeObject *_PyUnicode_New(Py_ssize_t length) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
304 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
305 register PyUnicodeObject *unicode; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
306 |
| 38426 | 307 /* Optimization for empty strings */ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
308 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
|
309 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
|
310 return unicode_empty; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
311 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
312 |
|
48114
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
313 /* Ensure we won't overflow the size. */ |
|
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
314 if (length > ((PY_SSIZE_T_MAX / sizeof(Py_UNICODE)) - 1)) { |
|
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
315 return (PyUnicodeObject *)PyErr_NoMemory(); |
|
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
316 } |
|
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
317 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
318 /* Unicode freelist & memory allocation */ |
|
45191
920a7633ae08
Unified naming convention for free lists and their limits. All free lists
Christian Heimes <christian@cheimes.de>
parents:
45053
diff
changeset
|
319 if (free_list) { |
|
920a7633ae08
Unified naming convention for free lists and their limits. All free lists
Christian Heimes <christian@cheimes.de>
parents:
45053
diff
changeset
|
320 unicode = free_list; |
|
920a7633ae08
Unified naming convention for free lists and their limits. All free lists
Christian Heimes <christian@cheimes.de>
parents:
45053
diff
changeset
|
321 free_list = *(PyUnicodeObject **)unicode; |
|
920a7633ae08
Unified naming convention for free lists and their limits. All free lists
Christian Heimes <christian@cheimes.de>
parents:
45053
diff
changeset
|
322 numfree--; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
323 if (unicode->str) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
324 /* Keep-Alive optimization: we only upsize the buffer, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
325 never downsize it. */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
326 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
|
327 unicode_resize(unicode, length) < 0) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
328 PyObject_DEL(unicode->str); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
329 unicode->str = NULL; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
330 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
331 } |
|
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
|
332 else { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
333 size_t new_size = sizeof(Py_UNICODE) * ((size_t)length + 1); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
334 unicode->str = (Py_UNICODE*) PyObject_MALLOC(new_size); |
|
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
|
335 } |
|
c29f3135a20c
Fix a mis-indentation in _PyUnicode_New() that caused me to stare at
Guido van Rossum <guido@python.org>
parents:
18051
diff
changeset
|
336 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
|
337 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
338 else { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
339 size_t new_size; |
|
22981
dc1fb19d990d
Remove PyMalloc_*.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
22938
diff
changeset
|
340 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
|
341 if (unicode == NULL) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
342 return NULL; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
343 new_size = sizeof(Py_UNICODE) * ((size_t)length + 1); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
344 unicode->str = (Py_UNICODE*) PyObject_MALLOC(new_size); |
|
11968
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 |
| 12511 | 347 if (!unicode->str) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
348 PyErr_NoMemory(); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
349 goto onError; |
| 12511 | 350 } |
|
30439
30e495efe90a
Double-fix of crash in Unicode freelist handling.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
30431
diff
changeset
|
351 /* 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
|
352 * 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
|
353 * 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
|
354 * 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
|
355 * 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
|
356 * 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
|
357 */ |
|
30439
30e495efe90a
Double-fix of crash in Unicode freelist handling.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
30431
diff
changeset
|
358 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
|
359 unicode->str[length] = 0; |
|
37668
4342e441b11c
Remove another INT_MAX limitation
Martin v. Löwis <martin@v.loewis.de>
parents:
37662
diff
changeset
|
360 unicode->length = length; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
361 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
|
362 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
|
363 return unicode; |
|
12025
7994d9db7f4d
On 17-Mar-2000, Marc-Andre Lemburg said:
Barry Warsaw <barry@python.org>
parents:
11997
diff
changeset
|
364 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
365 onError: |
|
48117
a94f136b5283
Correct a crash when two successive unicode allocations fail with a MemoryError:
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
48114
diff
changeset
|
366 /* XXX UNREF/NEWREF interface should be more symmetrical */ |
|
a94f136b5283
Correct a crash when two successive unicode allocations fail with a MemoryError:
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
48114
diff
changeset
|
367 _Py_DEC_REFTOTAL; |
|
12025
7994d9db7f4d
On 17-Mar-2000, Marc-Andre Lemburg said:
Barry Warsaw <barry@python.org>
parents:
11997
diff
changeset
|
368 _Py_ForgetReference((PyObject *)unicode); |
|
22981
dc1fb19d990d
Remove PyMalloc_*.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
22938
diff
changeset
|
369 PyObject_Del(unicode); |
|
12025
7994d9db7f4d
On 17-Mar-2000, Marc-Andre Lemburg said:
Barry Warsaw <barry@python.org>
parents:
11997
diff
changeset
|
370 return NULL; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
371 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
372 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
373 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
|
374 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
|
375 { |
|
21262
e8fea95a82a4
Fix for #489669 (Neil Norwitz): memory leak in test_descr (unicode).
Guido van Rossum <guido@python.org>
parents:
21082
diff
changeset
|
376 if (PyUnicode_CheckExact(unicode) && |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
377 numfree < PyUnicode_MAXFREELIST) { |
| 12329 | 378 /* Keep-Alive optimization */ |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
379 if (unicode->length >= KEEPALIVE_SIZE_LIMIT) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
380 PyObject_DEL(unicode->str); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
381 unicode->str = NULL; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
382 unicode->length = 0; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
383 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
384 if (unicode->defenc) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
385 Py_DECREF(unicode->defenc); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
386 unicode->defenc = NULL; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
387 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
388 /* Add to free list */ |
|
45191
920a7633ae08
Unified naming convention for free lists and their limits. All free lists
Christian Heimes <christian@cheimes.de>
parents:
45053
diff
changeset
|
389 *(PyUnicodeObject **)unicode = free_list; |
|
920a7633ae08
Unified naming convention for free lists and their limits. All free lists
Christian Heimes <christian@cheimes.de>
parents:
45053
diff
changeset
|
390 free_list = unicode; |
|
920a7633ae08
Unified naming convention for free lists and their limits. All free lists
Christian Heimes <christian@cheimes.de>
parents:
45053
diff
changeset
|
391 numfree++; |
|
11968
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 else { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
394 PyObject_DEL(unicode->str); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
395 Py_XDECREF(unicode->defenc); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
396 Py_TYPE(unicode)->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
|
397 } |
|
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 |
|
50305
e673632e1885
Merged revisions 67898,67904-67907,67912,67918,67920-67921,67923-67924,67927,67930,67932,67943 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
50004
diff
changeset
|
400 static |
|
e673632e1885
Merged revisions 67898,67904-67907,67912,67918,67920-67921,67923-67924,67927,67930,67932,67943 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
50004
diff
changeset
|
401 int _PyUnicode_Resize(PyUnicodeObject **unicode, Py_ssize_t 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
|
402 { |
|
b44ba7c01217
This patch originated from an idea by Martin v. Loewis who submitted a
Marc-André Lemburg <mal@egenix.com>
parents:
17600
diff
changeset
|
403 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
|
404 |
|
b44ba7c01217
This patch originated from an idea by Martin v. Loewis who submitted a
Marc-André Lemburg <mal@egenix.com>
parents:
17600
diff
changeset
|
405 /* 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
|
406 if (unicode == NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
407 PyErr_BadInternalCall(); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
408 return -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
|
409 } |
|
50305
e673632e1885
Merged revisions 67898,67904-67907,67912,67918,67920-67921,67923-67924,67927,67930,67932,67943 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
50004
diff
changeset
|
410 v = *unicode; |
|
44350
26384b8180c7
#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available.
Christian Heimes <christian@cheimes.de>
parents:
43932
diff
changeset
|
411 if (v == NULL || !PyUnicode_Check(v) || Py_REFCNT(v) != 1 || length < 0) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
412 PyErr_BadInternalCall(); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
413 return -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
|
414 } |
|
b44ba7c01217
This patch originated from an idea by Martin v. Loewis who submitted a
Marc-André Lemburg <mal@egenix.com>
parents:
17600
diff
changeset
|
415 |
|
b44ba7c01217
This patch originated from an idea by Martin v. Loewis who submitted a
Marc-André Lemburg <mal@egenix.com>
parents:
17600
diff
changeset
|
416 /* 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
|
417 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
|
418 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
|
419 if (v->length != length && |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
420 (v == unicode_empty || v->length == 1)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
421 PyUnicodeObject *w = _PyUnicode_New(length); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
422 if (w == NULL) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
423 return -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
424 Py_UNICODE_COPY(w->str, v->str, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
425 length < v->length ? length : v->length); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
426 Py_DECREF(*unicode); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
427 *unicode = w; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
428 return 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
|
429 } |
|
b44ba7c01217
This patch originated from an idea by Martin v. Loewis who submitted a
Marc-André Lemburg <mal@egenix.com>
parents:
17600
diff
changeset
|
430 |
|
b44ba7c01217
This patch originated from an idea by Martin v. Loewis who submitted a
Marc-André Lemburg <mal@egenix.com>
parents:
17600
diff
changeset
|
431 /* 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
|
432 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
|
433 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
|
434 } |
|
b44ba7c01217
This patch originated from an idea by Martin v. Loewis who submitted a
Marc-André Lemburg <mal@egenix.com>
parents:
17600
diff
changeset
|
435 |
|
50305
e673632e1885
Merged revisions 67898,67904-67907,67912,67918,67920-67921,67923-67924,67927,67930,67932,67943 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
50004
diff
changeset
|
436 int PyUnicode_Resize(PyObject **unicode, Py_ssize_t length) |
|
e673632e1885
Merged revisions 67898,67904-67907,67912,67918,67920-67921,67923-67924,67927,67930,67932,67943 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
50004
diff
changeset
|
437 { |
|
e673632e1885
Merged revisions 67898,67904-67907,67912,67918,67920-67921,67923-67924,67927,67930,67932,67943 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
50004
diff
changeset
|
438 return _PyUnicode_Resize((PyUnicodeObject **)unicode, length); |
|
e673632e1885
Merged revisions 67898,67904-67907,67912,67918,67920-67921,67923-67924,67927,67930,67932,67943 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
50004
diff
changeset
|
439 } |
|
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
|
440 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
441 PyObject *PyUnicode_FromUnicode(const Py_UNICODE *u, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
442 Py_ssize_t size) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
443 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
444 PyUnicodeObject *unicode; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
445 |
|
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
|
446 /* 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
|
447 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
|
448 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
|
449 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
450 /* Optimization for empty strings */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
451 if (size == 0 && unicode_empty != NULL) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
452 Py_INCREF(unicode_empty); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
453 return (PyObject *)unicode_empty; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
454 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
455 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
456 /* Single character Unicode objects in the Latin-1 range are |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
457 shared when using this constructor */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
458 if (size == 1 && *u < 256) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
459 unicode = unicode_latin1[*u]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
460 if (!unicode) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
461 unicode = _PyUnicode_New(1); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
462 if (!unicode) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
463 return NULL; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
464 unicode->str[0] = *u; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
465 unicode_latin1[*u] = unicode; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
466 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
467 Py_INCREF(unicode); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
468 return (PyObject *)unicode; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
469 } |
|
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
|
470 } |
|
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
|
471 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
472 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
|
473 if (!unicode) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
474 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
475 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
476 /* 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
|
477 if (u != NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
478 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
|
479 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
480 return (PyObject *)unicode; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
481 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
482 |
|
44945
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
483 PyObject *PyUnicode_FromStringAndSize(const char *u, Py_ssize_t size) |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
484 { |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
485 PyUnicodeObject *unicode; |
|
46383
0b55875c1c9c
Raise SystemError when size < 0 is passed into PyString_FromStringAndSize,
Gregory P. Smith <greg@mad-scientist.com>
parents:
46333
diff
changeset
|
486 |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
487 if (size < 0) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
488 PyErr_SetString(PyExc_SystemError, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
489 "Negative size passed to PyUnicode_FromStringAndSize"); |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
490 return NULL; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
491 } |
|
46383
0b55875c1c9c
Raise SystemError when size < 0 is passed into PyString_FromStringAndSize,
Gregory P. Smith <greg@mad-scientist.com>
parents:
46333
diff
changeset
|
492 |
|
44945
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
493 /* If the Unicode data is known at construction time, we can apply |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
494 some optimizations which share commonly used objects. |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
495 Also, this means the input must be UTF-8, so fall back to the |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
496 UTF-8 decoder at the end. */ |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
497 if (u != NULL) { |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
498 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
499 /* Optimization for empty strings */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
500 if (size == 0 && unicode_empty != NULL) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
501 Py_INCREF(unicode_empty); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
502 return (PyObject *)unicode_empty; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
503 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
504 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
505 /* Single characters are shared when using this constructor. |
|
44945
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
506 Restrict to ASCII, since the input must be UTF-8. */ |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
507 if (size == 1 && Py_CHARMASK(*u) < 128) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
508 unicode = unicode_latin1[Py_CHARMASK(*u)]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
509 if (!unicode) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
510 unicode = _PyUnicode_New(1); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
511 if (!unicode) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
512 return NULL; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
513 unicode->str[0] = Py_CHARMASK(*u); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
514 unicode_latin1[Py_CHARMASK(*u)] = unicode; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
515 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
516 Py_INCREF(unicode); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
517 return (PyObject *)unicode; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
518 } |
|
44945
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
519 |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
520 return PyUnicode_DecodeUTF8(u, size, NULL); |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
521 } |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
522 |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
523 unicode = _PyUnicode_New(size); |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
524 if (!unicode) |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
525 return NULL; |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
526 |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
527 return (PyObject *)unicode; |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
528 } |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
529 |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
530 PyObject *PyUnicode_FromString(const char *u) |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
531 { |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
532 size_t size = strlen(u); |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
533 if (size > PY_SSIZE_T_MAX) { |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
534 PyErr_SetString(PyExc_OverflowError, "input too long"); |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
535 return NULL; |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
536 } |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
537 |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
538 return PyUnicode_FromStringAndSize(u, size); |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
539 } |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
540 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
541 #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
|
542 |
|
52210
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
543 #if (Py_UNICODE_SIZE == 2) && defined(SIZEOF_WCHAR_T) && (SIZEOF_WCHAR_T == 4) |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
544 # define CONVERT_WCHAR_TO_SURROGATES |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
545 #endif |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
546 |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
547 #ifdef CONVERT_WCHAR_TO_SURROGATES |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
548 |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
549 /* Here sizeof(wchar_t) is 4 but Py_UNICODE_SIZE == 2, so we need |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
550 to convert from UTF32 to UTF16. */ |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
551 |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
552 PyObject *PyUnicode_FromWideChar(register const wchar_t *w, |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
553 Py_ssize_t size) |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
554 { |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
555 PyUnicodeObject *unicode; |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
556 register Py_ssize_t i; |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
557 Py_ssize_t alloc; |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
558 const wchar_t *orig_w; |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
559 |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
560 if (w == NULL) { |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
561 PyErr_BadInternalCall(); |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
562 return NULL; |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
563 } |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
564 |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
565 alloc = size; |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
566 orig_w = w; |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
567 for (i = size; i > 0; i--) { |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
568 if (*w > 0xFFFF) |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
569 alloc++; |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
570 w++; |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
571 } |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
572 w = orig_w; |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
573 unicode = _PyUnicode_New(alloc); |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
574 if (!unicode) |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
575 return NULL; |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
576 |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
577 /* Copy the wchar_t data into the new object */ |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
578 { |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
579 register Py_UNICODE *u; |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
580 u = PyUnicode_AS_UNICODE(unicode); |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
581 for (i = size; i > 0; i--) { |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
582 if (*w > 0xFFFF) { |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
583 wchar_t ordinal = *w++; |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
584 ordinal -= 0x10000; |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
585 *u++ = 0xD800 | (ordinal >> 10); |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
586 *u++ = 0xDC00 | (ordinal & 0x3FF); |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
587 } |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
588 else |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
589 *u++ = *w++; |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
590 } |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
591 } |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
592 return (PyObject *)unicode; |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
593 } |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
594 |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
595 #else |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
596 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
597 PyObject *PyUnicode_FromWideChar(register const wchar_t *w, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
598 Py_ssize_t size) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
599 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
600 PyUnicodeObject *unicode; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
601 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
602 if (w == NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
603 PyErr_BadInternalCall(); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
604 return NULL; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
605 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
606 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
607 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
|
608 if (!unicode) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
609 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
610 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
611 /* 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
|
612 #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
|
613 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
|
614 #else |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
615 { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
616 register Py_UNICODE *u; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
617 register Py_ssize_t i; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
618 u = PyUnicode_AS_UNICODE(unicode); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
619 for (i = size; i > 0; i--) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
620 *u++ = *w++; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
621 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
622 #endif |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
623 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
624 return (PyObject *)unicode; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
625 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
626 |
|
52210
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
627 #endif /* CONVERT_WCHAR_TO_SURROGATES */ |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
628 |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
629 #undef CONVERT_WCHAR_TO_SURROGATES |
|
c73dd25c01c1
Issue 4474: On platforms with sizeof(wchar_t) == 4 and
Mark Dickinson <dickinsm@gmail.com>
parents:
51775
diff
changeset
|
630 |
|
44945
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
631 static void |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
632 makefmt(char *fmt, int longflag, int size_tflag, int zeropad, int width, int precision, char c) |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
633 { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
634 *fmt++ = '%'; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
635 if (width) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
636 if (zeropad) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
637 *fmt++ = '0'; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
638 fmt += sprintf(fmt, "%d", width); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
639 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
640 if (precision) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
641 fmt += sprintf(fmt, ".%d", precision); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
642 if (longflag) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
643 *fmt++ = 'l'; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
644 else if (size_tflag) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
645 char *f = PY_FORMAT_SIZE_T; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
646 while (*f) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
647 *fmt++ = *f++; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
648 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
649 *fmt++ = c; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
650 *fmt = '\0'; |
|
44945
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
651 } |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
652 |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
653 #define appendstring(string) {for (copy = string;*copy;) *s++ = *copy++;} |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
654 |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
655 PyObject * |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
656 PyUnicode_FromFormatV(const char *format, va_list vargs) |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
657 { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
658 va_list count; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
659 Py_ssize_t callcount = 0; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
660 PyObject **callresults = NULL; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
661 PyObject **callresult = NULL; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
662 Py_ssize_t n = 0; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
663 int width = 0; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
664 int precision = 0; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
665 int zeropad; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
666 const char* f; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
667 Py_UNICODE *s; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
668 PyObject *string; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
669 /* used by sprintf */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
670 char buffer[21]; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
671 /* use abuffer instead of buffer, if we need more space |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
672 * (which can happen if there's a format specifier with width). */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
673 char *abuffer = NULL; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
674 char *realbuffer; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
675 Py_ssize_t abuffersize = 0; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
676 char fmt[60]; /* should be enough for %0width.precisionld */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
677 const char *copy; |
|
44945
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
678 |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
679 #ifdef VA_LIST_IS_ARRAY |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
680 Py_MEMCPY(count, vargs, sizeof(va_list)); |
|
44945
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
681 #else |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
682 #ifdef __va_copy |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
683 __va_copy(count, vargs); |
|
44945
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
684 #else |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
685 count = vargs; |
|
44945
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
686 #endif |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
687 #endif |
|
53719
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
688 /* step 1: count the number of %S/%R/%s format specifications |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
689 * (we call PyObject_Str()/PyObject_Repr()/PyUnicode_DecodeUTF8() for these |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
690 * objects once during step 3 and put the result in an array) */ |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
691 for (f = format; *f; f++) { |
|
53719
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
692 if (*f == '%') { |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
693 if (*(f+1)=='%') |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
694 continue; |
|
53722
e4af971b9184
There's no %A in Python 2.x!
Walter Dörwald <walter@livinglogic.de>
parents:
53719
diff
changeset
|
695 if (*(f+1)=='S' || *(f+1)=='R') |
|
53719
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
696 ++callcount; |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
697 while (isdigit((unsigned)*f)) |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
698 width = (width*10) + *f++ - '0'; |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
699 while (*++f && *f != '%' && !isalpha((unsigned)*f)) |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
700 ; |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
701 if (*f == 's') |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
702 ++callcount; |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
703 } |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
704 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
705 /* step 2: allocate memory for the results of |
|
53719
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
706 * PyObject_Str()/PyObject_Repr()/PyUnicode_DecodeUTF8() calls */ |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
707 if (callcount) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
708 callresults = PyObject_Malloc(sizeof(PyObject *)*callcount); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
709 if (!callresults) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
710 PyErr_NoMemory(); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
711 return NULL; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
712 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
713 callresult = callresults; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
714 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
715 /* step 3: figure out how large a buffer we need */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
716 for (f = format; *f; f++) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
717 if (*f == '%') { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
718 const char* p = f; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
719 width = 0; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
720 while (isdigit((unsigned)*f)) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
721 width = (width*10) + *f++ - '0'; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
722 while (*++f && *f != '%' && !isalpha((unsigned)*f)) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
723 ; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
724 |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
725 /* skip the 'l' or 'z' in {%ld, %zd, %lu, %zu} since |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
726 * they don't affect the amount of space we reserve. |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
727 */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
728 if ((*f == 'l' || *f == 'z') && |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
729 (f[1] == 'd' || f[1] == 'u')) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
730 ++f; |
|
44945
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
731 |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
732 switch (*f) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
733 case 'c': |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
734 (void)va_arg(count, int); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
735 /* fall through... */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
736 case '%': |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
737 n++; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
738 break; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
739 case 'd': case 'u': case 'i': case 'x': |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
740 (void) va_arg(count, int); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
741 /* 20 bytes is enough to hold a 64-bit |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
742 integer. Decimal takes the most space. |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
743 This isn't enough for octal. |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
744 If a width is specified we need more |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
745 (which we allocate later). */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
746 if (width < 20) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
747 width = 20; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
748 n += width; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
749 if (abuffersize < width) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
750 abuffersize = width; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
751 break; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
752 case 's': |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
753 { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
754 /* UTF-8 */ |
|
53780
5878ca784a84
#5929: fix signedness warning.
Georg Brandl <georg@python.org>
parents:
53740
diff
changeset
|
755 const char *s = va_arg(count, const char*); |
|
53719
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
756 PyObject *str = PyUnicode_DecodeUTF8(s, strlen(s), "replace"); |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
757 if (!str) |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
758 goto fail; |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
759 n += PyUnicode_GET_SIZE(str); |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
760 /* Remember the str and switch to the next slot */ |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
761 *callresult++ = str; |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
762 break; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
763 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
764 case 'U': |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
765 { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
766 PyObject *obj = va_arg(count, PyObject *); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
767 assert(obj && PyUnicode_Check(obj)); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
768 n += PyUnicode_GET_SIZE(obj); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
769 break; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
770 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
771 case 'V': |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
772 { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
773 PyObject *obj = va_arg(count, PyObject *); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
774 const char *str = va_arg(count, const char *); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
775 assert(obj || str); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
776 assert(!obj || PyUnicode_Check(obj)); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
777 if (obj) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
778 n += PyUnicode_GET_SIZE(obj); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
779 else |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
780 n += strlen(str); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
781 break; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
782 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
783 case 'S': |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
784 { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
785 PyObject *obj = va_arg(count, PyObject *); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
786 PyObject *str; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
787 assert(obj); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
788 str = PyObject_Str(obj); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
789 if (!str) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
790 goto fail; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
791 n += PyUnicode_GET_SIZE(str); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
792 /* Remember the str and switch to the next slot */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
793 *callresult++ = str; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
794 break; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
795 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
796 case 'R': |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
797 { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
798 PyObject *obj = va_arg(count, PyObject *); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
799 PyObject *repr; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
800 assert(obj); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
801 repr = PyObject_Repr(obj); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
802 if (!repr) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
803 goto fail; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
804 n += PyUnicode_GET_SIZE(repr); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
805 /* Remember the repr and switch to the next slot */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
806 *callresult++ = repr; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
807 break; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
808 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
809 case 'p': |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
810 (void) va_arg(count, int); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
811 /* maximum 64-bit pointer representation: |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
812 * 0xffffffffffffffff |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
813 * so 19 characters is enough. |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
814 * XXX I count 18 -- what's the extra for? |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
815 */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
816 n += 19; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
817 break; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
818 default: |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
819 /* if we stumble upon an unknown |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
820 formatting code, copy the rest of |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
821 the format string to the output |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
822 string. (we cannot just skip the |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
823 code, since there's no way to know |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
824 what's in the argument list) */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
825 n += strlen(p); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
826 goto expand; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
827 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
828 } else |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
829 n++; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
830 } |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
831 expand: |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
832 if (abuffersize > 20) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
833 abuffer = PyObject_Malloc(abuffersize); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
834 if (!abuffer) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
835 PyErr_NoMemory(); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
836 goto fail; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
837 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
838 realbuffer = abuffer; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
839 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
840 else |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
841 realbuffer = buffer; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
842 /* step 4: fill the buffer */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
843 /* Since we've analyzed how much space we need for the worst case, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
844 we don't have to resize the string. |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
845 There can be no errors beyond this point. */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
846 string = PyUnicode_FromUnicode(NULL, n); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
847 if (!string) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
848 goto fail; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
849 |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
850 s = PyUnicode_AS_UNICODE(string); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
851 callresult = callresults; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
852 |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
853 for (f = format; *f; f++) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
854 if (*f == '%') { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
855 const char* p = f++; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
856 int longflag = 0; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
857 int size_tflag = 0; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
858 zeropad = (*f == '0'); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
859 /* parse the width.precision part */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
860 width = 0; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
861 while (isdigit((unsigned)*f)) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
862 width = (width*10) + *f++ - '0'; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
863 precision = 0; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
864 if (*f == '.') { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
865 f++; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
866 while (isdigit((unsigned)*f)) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
867 precision = (precision*10) + *f++ - '0'; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
868 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
869 /* handle the long flag, but only for %ld and %lu. |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
870 others can be added when necessary. */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
871 if (*f == 'l' && (f[1] == 'd' || f[1] == 'u')) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
872 longflag = 1; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
873 ++f; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
874 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
875 /* handle the size_t flag. */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
876 if (*f == 'z' && (f[1] == 'd' || f[1] == 'u')) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
877 size_tflag = 1; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
878 ++f; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
879 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
880 |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
881 switch (*f) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
882 case 'c': |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
883 *s++ = va_arg(vargs, int); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
884 break; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
885 case 'd': |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
886 makefmt(fmt, longflag, size_tflag, zeropad, width, precision, 'd'); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
887 if (longflag) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
888 sprintf(realbuffer, fmt, va_arg(vargs, long)); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
889 else if (size_tflag) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
890 sprintf(realbuffer, fmt, va_arg(vargs, Py_ssize_t)); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
891 else |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
892 sprintf(realbuffer, fmt, va_arg(vargs, int)); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
893 appendstring(realbuffer); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
894 break; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
895 case 'u': |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
896 makefmt(fmt, longflag, size_tflag, zeropad, width, precision, 'u'); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
897 if (longflag) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
898 sprintf(realbuffer, fmt, va_arg(vargs, unsigned long)); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
899 else if (size_tflag) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
900 sprintf(realbuffer, fmt, va_arg(vargs, size_t)); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
901 else |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
902 sprintf(realbuffer, fmt, va_arg(vargs, unsigned int)); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
903 appendstring(realbuffer); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
904 break; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
905 case 'i': |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
906 makefmt(fmt, 0, 0, zeropad, width, precision, 'i'); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
907 sprintf(realbuffer, fmt, va_arg(vargs, int)); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
908 appendstring(realbuffer); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
909 break; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
910 case 'x': |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
911 makefmt(fmt, 0, 0, zeropad, width, precision, 'x'); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
912 sprintf(realbuffer, fmt, va_arg(vargs, int)); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
913 appendstring(realbuffer); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
914 break; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
915 case 's': |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
916 { |
|
53719
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
917 /* unused, since we already have the result */ |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
918 (void) va_arg(vargs, char *); |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
919 Py_UNICODE_COPY(s, PyUnicode_AS_UNICODE(*callresult), |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
920 PyUnicode_GET_SIZE(*callresult)); |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
921 s += PyUnicode_GET_SIZE(*callresult); |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
922 /* We're done with the unicode()/repr() => forget it */ |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
923 Py_DECREF(*callresult); |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
924 /* switch to next unicode()/repr() result */ |
|
1c27ecbed8c4
Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call
Walter Dörwald <walter@livinglogic.de>
parents:
53442
diff
changeset
|
925 ++callresult; |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
926 break; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
927 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
928 case 'U': |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
929 { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
930 PyObject *obj = va_arg(vargs, PyObject *); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
931 Py_ssize_t size = PyUnicode_GET_SIZE(obj); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
932 Py_UNICODE_COPY(s, PyUnicode_AS_UNICODE(obj), size); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
933 s += size; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
934 break; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
935 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
936 case 'V': |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
937 { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
938 PyObject *obj = va_arg(vargs, PyObject *); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
939 const char *str = va_arg(vargs, const char *); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
940 if (obj) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
941 Py_ssize_t size = PyUnicode_GET_SIZE(obj); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
942 Py_UNICODE_COPY(s, PyUnicode_AS_UNICODE(obj), size); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
943 s += size; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
944 } else { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
945 appendstring(str); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
946 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
947 break; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
948 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
949 case 'S': |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
950 case 'R': |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
951 { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
952 Py_UNICODE *ucopy; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
953 Py_ssize_t usize; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
954 Py_ssize_t upos; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
955 /* unused, since we already have the result */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
956 (void) va_arg(vargs, PyObject *); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
957 ucopy = PyUnicode_AS_UNICODE(*callresult); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
958 usize = PyUnicode_GET_SIZE(*callresult); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
959 for (upos = 0; upos<usize;) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
960 *s++ = ucopy[upos++]; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
961 /* We're done with the unicode()/repr() => forget it */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
962 Py_DECREF(*callresult); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
963 /* switch to next unicode()/repr() result */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
964 ++callresult; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
965 break; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
966 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
967 case 'p': |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
968 sprintf(buffer, "%p", va_arg(vargs, void*)); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
969 /* %p is ill-defined: ensure leading 0x. */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
970 if (buffer[1] == 'X') |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
971 buffer[1] = 'x'; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
972 else if (buffer[1] != 'x') { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
973 memmove(buffer+2, buffer, strlen(buffer)+1); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
974 buffer[0] = '0'; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
975 buffer[1] = 'x'; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
976 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
977 appendstring(buffer); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
978 break; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
979 case '%': |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
980 *s++ = '%'; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
981 break; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
982 default: |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
983 appendstring(p); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
984 goto end; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
985 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
986 } else |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
987 *s++ = *f; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
988 } |
|
44945
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
989 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
990 end: |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
991 if (callresults) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
992 PyObject_Free(callresults); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
993 if (abuffer) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
994 PyObject_Free(abuffer); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
995 PyUnicode_Resize(&string, s - PyUnicode_AS_UNICODE(string)); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
996 return string; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
997 fail: |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
998 if (callresults) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
999 PyObject **callresult2 = callresults; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
1000 while (callresult2 < callresult) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
1001 Py_DECREF(*callresult2); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
1002 ++callresult2; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
1003 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
1004 PyObject_Free(callresults); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
1005 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
1006 if (abuffer) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
1007 PyObject_Free(abuffer); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
1008 return NULL; |
|
44945
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
1009 } |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
1010 |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
1011 #undef appendstring |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
1012 |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
1013 PyObject * |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
1014 PyUnicode_FromFormat(const char *format, ...) |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
1015 { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
1016 PyObject* ret; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
1017 va_list vargs; |
|
44945
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
1018 |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
1019 #ifdef HAVE_STDARG_PROTOTYPES |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
1020 va_start(vargs, format); |
|
44945
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
1021 #else |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
1022 va_start(vargs); |
|
44945
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
1023 #endif |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
1024 ret = PyUnicode_FromFormatV(format, vargs); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
1025 va_end(vargs); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
1026 return ret; |
|
44945
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
1027 } |
|
bbc719a8b58b
Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0.
Christian Heimes <christian@cheimes.de>
parents:
44439
diff
changeset
|
1028 |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
1029 Py_ssize_t PyUnicode_AsWideChar(PyUnicodeObject *unicode, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1030 wchar_t *w, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1031 Py_ssize_t size) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1032 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1033 if (unicode == NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1034 PyErr_BadInternalCall(); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1035 return -1; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1036 } |
|
34016
264e45baacd5
Correct the handling of 0-termination of PyUnicode_AsWideChar()
Marc-André Lemburg <mal@egenix.com>
parents:
33766
diff
changeset
|
1037 |
|
264e45baacd5
Correct the handling of 0-termination of PyUnicode_AsWideChar()
Marc-André Lemburg <mal@egenix.com>
parents:
33766
diff
changeset
|
1038 /* If possible, try to copy the 0-termination as well */ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1039 if (size > PyUnicode_GET_SIZE(unicode)) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1040 size = PyUnicode_GET_SIZE(unicode) + 1; |
|
34016
264e45baacd5
Correct the handling of 0-termination of PyUnicode_AsWideChar()
Marc-André Lemburg <mal@egenix.com>
parents:
33766
diff
changeset
|
1041 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1042 #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
|
1043 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
|
1044 #else |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1045 { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1046 register Py_UNICODE *u; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1047 register Py_ssize_t i; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1048 u = PyUnicode_AS_UNICODE(unicode); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1049 for (i = size; i > 0; i--) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1050 *w++ = *u++; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1051 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1052 #endif |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1053 |
|
34016
264e45baacd5
Correct the handling of 0-termination of PyUnicode_AsWideChar()
Marc-André Lemburg <mal@egenix.com>
parents:
33766
diff
changeset
|
1054 if (size > PyUnicode_GET_SIZE(unicode)) |
|
264e45baacd5
Correct the handling of 0-termination of PyUnicode_AsWideChar()
Marc-André Lemburg <mal@egenix.com>
parents:
33766
diff
changeset
|
1055 return PyUnicode_GET_SIZE(unicode); |
|
264e45baacd5
Correct the handling of 0-termination of PyUnicode_AsWideChar()
Marc-André Lemburg <mal@egenix.com>
parents:
33766
diff
changeset
|
1056 else |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1057 return size; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1058 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1059 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1060 #endif |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1061 |
|
24737
eaa87632b1e8
Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level.
Marc-André Lemburg <mal@egenix.com>
parents:
24736
diff
changeset
|
1062 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
|
1063 { |
|
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
|
1064 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
|
1065 |
|
eaa87632b1e8
Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level.
Marc-André Lemburg <mal@egenix.com>
parents:
24736
diff
changeset
|
1066 #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
|
1067 if (ordinal < 0 || ordinal > 0x10ffff) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1068 PyErr_SetString(PyExc_ValueError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1069 "unichr() arg not in range(0x110000) " |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1070 "(wide Python build)"); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1071 return NULL; |
|
24737
eaa87632b1e8
Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level.
Marc-André Lemburg <mal@egenix.com>
parents:
24736
diff
changeset
|
1072 } |
|
eaa87632b1e8
Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level.
Marc-André Lemburg <mal@egenix.com>
parents:
24736
diff
changeset
|
1073 #else |
|
eaa87632b1e8
Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level.
Marc-André Lemburg <mal@egenix.com>
parents:
24736
diff
changeset
|
1074 if (ordinal < 0 || ordinal > 0xffff) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1075 PyErr_SetString(PyExc_ValueError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1076 "unichr() arg not in range(0x10000) " |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1077 "(narrow Python build)"); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1078 return NULL; |
|
24737
eaa87632b1e8
Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level.
Marc-André Lemburg <mal@egenix.com>
parents:
24736
diff
changeset
|
1079 } |
|
eaa87632b1e8
Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level.
Marc-André Lemburg <mal@egenix.com>
parents:
24736
diff
changeset
|
1080 #endif |
|
eaa87632b1e8
Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level.
Marc-André Lemburg <mal@egenix.com>
parents:
24736
diff
changeset
|
1081 |
|
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
|
1082 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
|
1083 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
|
1084 } |
|
eaa87632b1e8
Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level.
Marc-André Lemburg <mal@egenix.com>
parents:
24736
diff
changeset
|
1085 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1086 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
|
1087 { |
|
20554
0336ee5b46d4
SF patch #470578: Fixes to synchronize unicode() and str()
Guido van Rossum <guido@python.org>
parents:
20277
diff
changeset
|
1088 /* XXX Perhaps we should make this API an alias of |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1089 PyObject_Unicode() instead ?! */ |
|
20554
0336ee5b46d4
SF patch #470578: Fixes to synchronize unicode() and str()
Guido van Rossum <guido@python.org>
parents:
20277
diff
changeset
|
1090 if (PyUnicode_CheckExact(obj)) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1091 Py_INCREF(obj); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1092 return obj; |
|
20554
0336ee5b46d4
SF patch #470578: Fixes to synchronize unicode() and str()
Guido van Rossum <guido@python.org>
parents:
20277
diff
changeset
|
1093 } |
|
0336ee5b46d4
SF patch #470578: Fixes to synchronize unicode() and str()
Guido van Rossum <guido@python.org>
parents:
20277
diff
changeset
|
1094 if (PyUnicode_Check(obj)) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1095 /* For a Unicode subtype that's not a Unicode object, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1096 return a true Unicode object with the same data. */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1097 return PyUnicode_FromUnicode(PyUnicode_AS_UNICODE(obj), |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1098 PyUnicode_GET_SIZE(obj)); |
|
20554
0336ee5b46d4
SF patch #470578: Fixes to synchronize unicode() and str()
Guido van Rossum <guido@python.org>
parents:
20277
diff
changeset
|
1099 } |
|
13401
8f1a2deeb9b0
Added new API PyUnicode_FromEncodedObject() which supports decoding
Marc-André Lemburg <mal@egenix.com>
parents:
13396
diff
changeset
|
1100 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
|
1101 } |
|
8f1a2deeb9b0
Added new API PyUnicode_FromEncodedObject() which supports decoding
Marc-André Lemburg <mal@egenix.com>
parents:
13396
diff
changeset
|
1102 |
|
8f1a2deeb9b0
Added new API PyUnicode_FromEncodedObject() which supports decoding
Marc-André Lemburg <mal@egenix.com>
parents:
13396
diff
changeset
|
1103 PyObject *PyUnicode_FromEncodedObject(register PyObject *obj, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1104 const char *encoding, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1105 const char *errors) |
|
13401
8f1a2deeb9b0
Added new API PyUnicode_FromEncodedObject() which supports decoding
Marc-André Lemburg <mal@egenix.com>
parents:
13396
diff
changeset
|
1106 { |
|
19999
1f4e2627b627
Implement the changes proposed in patch #413333. unicode(obj) now
Marc-André Lemburg <mal@egenix.com>
parents:
19998
diff
changeset
|
1107 const char *s = NULL; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
1108 Py_ssize_t len; |
|
13401
8f1a2deeb9b0
Added new API PyUnicode_FromEncodedObject() which supports decoding
Marc-André Lemburg <mal@egenix.com>
parents:
13396
diff
changeset
|
1109 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
|
1110 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1111 if (obj == NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1112 PyErr_BadInternalCall(); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1113 return NULL; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1114 } |
|
13401
8f1a2deeb9b0
Added new API PyUnicode_FromEncodedObject() which supports decoding
Marc-André Lemburg <mal@egenix.com>
parents:
13396
diff
changeset
|
1115 |
|
20554
0336ee5b46d4
SF patch #470578: Fixes to synchronize unicode() and str()
Guido van Rossum <guido@python.org>
parents:
20277
diff
changeset
|
1116 #if 0 |
|
0336ee5b46d4
SF patch #470578: Fixes to synchronize unicode() and str()
Guido van Rossum <guido@python.org>
parents:
20277
diff
changeset
|
1117 /* 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
|
1118 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
|
1119 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
|
1120 Unicode subclasses. |
|
20554
0336ee5b46d4
SF patch #470578: Fixes to synchronize unicode() and str()
Guido van Rossum <guido@python.org>
parents:
20277
diff
changeset
|
1121 |
|
0336ee5b46d4
SF patch #470578: Fixes to synchronize unicode() and str()
Guido van Rossum <guido@python.org>
parents:
20277
diff
changeset
|
1122 NOTE: This API should really only be used for object which |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1123 represent *encoded* Unicode ! |
|
20554
0336ee5b46d4
SF patch #470578: Fixes to synchronize unicode() and str()
Guido van Rossum <guido@python.org>
parents:
20277
diff
changeset
|
1124 |
|
0336ee5b46d4
SF patch #470578: Fixes to synchronize unicode() and str()
Guido van Rossum <guido@python.org>
parents:
20277
diff
changeset
|
1125 */ |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
1126 if (PyUnicode_Check(obj)) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
1127 if (encoding) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1128 PyErr_SetString(PyExc_TypeError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1129 "decoding Unicode is not supported"); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1130 return NULL; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1131 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1132 return PyObject_Unicode(obj); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1133 } |
|
20554
0336ee5b46d4
SF patch #470578: Fixes to synchronize unicode() and str()
Guido van Rossum <guido@python.org>
parents:
20277
diff
changeset
|
1134 #else |
|
0336ee5b46d4
SF patch #470578: Fixes to synchronize unicode() and str()
Guido van Rossum <guido@python.org>
parents:
20277
diff
changeset
|
1135 if (PyUnicode_Check(obj)) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1136 PyErr_SetString(PyExc_TypeError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1137 "decoding Unicode is not supported"); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1138 return NULL; |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
1139 } |
|
20554
0336ee5b46d4
SF patch #470578: Fixes to synchronize unicode() and str()
Guido van Rossum <guido@python.org>
parents:
20277
diff
changeset
|
1140 #endif |
|
0336ee5b46d4
SF patch #470578: Fixes to synchronize unicode() and str()
Guido van Rossum <guido@python.org>
parents:
20277
diff
changeset
|
1141 |
|
0336ee5b46d4
SF patch #470578: Fixes to synchronize unicode() and str()
Guido van Rossum <guido@python.org>
parents:
20277
diff
changeset
|
1142 /* Coerce object */ |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
1143 if (PyString_Check(obj)) { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
1144 s = PyString_AS_STRING(obj); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
1145 len = PyString_GET_SIZE(obj); |
|
46107
5341b30b1812
Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46062
diff
changeset
|
1146 } |
|
47291
04bd3690fb1f
First step of the C API rename:
Christian Heimes <christian@cheimes.de>
parents:
46908
diff
changeset
|
1147 else if (PyByteArray_Check(obj)) { |
|
46107
5341b30b1812
Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46062
diff
changeset
|
1148 /* Python 2.x specific */ |
|
5341b30b1812
Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46062
diff
changeset
|
1149 PyErr_Format(PyExc_TypeError, |
|
5341b30b1812
Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46062
diff
changeset
|
1150 "decoding bytearray is not supported"); |
|
5341b30b1812
Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46062
diff
changeset
|
1151 return NULL; |
|
5341b30b1812
Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46062
diff
changeset
|
1152 } |
|
20554
0336ee5b46d4
SF patch #470578: Fixes to synchronize unicode() and str()
Guido van Rossum <guido@python.org>
parents:
20277
diff
changeset
|
1153 else if (PyObject_AsCharBuffer(obj, &s, &len)) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1154 /* Overwrite the error message with something more useful in |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1155 case of a TypeError. */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1156 if (PyErr_ExceptionMatches(PyExc_TypeError)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1157 PyErr_Format(PyExc_TypeError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1158 "coercing to Unicode: need string or buffer, " |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1159 "%.80s found", |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1160 Py_TYPE(obj)->tp_name); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1161 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
|
1162 } |
|
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
|
1163 |
|
13401
8f1a2deeb9b0
Added new API PyUnicode_FromEncodedObject() which supports decoding
Marc-André Lemburg <mal@egenix.com>
parents:
13396
diff
changeset
|
1164 /* 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
|
1165 if (len == 0) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1166 Py_INCREF(unicode_empty); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1167 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
|
1168 } |
|
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
|
1169 else |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1170 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
|
1171 |
|
13401
8f1a2deeb9b0
Added new API PyUnicode_FromEncodedObject() which supports decoding
Marc-André Lemburg <mal@egenix.com>
parents:
13396
diff
changeset
|
1172 return v; |
|
8f1a2deeb9b0
Added new API PyUnicode_FromEncodedObject() which supports decoding
Marc-André Lemburg <mal@egenix.com>
parents:
13396
diff
changeset
|
1173 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1174 onError: |
|
13401
8f1a2deeb9b0
Added new API PyUnicode_FromEncodedObject() which supports decoding
Marc-André Lemburg <mal@egenix.com>
parents:
13396
diff
changeset
|
1175 return NULL; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1176 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1177 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1178 PyObject *PyUnicode_Decode(const char *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1179 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1180 const char *encoding, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1181 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
|
1182 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1183 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
|
1184 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1185 if (encoding == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1186 encoding = PyUnicode_GetDefaultEncoding(); |
|
12645
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1187 |
|
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1188 /* Shortcuts for common default encodings */ |
|
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1189 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
|
1190 return PyUnicode_DecodeUTF8(s, size, errors); |
|
12645
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1191 else if (strcmp(encoding, "latin-1") == 0) |
|
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1192 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
|
1193 #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
|
1194 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
|
1195 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
|
1196 #endif |
|
12645
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1197 else if (strcmp(encoding, "ascii") == 0) |
|
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1198 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
|
1199 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1200 /* 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
|
1201 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
|
1202 if (buffer == NULL) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1203 goto onError; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1204 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
|
1205 if (unicode == NULL) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1206 goto onError; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1207 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
|
1208 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
|
1209 "decoder did not return an unicode object (type=%.400s)", |
|
44350
26384b8180c7
#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available.
Christian Heimes <christian@cheimes.de>
parents:
43932
diff
changeset
|
1210 Py_TYPE(unicode)->tp_name); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1211 Py_DECREF(unicode); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1212 goto onError; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1213 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1214 Py_DECREF(buffer); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1215 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
|
1216 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1217 onError: |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1218 Py_XDECREF(buffer); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1219 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1220 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1221 |
|
32551
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1222 PyObject *PyUnicode_AsDecodedObject(PyObject *unicode, |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1223 const char *encoding, |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1224 const char *errors) |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1225 { |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1226 PyObject *v; |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1227 |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1228 if (!PyUnicode_Check(unicode)) { |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1229 PyErr_BadArgument(); |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1230 goto onError; |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1231 } |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1232 |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1233 if (encoding == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1234 encoding = PyUnicode_GetDefaultEncoding(); |
|
32551
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1235 |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1236 /* Decode via the codec registry */ |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1237 v = PyCodec_Decode(unicode, encoding, errors); |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1238 if (v == NULL) |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1239 goto onError; |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1240 return v; |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1241 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1242 onError: |
|
32551
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1243 return NULL; |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1244 } |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1245 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1246 PyObject *PyUnicode_Encode(const Py_UNICODE *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1247 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1248 const char *encoding, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1249 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
|
1250 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1251 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
|
1252 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1253 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
|
1254 if (unicode == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1255 return NULL; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1256 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
|
1257 Py_DECREF(unicode); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1258 return v; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1259 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1260 |
|
32551
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1261 PyObject *PyUnicode_AsEncodedObject(PyObject *unicode, |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1262 const char *encoding, |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1263 const char *errors) |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1264 { |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1265 PyObject *v; |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1266 |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1267 if (!PyUnicode_Check(unicode)) { |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1268 PyErr_BadArgument(); |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1269 goto onError; |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1270 } |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1271 |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1272 if (encoding == NULL) |
| 51212 | 1273 encoding = PyUnicode_GetDefaultEncoding(); |
|
32551
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1274 |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1275 /* Encode via the codec registry */ |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1276 v = PyCodec_Encode(unicode, encoding, errors); |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1277 if (v == NULL) |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1278 goto onError; |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1279 return v; |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1280 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1281 onError: |
|
32551
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1282 return NULL; |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1283 } |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
1284 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1285 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
|
1286 const char *encoding, |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1287 const char *errors) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1288 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1289 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
|
1290 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1291 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
|
1292 PyErr_BadArgument(); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1293 goto onError; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1294 } |
|
12645
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1295 |
|
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
|
1296 if (encoding == NULL) |
| 51212 | 1297 encoding = PyUnicode_GetDefaultEncoding(); |
|
12645
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1298 |
|
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1299 /* Shortcuts for common default encodings */ |
|
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1300 if (errors == NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1301 if (strcmp(encoding, "utf-8") == 0) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1302 return PyUnicode_AsUTF8String(unicode); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1303 else if (strcmp(encoding, "latin-1") == 0) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1304 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
|
1305 #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1306 else if (strcmp(encoding, "mbcs") == 0) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1307 return PyUnicode_AsMBCSString(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
|
1308 #endif |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1309 else if (strcmp(encoding, "ascii") == 0) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1310 return PyUnicode_AsASCIIString(unicode); |
|
12645
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1311 } |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1312 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1313 /* 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
|
1314 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
|
1315 if (v == NULL) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1316 goto onError; |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
1317 if (!PyString_Check(v)) { |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1318 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
|
1319 "encoder did not return a string object (type=%.400s)", |
|
44350
26384b8180c7
#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available.
Christian Heimes <christian@cheimes.de>
parents:
43932
diff
changeset
|
1320 Py_TYPE(v)->tp_name); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1321 Py_DECREF(v); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1322 goto onError; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1323 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1324 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
|
1325 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1326 onError: |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1327 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1328 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1329 |
|
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
|
1330 PyObject *_PyUnicode_AsDefaultEncodedString(PyObject *unicode, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1331 const char *errors) |
|
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
|
1332 { |
|
2badb322355f
This patch finalizes the move from UTF-8 to a default encoding in
Marc-André Lemburg <mal@egenix.com>
parents:
13828
diff
changeset
|
1333 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
|
1334 |
|
2badb322355f
This patch finalizes the move from UTF-8 to a default encoding in
Marc-André Lemburg <mal@egenix.com>
parents:
13828
diff
changeset
|
1335 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
|
1336 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
|
1337 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
|
1338 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
|
1339 ((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
|
1340 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
|
1341 } |
|
2badb322355f
This patch finalizes the move from UTF-8 to a default encoding in
Marc-André Lemburg <mal@egenix.com>
parents:
13828
diff
changeset
|
1342 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1343 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
|
1344 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1345 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
|
1346 PyErr_BadArgument(); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1347 goto onError; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1348 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1349 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
|
1350 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1351 onError: |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1352 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1353 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1354 |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
1355 Py_ssize_t PyUnicode_GetSize(PyObject *unicode) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1356 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1357 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
|
1358 PyErr_BadArgument(); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1359 goto onError; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1360 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1361 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
|
1362 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1363 onError: |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1364 return -1; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1365 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1366 |
|
13660
a1ce07218781
Miscelaneous ANSIfications. I'm assuming here 'main' should take (int,
Thomas Wouters <thomas@python.org>
parents:
13635
diff
changeset
|
1367 const char *PyUnicode_GetDefaultEncoding(void) |
|
12645
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1368 { |
|
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1369 return unicode_default_encoding; |
|
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1370 } |
|
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1371 |
|
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1372 int PyUnicode_SetDefaultEncoding(const char *encoding) |
|
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1373 { |
|
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1374 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
|
1375 |
|
12645
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1376 /* 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
|
1377 loads the encoding into the codec registry cache. */ |
|
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1378 v = _PyCodec_Lookup(encoding); |
|
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1379 if (v == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1380 goto onError; |
|
12645
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1381 Py_DECREF(v); |
|
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1382 strncpy(unicode_default_encoding, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1383 encoding, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1384 sizeof(unicode_default_encoding)); |
|
12645
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1385 return 0; |
|
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1386 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1387 onError: |
|
12645
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1388 return -1; |
|
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1389 } |
|
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
1390 |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1391 /* 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
|
1392 build arguments, call the callback and check the arguments, |
|
35806
44fe157255bc
fix typos, mostly in comments
Fred Drake <fdrake@acm.org>
parents:
35758
diff
changeset
|
1393 if no exception occurred, copy the replacement to the 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
|
1394 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
|
1395 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
|
1396 */ |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1397 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1398 static |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1399 int unicode_decode_call_errorhandler(const char *errors, PyObject **errorHandler, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1400 const char *encoding, const char *reason, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1401 const char *input, Py_ssize_t insize, Py_ssize_t *startinpos, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1402 Py_ssize_t *endinpos, PyObject **exceptionObject, const char **inptr, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1403 PyUnicodeObject **output, Py_ssize_t *outpos, Py_UNICODE **outptr) |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
1404 { |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
1405 static char *argparse = "O!n;decoding error handler must return (unicode, int) tuple"; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1406 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1407 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
|
1408 PyObject *repunicode = NULL; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
1409 Py_ssize_t outsize = PyUnicode_GET_SIZE(*output); |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
1410 Py_ssize_t requiredsize; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
1411 Py_ssize_t newpos; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1412 Py_UNICODE *repptr; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
1413 Py_ssize_t repsize; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1414 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
|
1415 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1416 if (*errorHandler == NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1417 *errorHandler = PyCodec_LookupError(errors); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1418 if (*errorHandler == NULL) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1419 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
|
1420 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1421 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1422 if (*exceptionObject == NULL) { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
1423 *exceptionObject = PyUnicodeDecodeError_Create( |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1424 encoding, input, insize, *startinpos, *endinpos, reason); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1425 if (*exceptionObject == NULL) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1426 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
|
1427 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1428 else { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1429 if (PyUnicodeDecodeError_SetStart(*exceptionObject, *startinpos)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1430 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1431 if (PyUnicodeDecodeError_SetEnd(*exceptionObject, *endinpos)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1432 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1433 if (PyUnicodeDecodeError_SetReason(*exceptionObject, reason)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1434 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
|
1435 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1436 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1437 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
|
1438 if (restuple == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1439 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
|
1440 if (!PyTuple_Check(restuple)) { |
|
51598
512c5a5de00b
Fix warnings GCC emits where the argument of PyErr_Format is a single variable.
Georg Brandl <georg@python.org>
parents:
51218
diff
changeset
|
1441 PyErr_SetString(PyExc_TypeError, &argparse[4]); |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1442 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
|
1443 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1444 if (!PyArg_ParseTuple(restuple, argparse, &PyUnicode_Type, &repunicode, &newpos)) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1445 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
|
1446 if (newpos<0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1447 newpos = insize+newpos; |
|
27555
c267f28724dd
Change the treatment of positions returned by PEP293
Walter Dörwald <walter@livinglogic.de>
parents:
27521
diff
changeset
|
1448 if (newpos<0 || newpos>insize) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1449 PyErr_Format(PyExc_IndexError, "position %zd from error handler out of bounds", newpos); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1450 goto onError; |
|
27555
c267f28724dd
Change the treatment of positions returned by PEP293
Walter Dörwald <walter@livinglogic.de>
parents:
27521
diff
changeset
|
1451 } |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1452 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1453 /* 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
|
1454 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
|
1455 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
|
1456 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
|
1457 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
|
1458 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
|
1459 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
|
1460 if (requiredsize > outsize) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1461 if (requiredsize<2*outsize) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1462 requiredsize = 2*outsize; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1463 if (_PyUnicode_Resize(output, requiredsize) < 0) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1464 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1465 *outptr = PyUnicode_AS_UNICODE(*output) + *outpos; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1466 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1467 *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
|
1468 *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
|
1469 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
|
1470 *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
|
1471 *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
|
1472 /* 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
|
1473 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
|
1474 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1475 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
|
1476 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
|
1477 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
|
1478 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1479 |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1480 /* --- UTF-7 Codec -------------------------------------------------------- */ |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1481 |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1482 /* See RFC2152 for details. We encode conservatively and decode liberally. */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1483 |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1484 /* Three simple macros defining base-64. */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1485 |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1486 /* Is c a base-64 character? */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1487 |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1488 #define IS_BASE64(c) \ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1489 (isalnum(c) || (c) == '+' || (c) == '/') |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1490 |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1491 /* given that c is a base-64 character, what is its base-64 value? */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1492 |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1493 #define FROM_BASE64(c) \ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1494 (((c) >= 'A' && (c) <= 'Z') ? (c) - 'A' : \ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1495 ((c) >= 'a' && (c) <= 'z') ? (c) - 'a' + 26 : \ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1496 ((c) >= '0' && (c) <= '9') ? (c) - '0' + 52 : \ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1497 (c) == '+' ? 62 : 63) |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1498 |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1499 /* What is the base-64 character of the bottom 6 bits of n? */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1500 |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1501 #define TO_BASE64(n) \ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1502 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[(n) & 0x3f]) |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1503 |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1504 /* DECODE_DIRECT: this byte encountered in a UTF-7 string should be |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1505 * decoded as itself. We are permissive on decoding; the only ASCII |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1506 * byte not decoding to itself is the + which begins a base64 |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1507 * string. */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1508 |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1509 #define DECODE_DIRECT(c) \ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1510 ((c) <= 127 && (c) != '+') |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1511 |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1512 /* The UTF-7 encoder treats ASCII characters differently according to |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1513 * whether they are Set D, Set O, Whitespace, or special (i.e. none of |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1514 * the above). See RFC2152. This array identifies these different |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1515 * sets: |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1516 * 0 : "Set D" |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1517 * alphanumeric and '(),-./:? |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1518 * 1 : "Set O" |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1519 * !"#$%&*;<=>@[]^_`{|} |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1520 * 2 : "whitespace" |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1521 * ht nl cr sp |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1522 * 3 : special (must be base64 encoded) |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1523 * everything else (i.e. +\~ and non-printing codes 0-8 11-12 14-31 127) |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1524 */ |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1525 |
|
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
|
1526 static |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1527 char utf7_category[128] = { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1528 /* nul soh stx etx eot enq ack bel bs ht nl vt np cr so si */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1529 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 2, 3, 3, |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1530 /* dle dc1 dc2 dc3 dc4 nak syn etb can em sub esc fs gs rs us */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1531 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1532 /* sp ! " # $ % & ' ( ) * + , - . / */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1533 2, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 3, 0, 0, 0, 0, |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1534 /* 0 1 2 3 4 5 6 7 8 9 : ; < = > ? */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1535 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1536 /* @ A B C D E F G H I J K L M N O */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1537 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1538 /* P Q R S T U V W X Y Z [ \ ] ^ _ */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1539 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 1, 1, 1, |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1540 /* ` a b c d e f g h i j k l m n o */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1541 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1542 /* p q r s t u v w x y z { | } ~ del */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1543 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 3, 3, |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1544 }; |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1545 |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1546 /* ENCODE_DIRECT: this character should be encoded as itself. The |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1547 * answer depends on whether we are encoding set O as itself, and also |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1548 * on whether we are encoding whitespace as itself. RFC2152 makes it |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1549 * clear that the answers to these questions vary between |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1550 * applications, so this code needs to be flexible. */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1551 |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1552 #define ENCODE_DIRECT(c, directO, directWS) \ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1553 ((c) < 128 && (c) > 0 && \ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1554 ((utf7_category[(c)] == 0) || \ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1555 (directWS && (utf7_category[(c)] == 2)) || \ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1556 (directO && (utf7_category[(c)] == 1)))) |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1557 |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1558 PyObject *PyUnicode_DecodeUTF7(const char *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1559 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1560 const char *errors) |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1561 { |
|
43932
e8ac1ae4503c
The incremental decoder for utf-7 must preserve its state between calls.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
43888
diff
changeset
|
1562 return PyUnicode_DecodeUTF7Stateful(s, size, errors, NULL); |
|
e8ac1ae4503c
The incremental decoder for utf-7 must preserve its state between calls.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
43888
diff
changeset
|
1563 } |
|
e8ac1ae4503c
The incremental decoder for utf-7 must preserve its state between calls.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
43888
diff
changeset
|
1564 |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1565 /* The decoder. The only state we preserve is our read position, |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1566 * i.e. how many characters we have consumed. So if we end in the |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1567 * middle of a shift sequence we have to back off the read position |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1568 * and the output to the beginning of the sequence, otherwise we lose |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1569 * all the shift state (seen bits, number of bits seen, high |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1570 * surrogate). */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1571 |
|
43932
e8ac1ae4503c
The incremental decoder for utf-7 must preserve its state between calls.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
43888
diff
changeset
|
1572 PyObject *PyUnicode_DecodeUTF7Stateful(const char *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1573 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1574 const char *errors, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1575 Py_ssize_t *consumed) |
|
43932
e8ac1ae4503c
The incremental decoder for utf-7 must preserve its state between calls.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
43888
diff
changeset
|
1576 { |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1577 const char *starts = s; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
1578 Py_ssize_t startinpos; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
1579 Py_ssize_t endinpos; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
1580 Py_ssize_t outpos; |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1581 const char *e; |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1582 PyUnicodeObject *unicode; |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1583 Py_UNICODE *p; |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1584 const char *errmsg = ""; |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1585 int inShift = 0; |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1586 Py_UNICODE *shiftOutStart; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1587 unsigned int base64bits = 0; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1588 unsigned long base64buffer = 0; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1589 Py_UNICODE surrogate = 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
|
1590 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
|
1591 PyObject *exc = NULL; |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1592 |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1593 unicode = _PyUnicode_New(size); |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1594 if (!unicode) |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1595 return NULL; |
|
43932
e8ac1ae4503c
The incremental decoder for utf-7 must preserve its state between calls.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
43888
diff
changeset
|
1596 if (size == 0) { |
|
e8ac1ae4503c
The incremental decoder for utf-7 must preserve its state between calls.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
43888
diff
changeset
|
1597 if (consumed) |
|
e8ac1ae4503c
The incremental decoder for utf-7 must preserve its state between calls.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
43888
diff
changeset
|
1598 *consumed = 0; |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1599 return (PyObject *)unicode; |
|
43932
e8ac1ae4503c
The incremental decoder for utf-7 must preserve its state between calls.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
43888
diff
changeset
|
1600 } |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1601 |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1602 p = unicode->str; |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1603 shiftOutStart = p; |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1604 e = s + size; |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1605 |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1606 while (s < e) { |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1607 Py_UNICODE ch = (unsigned char) *s; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1608 |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1609 if (inShift) { /* in a base-64 section */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1610 if (IS_BASE64(ch)) { /* consume a base-64 character */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1611 base64buffer = (base64buffer << 6) | FROM_BASE64(ch); |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1612 base64bits += 6; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1613 s++; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1614 if (base64bits >= 16) { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1615 /* we have enough bits for a UTF-16 value */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1616 Py_UNICODE outCh = (Py_UNICODE) |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1617 (base64buffer >> (base64bits-16)); |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1618 base64bits -= 16; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1619 base64buffer &= (1 << base64bits) - 1; /* clear high bits */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1620 if (surrogate) { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1621 /* expecting a second surrogate */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1622 if (outCh >= 0xDC00 && outCh <= 0xDFFF) { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1623 #ifdef Py_UNICODE_WIDE |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1624 *p++ = (((surrogate & 0x3FF)<<10) |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1625 | (outCh & 0x3FF)) + 0x10000; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1626 #else |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1627 *p++ = surrogate; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1628 *p++ = outCh; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1629 #endif |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1630 surrogate = 0; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1631 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1632 else { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1633 surrogate = 0; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1634 errmsg = "second surrogate missing"; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1635 goto utf7Error; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1636 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1637 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1638 else if (outCh >= 0xD800 && outCh <= 0xDBFF) { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1639 /* first surrogate */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1640 surrogate = outCh; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1641 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1642 else if (outCh >= 0xDC00 && outCh <= 0xDFFF) { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1643 errmsg = "unexpected second surrogate"; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1644 goto utf7Error; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1645 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1646 else { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1647 *p++ = outCh; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1648 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1649 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1650 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1651 else { /* now leaving a base-64 section */ |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1652 inShift = 0; |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1653 s++; |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1654 if (surrogate) { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1655 errmsg = "second surrogate missing at end of 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
|
1656 goto utf7Error; |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1657 } |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1658 if (base64bits > 0) { /* left-over bits */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1659 if (base64bits >= 6) { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1660 /* We've seen at least one base-64 character */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1661 errmsg = "partial character in shift sequence"; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1662 goto utf7Error; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1663 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1664 else { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1665 /* Some bits remain; they should be zero */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1666 if (base64buffer != 0) { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1667 errmsg = "non-zero padding bits in shift sequence"; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1668 goto utf7Error; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1669 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1670 } |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1671 } |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1672 if (ch != '-') { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1673 /* '-' is absorbed; other terminating |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1674 characters are preserved */ |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1675 *p++ = ch; |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1676 } |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1677 } |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1678 } |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1679 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
|
1680 startinpos = s-starts; |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1681 s++; /* consume '+' */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1682 if (s < e && *s == '-') { /* '+-' encodes '+' */ |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1683 s++; |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1684 *p++ = '+'; |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1685 } |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1686 else { /* begin base64-encoded section */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1687 inShift = 1; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1688 shiftOutStart = p; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1689 base64bits = 0; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1690 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1691 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1692 else if (DECODE_DIRECT(ch)) { /* character decodes as itself */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1693 *p++ = ch; |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1694 s++; |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1695 } |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1696 else { |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1697 startinpos = s-starts; |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1698 s++; |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1699 errmsg = "unexpected special character"; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1700 goto utf7Error; |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1701 } |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1702 continue; |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1703 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
|
1704 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
|
1705 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
|
1706 if (unicode_decode_call_errorhandler( |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1707 errors, &errorHandler, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1708 "utf7", errmsg, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1709 starts, size, &startinpos, &endinpos, &exc, &s, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1710 &unicode, &outpos, &p)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1711 goto onError; |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1712 } |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1713 |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1714 /* end of string */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1715 |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1716 if (inShift && !consumed) { /* in shift sequence, no more to follow */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1717 /* if we're in an inconsistent state, that's an error */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1718 if (surrogate || |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1719 (base64bits >= 6) || |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1720 (base64bits > 0 && base64buffer != 0)) { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1721 outpos = p-PyUnicode_AS_UNICODE(unicode); |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1722 endinpos = size; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1723 if (unicode_decode_call_errorhandler( |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1724 errors, &errorHandler, |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1725 "utf7", "unterminated shift sequence", |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1726 starts, size, &startinpos, &endinpos, &exc, &s, |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1727 &unicode, &outpos, &p)) |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1728 goto onError; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1729 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1730 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1731 |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1732 /* return state */ |
|
43932
e8ac1ae4503c
The incremental decoder for utf-7 must preserve its state between calls.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
43888
diff
changeset
|
1733 if (consumed) { |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1734 if (inShift) { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1735 p = shiftOutStart; /* back off output */ |
|
43932
e8ac1ae4503c
The incremental decoder for utf-7 must preserve its state between calls.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
43888
diff
changeset
|
1736 *consumed = startinpos; |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1737 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1738 else { |
|
43932
e8ac1ae4503c
The incremental decoder for utf-7 must preserve its state between calls.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
43888
diff
changeset
|
1739 *consumed = s-starts; |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1740 } |
|
43932
e8ac1ae4503c
The incremental decoder for utf-7 must preserve its state between calls.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
43888
diff
changeset
|
1741 } |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1742 |
|
30431
cd0c3f916b34
Change checks of PyUnicode_Resize() return value for clarity.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
30216
diff
changeset
|
1743 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
|
1744 goto onError; |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1745 |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1746 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
|
1747 Py_XDECREF(exc); |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1748 return (PyObject *)unicode; |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1749 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1750 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
|
1751 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
|
1752 Py_XDECREF(exc); |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1753 Py_DECREF(unicode); |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1754 return NULL; |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1755 } |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1756 |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1757 |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1758 PyObject *PyUnicode_EncodeUTF7(const Py_UNICODE *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1759 Py_ssize_t size, |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1760 int base64SetO, |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1761 int base64WhiteSpace, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1762 const char *errors) |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1763 { |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1764 PyObject *v; |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1765 /* It might be possible to tighten this worst case */ |
|
55133
38d6e4e51af0
Grow the allocated buffer in PyUnicode_EncodeUTF7 to avoid buffer overrun.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
54600
diff
changeset
|
1766 Py_ssize_t allocated = 8 * size; |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1767 int inShift = 0; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
1768 Py_ssize_t i = 0; |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1769 unsigned int base64bits = 0; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1770 unsigned long base64buffer = 0; |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1771 char * out; |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1772 char * start; |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1773 |
|
55133
38d6e4e51af0
Grow the allocated buffer in PyUnicode_EncodeUTF7 to avoid buffer overrun.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
54600
diff
changeset
|
1774 if (allocated / 8 != size) |
|
48114
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
1775 return PyErr_NoMemory(); |
|
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
1776 |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1777 if (size == 0) |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
1778 return PyString_FromStringAndSize(NULL, 0); |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
1779 |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1780 v = PyString_FromStringAndSize(NULL, allocated); |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1781 if (v == NULL) |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1782 return NULL; |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1783 |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
1784 start = out = PyString_AS_STRING(v); |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1785 for (;i < size; ++i) { |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1786 Py_UNICODE ch = s[i]; |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1787 |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1788 if (inShift) { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1789 if (ENCODE_DIRECT(ch, !base64SetO, !base64WhiteSpace)) { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1790 /* shifting out */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1791 if (base64bits) { /* output remaining bits */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1792 *out++ = TO_BASE64(base64buffer << (6-base64bits)); |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1793 base64buffer = 0; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1794 base64bits = 0; |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1795 } |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1796 inShift = 0; |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1797 /* Characters not in the BASE64 set implicitly unshift the sequence |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1798 so no '-' is required, except if the character is itself a '-' */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1799 if (IS_BASE64(ch) || ch == '-') { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1800 *out++ = '-'; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1801 } |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1802 *out++ = (char) ch; |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1803 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1804 else { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1805 goto encode_char; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1806 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1807 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1808 else { /* not in a shift sequence */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1809 if (ch == '+') { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1810 *out++ = '+'; |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1811 *out++ = '-'; |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1812 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1813 else if (ENCODE_DIRECT(ch, !base64SetO, !base64WhiteSpace)) { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1814 *out++ = (char) ch; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1815 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1816 else { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1817 *out++ = '+'; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1818 inShift = 1; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1819 goto encode_char; |
|
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
|
1820 } |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1821 } |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1822 continue; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1823 encode_char: |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1824 #ifdef Py_UNICODE_WIDE |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1825 if (ch >= 0x10000) { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1826 /* code first surrogate */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1827 base64bits += 16; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1828 base64buffer = (base64buffer << 16) | 0xd800 | ((ch-0x10000) >> 10); |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1829 while (base64bits >= 6) { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1830 *out++ = TO_BASE64(base64buffer >> (base64bits-6)); |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1831 base64bits -= 6; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1832 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1833 /* prepare second surrogate */ |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1834 ch = 0xDC00 | ((ch-0x10000) & 0x3FF); |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1835 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1836 #endif |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1837 base64bits += 16; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1838 base64buffer = (base64buffer << 16) | ch; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1839 while (base64bits >= 6) { |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1840 *out++ = TO_BASE64(base64buffer >> (base64bits-6)); |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1841 base64bits -= 6; |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1842 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1843 } |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1844 if (base64bits) |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1845 *out++= TO_BASE64(base64buffer << (6-base64bits) ); |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1846 if (inShift) |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1847 *out++ = '-'; |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1848 |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
1849 _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
|
1850 return v; |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1851 } |
|
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1852 |
|
53740
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1853 #undef IS_BASE64 |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1854 #undef FROM_BASE64 |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1855 #undef TO_BASE64 |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1856 #undef DECODE_DIRECT |
|
12d8fd499722
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Antoine Pitrou <solipsis@pitrou.net>
parents:
53722
diff
changeset
|
1857 #undef ENCODE_DIRECT |
|
19998
8a0c97453df4
Patch #435971: UTF-7 codec by Brian Quinlan.
Marc-André Lemburg <mal@egenix.com>
parents:
19886
diff
changeset
|
1858 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1859 /* --- UTF-8 Codec -------------------------------------------------------- */ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1860 |
|
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
|
1861 static |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1862 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
|
1863 /* 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
|
1864 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
|
1865 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
|
1866 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
|
1867 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
|
1868 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
|
1869 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
|
1870 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
|
1871 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
|
1872 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
|
1873 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
|
1874 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
|
1875 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
|
1876 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
|
1877 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
|
1878 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
|
1879 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
|
1880 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
|
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 PyObject *PyUnicode_DecodeUTF8(const char *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1884 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1885 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
|
1886 { |
|
33428
57478a13fbf6
SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support
Walter Dörwald <walter@livinglogic.de>
parents:
33311
diff
changeset
|
1887 return PyUnicode_DecodeUTF8Stateful(s, size, errors, NULL); |
|
57478a13fbf6
SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support
Walter Dörwald <walter@livinglogic.de>
parents:
33311
diff
changeset
|
1888 } |
|
57478a13fbf6
SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support
Walter Dörwald <walter@livinglogic.de>
parents:
33311
diff
changeset
|
1889 |
|
57478a13fbf6
SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support
Walter Dörwald <walter@livinglogic.de>
parents:
33311
diff
changeset
|
1890 PyObject *PyUnicode_DecodeUTF8Stateful(const char *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1891 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1892 const char *errors, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1893 Py_ssize_t *consumed) |
|
33428
57478a13fbf6
SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support
Walter Dörwald <walter@livinglogic.de>
parents:
33311
diff
changeset
|
1894 { |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
1895 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
|
1896 int n; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
1897 Py_ssize_t startinpos; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
1898 Py_ssize_t endinpos; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
1899 Py_ssize_t outpos; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1900 const char *e; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1901 PyUnicodeObject *unicode; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1902 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
|
1903 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
|
1904 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
|
1905 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
|
1906 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1907 /* 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
|
1908 character count */ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1909 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
|
1910 if (!unicode) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1911 return NULL; |
|
33428
57478a13fbf6
SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support
Walter Dörwald <walter@livinglogic.de>
parents:
33311
diff
changeset
|
1912 if (size == 0) { |
|
57478a13fbf6
SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support
Walter Dörwald <walter@livinglogic.de>
parents:
33311
diff
changeset
|
1913 if (consumed) |
|
57478a13fbf6
SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support
Walter Dörwald <walter@livinglogic.de>
parents:
33311
diff
changeset
|
1914 *consumed = 0; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1915 return (PyObject *)unicode; |
|
33428
57478a13fbf6
SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support
Walter Dörwald <walter@livinglogic.de>
parents:
33311
diff
changeset
|
1916 } |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1917 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1918 /* 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
|
1919 p = unicode->str; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1920 e = s + size; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1921 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1922 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
|
1923 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
|
1924 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1925 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
|
1926 *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
|
1927 s++; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1928 continue; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1929 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1930 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1931 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
|
1932 |
|
13635
dfb7ecfffe3d
Fixed problems with UTF error reporting macros and some formatting bugs.
Marc-André Lemburg <mal@egenix.com>
parents:
13633
diff
changeset
|
1933 if (s + n > e) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1934 if (consumed) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1935 break; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1936 else { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1937 errmsg = "unexpected end of data"; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1938 startinpos = s-starts; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1939 endinpos = size; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1940 goto utf8Error; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1941 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1942 } |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1943 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1944 switch (n) { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1945 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1946 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
|
1947 errmsg = "unexpected code byte"; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1948 startinpos = s-starts; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1949 endinpos = startinpos+1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1950 goto utf8Error; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1951 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1952 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
|
1953 errmsg = "internal error"; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1954 startinpos = s-starts; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1955 endinpos = startinpos+1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1956 goto utf8Error; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1957 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1958 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
|
1959 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
|
1960 errmsg = "invalid data"; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1961 startinpos = s-starts; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1962 endinpos = startinpos+2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1963 goto utf8Error; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1964 } |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1965 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
|
1966 if (ch < 0x80) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1967 startinpos = s-starts; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1968 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
|
1969 errmsg = "illegal encoding"; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1970 goto utf8Error; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1971 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1972 else |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1973 *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
|
1974 break; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1975 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1976 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
|
1977 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
|
1978 (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
|
1979 errmsg = "invalid data"; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1980 startinpos = s-starts; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1981 endinpos = startinpos+3; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1982 goto utf8Error; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1983 } |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
1984 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
|
1985 if (ch < 0x0800) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1986 /* Note: UTF-8 encodings of surrogates are considered |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1987 legal UTF-8 sequences; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1988 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1989 XXX For wide builds (UCS-4) we should probably try |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1990 to recombine the surrogates into a single code |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1991 unit. |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1992 */ |
|
13635
dfb7ecfffe3d
Fixed problems with UTF error reporting macros and some formatting bugs.
Marc-André Lemburg <mal@egenix.com>
parents:
13633
diff
changeset
|
1993 errmsg = "illegal encoding"; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1994 startinpos = s-starts; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1995 endinpos = startinpos+3; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1996 goto utf8Error; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1997 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1998 else |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
1999 *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
|
2000 break; |
|
9a8391054840
New surrogate support in the UTF-8 codec. By Bill Tutt.
Marc-André Lemburg <mal@egenix.com>
parents:
13401
diff
changeset
|
2001 |
|
9a8391054840
New surrogate support in the UTF-8 codec. By Bill Tutt.
Marc-André Lemburg <mal@egenix.com>
parents:
13401
diff
changeset
|
2002 case 4: |
|
9a8391054840
New surrogate support in the UTF-8 codec. By Bill Tutt.
Marc-André Lemburg <mal@egenix.com>
parents:
13401
diff
changeset
|
2003 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
|
2004 (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
|
2005 (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
|
2006 errmsg = "invalid data"; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2007 startinpos = s-starts; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2008 endinpos = startinpos+4; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2009 goto utf8Error; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2010 } |
|
13411
9a8391054840
New surrogate support in the UTF-8 codec. By Bill Tutt.
Marc-André Lemburg <mal@egenix.com>
parents:
13401
diff
changeset
|
2011 ch = ((s[0] & 0x7) << 18) + ((s[1] & 0x3f) << 12) + |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2012 ((s[2] & 0x3f) << 6) + (s[3] & 0x3f); |
|
13411
9a8391054840
New surrogate support in the UTF-8 codec. By Bill Tutt.
Marc-André Lemburg <mal@egenix.com>
parents:
13401
diff
changeset
|
2013 /* 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
|
2014 if ((ch < 0x10000) /* minimum value allowed for 4 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2015 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
|
2016 || (ch > 0x10ffff)) /* maximum value allowed for |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2017 UTF-16 */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2018 { |
|
13635
dfb7ecfffe3d
Fixed problems with UTF error reporting macros and some formatting bugs.
Marc-André Lemburg <mal@egenix.com>
parents:
13633
diff
changeset
|
2019 errmsg = "illegal encoding"; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2020 startinpos = s-starts; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2021 endinpos = startinpos+4; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2022 goto utf8Error; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2023 } |
|
18324
3ba7a358ce02
use Py_UNICODE_WIDE instead of USE_UCS4_STORAGE and Py_UNICODE_SIZE
Fredrik Lundh <fredrik@pythonware.com>
parents:
18298
diff
changeset
|
2024 #ifdef Py_UNICODE_WIDE |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2025 *p++ = (Py_UNICODE)ch; |
|
18292
ffbb9c918ac0
Support using UCS-4 as the Py_UNICODE type:
Martin v. Löwis <martin@v.loewis.de>
parents:
18280
diff
changeset
|
2026 #else |
|
13411
9a8391054840
New surrogate support in the UTF-8 codec. By Bill Tutt.
Marc-André Lemburg <mal@egenix.com>
parents:
13401
diff
changeset
|
2027 /* 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
|
2028 |
|
13411
9a8391054840
New surrogate support in the UTF-8 codec. By Bill Tutt.
Marc-André Lemburg <mal@egenix.com>
parents:
13401
diff
changeset
|
2029 /* 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
|
2030 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
|
2031 |
|
13411
9a8391054840
New surrogate support in the UTF-8 codec. By Bill Tutt.
Marc-André Lemburg <mal@egenix.com>
parents:
13401
diff
changeset
|
2032 /* 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
|
2033 *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
|
2034 |
|
13411
9a8391054840
New surrogate support in the UTF-8 codec. By Bill Tutt.
Marc-André Lemburg <mal@egenix.com>
parents:
13401
diff
changeset
|
2035 /* 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
|
2036 *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
|
2037 #endif |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2038 break; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2039 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2040 default: |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2041 /* 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
|
2042 errmsg = "unsupported Unicode code range"; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2043 startinpos = s-starts; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2044 endinpos = startinpos+n; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2045 goto utf8Error; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2046 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2047 s += n; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2048 continue; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2049 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2050 utf8Error: |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2051 outpos = p-PyUnicode_AS_UNICODE(unicode); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2052 if (unicode_decode_call_errorhandler( |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2053 errors, &errorHandler, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2054 "utf8", errmsg, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2055 starts, size, &startinpos, &endinpos, &exc, &s, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2056 &unicode, &outpos, &p)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2057 goto onError; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2058 } |
|
33428
57478a13fbf6
SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support
Walter Dörwald <walter@livinglogic.de>
parents:
33311
diff
changeset
|
2059 if (consumed) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2060 *consumed = s-starts; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2061 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2062 /* Adjust length */ |
|
30431
cd0c3f916b34
Change checks of PyUnicode_Resize() return value for clarity.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
30216
diff
changeset
|
2063 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
|
2064 goto onError; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2065 |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
2066 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
|
2067 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
|
2068 return (PyObject *)unicode; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2069 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2070 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
|
2071 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
|
2072 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
|
2073 Py_DECREF(unicode); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2074 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2075 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2076 |
|
23294
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2077 /* 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
|
2078 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
|
2079 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
|
2080 the excess memory at the end. |
| 23203 | 2081 */ |
|
23198
950a22eb8cc8
PyUnicode_EncodeUTF8: squash compiler wng. The difference of two
Tim Peters <tim.peters@gmail.com>
parents:
23192
diff
changeset
|
2082 PyObject * |
|
950a22eb8cc8
PyUnicode_EncodeUTF8: squash compiler wng. The difference of two
Tim Peters <tim.peters@gmail.com>
parents:
23192
diff
changeset
|
2083 PyUnicode_EncodeUTF8(const Py_UNICODE *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2084 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2085 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
|
2086 { |
|
23294
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2087 #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
|
2088 |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
2089 Py_ssize_t i; /* index into s of next input byte */ |
|
23294
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2090 PyObject *v; /* result string object */ |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2091 char *p; /* next free byte in output buffer */ |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
2092 Py_ssize_t nallocated; /* number of result bytes allocated */ |
|
37662
0678ce9fb6b2
Change more ints to Py_ssize_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
37661
diff
changeset
|
2093 Py_ssize_t nneeded; /* number of result bytes needed */ |
|
23294
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2094 char stackbuf[MAX_SHORT_UNICHARS * 4]; |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2095 |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2096 assert(s != NULL); |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2097 assert(size >= 0); |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2098 |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2099 if (size <= MAX_SHORT_UNICHARS) { |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2100 /* 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
|
2101 * 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
|
2102 * turns out we need. |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2103 */ |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2104 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
|
2105 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
|
2106 p = stackbuf; |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2107 } |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2108 else { |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2109 /* 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
|
2110 nallocated = size * 4; |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2111 if (nallocated / 4 != size) /* overflow! */ |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2112 return PyErr_NoMemory(); |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
2113 v = PyString_FromStringAndSize(NULL, nallocated); |
|
23294
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2114 if (v == NULL) |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2115 return NULL; |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
2116 p = PyString_AS_STRING(v); |
|
23294
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2117 } |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2118 |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2119 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
|
2120 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
|
2121 |
| 23203 | 2122 if (ch < 0x80) |
|
23294
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2123 /* Encode ASCII */ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2124 *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
|
2125 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2126 else if (ch < 0x0800) { |
|
23294
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2127 /* Encode Latin-1 */ |
| 21884 | 2128 *p++ = (char)(0xc0 | (ch >> 6)); |
| 2129 *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
|
2130 } |
|
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
|
2131 else { |
|
23294
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2132 /* Encode UCS2 Unicode ordinals */ |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2133 if (ch < 0x10000) { |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2134 /* Special case: check for high surrogate */ |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2135 if (0xD800 <= ch && ch <= 0xDBFF && i != size) { |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2136 Py_UCS4 ch2 = s[i]; |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2137 /* 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
|
2138 form a UCS4 value */ |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2139 if (0xDC00 <= ch2 && ch2 <= 0xDFFF) { |
| 23203 | 2140 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
|
2141 i++; |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2142 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
|
2143 } |
|
23294
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2144 /* 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
|
2145 } |
|
9a8391054840
New surrogate support in the UTF-8 codec. By Bill Tutt.
Marc-André Lemburg <mal@egenix.com>
parents:
13401
diff
changeset
|
2146 *p++ = (char)(0xe0 | (ch >> 12)); |
|
23294
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2147 *p++ = (char)(0x80 | ((ch >> 6) & 0x3f)); |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2148 *p++ = (char)(0x80 | (ch & 0x3f)); |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2149 continue; |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
2150 } |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2151 encodeUCS4: |
|
23294
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2152 /* Encode UCS4 Unicode ordinals */ |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2153 *p++ = (char)(0xf0 | (ch >> 18)); |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2154 *p++ = (char)(0x80 | ((ch >> 12) & 0x3f)); |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2155 *p++ = (char)(0x80 | ((ch >> 6) & 0x3f)); |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2156 *p++ = (char)(0x80 | (ch & 0x3f)); |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2157 } |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2158 } |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2159 |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2160 if (v == NULL) { |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2161 /* This was stack allocated. */ |
|
37662
0678ce9fb6b2
Change more ints to Py_ssize_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
37661
diff
changeset
|
2162 nneeded = p - stackbuf; |
|
23294
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2163 assert(nneeded <= nallocated); |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
2164 v = PyString_FromStringAndSize(stackbuf, nneeded); |
|
23294
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2165 } |
|
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2166 else { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
2167 /* Cut back to size actually needed. */ |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
2168 nneeded = p - PyString_AS_STRING(v); |
|
23294
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2169 assert(nneeded <= nallocated); |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
2170 _PyString_Resize(&v, nneeded); |
|
23294
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2171 } |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2172 return v; |
| 23203 | 2173 |
|
23294
b735e89ccda7
SF patch 549375: Compromise PyUnicode_EncodeUTF8
Tim Peters <tim.peters@gmail.com>
parents:
23228
diff
changeset
|
2174 #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
|
2175 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2176 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2177 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
|
2178 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2179 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
|
2180 PyErr_BadArgument(); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2181 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2182 } |
|
14059
d0348a26b093
PyUnicode_AsUTF8String(): Don't need to explicitly incref str since
Barry Warsaw <barry@python.org>
parents:
13966
diff
changeset
|
2183 return PyUnicode_EncodeUTF8(PyUnicode_AS_UNICODE(unicode), |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2184 PyUnicode_GET_SIZE(unicode), |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2185 NULL); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2186 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2187 |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2188 /* --- UTF-32 Codec ------------------------------------------------------- */ |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2189 |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2190 PyObject * |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2191 PyUnicode_DecodeUTF32(const char *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2192 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2193 const char *errors, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2194 int *byteorder) |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2195 { |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2196 return PyUnicode_DecodeUTF32Stateful(s, size, errors, byteorder, NULL); |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2197 } |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2198 |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2199 PyObject * |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2200 PyUnicode_DecodeUTF32Stateful(const char *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2201 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2202 const char *errors, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2203 int *byteorder, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2204 Py_ssize_t *consumed) |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2205 { |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2206 const char *starts = s; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2207 Py_ssize_t startinpos; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2208 Py_ssize_t endinpos; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2209 Py_ssize_t outpos; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2210 PyUnicodeObject *unicode; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2211 Py_UNICODE *p; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2212 #ifndef Py_UNICODE_WIDE |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2213 int i, pairs; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2214 #else |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2215 const int pairs = 0; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2216 #endif |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2217 const unsigned char *q, *e; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2218 int bo = 0; /* assume native ordering by default */ |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2219 const char *errmsg = ""; |
|
42650
f2f0e95a797b
Move variable declaration up.
Walter Dörwald <walter@livinglogic.de>
parents:
42649
diff
changeset
|
2220 /* Offsets from q for retrieving bytes in the right order. */ |
|
f2f0e95a797b
Move variable declaration up.
Walter Dörwald <walter@livinglogic.de>
parents:
42649
diff
changeset
|
2221 #ifdef BYTEORDER_IS_LITTLE_ENDIAN |
|
f2f0e95a797b
Move variable declaration up.
Walter Dörwald <walter@livinglogic.de>
parents:
42649
diff
changeset
|
2222 int iorder[] = {0, 1, 2, 3}; |
|
f2f0e95a797b
Move variable declaration up.
Walter Dörwald <walter@livinglogic.de>
parents:
42649
diff
changeset
|
2223 #else |
|
f2f0e95a797b
Move variable declaration up.
Walter Dörwald <walter@livinglogic.de>
parents:
42649
diff
changeset
|
2224 int iorder[] = {3, 2, 1, 0}; |
|
f2f0e95a797b
Move variable declaration up.
Walter Dörwald <walter@livinglogic.de>
parents:
42649
diff
changeset
|
2225 #endif |
|
42652
9c4f5b1d6b9d
Move another variable declaration up.
Walter Dörwald <walter@livinglogic.de>
parents:
42650
diff
changeset
|
2226 PyObject *errorHandler = NULL; |
|
9c4f5b1d6b9d
Move another variable declaration up.
Walter Dörwald <walter@livinglogic.de>
parents:
42650
diff
changeset
|
2227 PyObject *exc = NULL; |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2228 /* On narrow builds we split characters outside the BMP into two |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2229 codepoints => count how much extra space we need. */ |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2230 #ifndef Py_UNICODE_WIDE |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2231 for (i = pairs = 0; i < size/4; i++) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2232 if (((Py_UCS4 *)s)[i] >= 0x10000) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2233 pairs++; |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2234 #endif |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2235 |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2236 /* This might be one to much, because of a BOM */ |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2237 unicode = _PyUnicode_New((size+3)/4+pairs); |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2238 if (!unicode) |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2239 return NULL; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2240 if (size == 0) |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2241 return (PyObject *)unicode; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2242 |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2243 /* Unpack UTF-32 encoded data */ |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2244 p = unicode->str; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2245 q = (unsigned char *)s; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2246 e = q + size; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2247 |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2248 if (byteorder) |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2249 bo = *byteorder; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2250 |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2251 /* Check for BOM marks (U+FEFF) in the input and adjust current |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2252 byte order setting accordingly. In native mode, the leading BOM |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2253 mark is skipped, in all other modes, it is copied to the output |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2254 stream as-is (giving a ZWNBSP character). */ |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2255 if (bo == 0) { |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2256 if (size >= 4) { |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2257 const Py_UCS4 bom = (q[iorder[3]] << 24) | (q[iorder[2]] << 16) | |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2258 (q[iorder[1]] << 8) | q[iorder[0]]; |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2259 #ifdef BYTEORDER_IS_LITTLE_ENDIAN |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2260 if (bom == 0x0000FEFF) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2261 q += 4; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2262 bo = -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2263 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2264 else if (bom == 0xFFFE0000) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2265 q += 4; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2266 bo = 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2267 } |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2268 #else |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2269 if (bom == 0x0000FEFF) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2270 q += 4; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2271 bo = 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2272 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2273 else if (bom == 0xFFFE0000) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2274 q += 4; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2275 bo = -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2276 } |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2277 #endif |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2278 } |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2279 } |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2280 |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2281 if (bo == -1) { |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2282 /* force LE */ |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2283 iorder[0] = 0; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2284 iorder[1] = 1; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2285 iorder[2] = 2; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2286 iorder[3] = 3; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2287 } |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2288 else if (bo == 1) { |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2289 /* force BE */ |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2290 iorder[0] = 3; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2291 iorder[1] = 2; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2292 iorder[2] = 1; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2293 iorder[3] = 0; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2294 } |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2295 |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2296 while (q < e) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2297 Py_UCS4 ch; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2298 /* remaining bytes at the end? (size should be divisible by 4) */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2299 if (e-q<4) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2300 if (consumed) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2301 break; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2302 errmsg = "truncated data"; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2303 startinpos = ((const char *)q)-starts; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2304 endinpos = ((const char *)e)-starts; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2305 goto utf32Error; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2306 /* The remaining input chars are ignored if the callback |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2307 chooses to skip the input */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2308 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2309 ch = (q[iorder[3]] << 24) | (q[iorder[2]] << 16) | |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2310 (q[iorder[1]] << 8) | q[iorder[0]]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2311 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2312 if (ch >= 0x110000) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2313 { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2314 errmsg = "codepoint not in range(0x110000)"; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2315 startinpos = ((const char *)q)-starts; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2316 endinpos = startinpos+4; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2317 goto utf32Error; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2318 } |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2319 #ifndef Py_UNICODE_WIDE |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2320 if (ch >= 0x10000) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2321 { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2322 *p++ = 0xD800 | ((ch-0x10000) >> 10); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2323 *p++ = 0xDC00 | ((ch-0x10000) & 0x3FF); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2324 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2325 else |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2326 #endif |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2327 *p++ = ch; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2328 q += 4; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2329 continue; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2330 utf32Error: |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2331 outpos = p-PyUnicode_AS_UNICODE(unicode); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2332 if (unicode_decode_call_errorhandler( |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2333 errors, &errorHandler, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2334 "utf32", errmsg, |
|
56033
38a52b672429
Issue #6922: Fix an infinite loop when trying to decode an invalid
Georg Brandl <georg@python.org>
parents:
55750
diff
changeset
|
2335 starts, size, &startinpos, &endinpos, &exc, (const char **)&q, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2336 &unicode, &outpos, &p)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2337 goto onError; |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2338 } |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2339 |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2340 if (byteorder) |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2341 *byteorder = bo; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2342 |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2343 if (consumed) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2344 *consumed = (const char *)q-starts; |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2345 |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2346 /* Adjust length */ |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2347 if (_PyUnicode_Resize(&unicode, p - unicode->str) < 0) |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2348 goto onError; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2349 |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2350 Py_XDECREF(errorHandler); |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2351 Py_XDECREF(exc); |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2352 return (PyObject *)unicode; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2353 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2354 onError: |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2355 Py_DECREF(unicode); |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2356 Py_XDECREF(errorHandler); |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2357 Py_XDECREF(exc); |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2358 return NULL; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2359 } |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2360 |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2361 PyObject * |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2362 PyUnicode_EncodeUTF32(const Py_UNICODE *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2363 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2364 const char *errors, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2365 int byteorder) |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2366 { |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2367 PyObject *v; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2368 unsigned char *p; |
|
48114
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
2369 Py_ssize_t nsize, bytesize; |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2370 #ifndef Py_UNICODE_WIDE |
|
48114
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
2371 Py_ssize_t i, pairs; |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2372 #else |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2373 const int pairs = 0; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2374 #endif |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2375 /* Offsets from p for storing byte pairs in the right order. */ |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2376 #ifdef BYTEORDER_IS_LITTLE_ENDIAN |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2377 int iorder[] = {0, 1, 2, 3}; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2378 #else |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2379 int iorder[] = {3, 2, 1, 0}; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2380 #endif |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2381 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2382 #define STORECHAR(CH) \ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2383 do { \ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2384 p[iorder[3]] = ((CH) >> 24) & 0xff; \ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2385 p[iorder[2]] = ((CH) >> 16) & 0xff; \ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2386 p[iorder[1]] = ((CH) >> 8) & 0xff; \ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2387 p[iorder[0]] = (CH) & 0xff; \ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2388 p += 4; \ |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2389 } while(0) |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2390 |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2391 /* In narrow builds we can output surrogate pairs as one codepoint, |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2392 so we need less space. */ |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2393 #ifndef Py_UNICODE_WIDE |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2394 for (i = pairs = 0; i < size-1; i++) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2395 if (0xD800 <= s[i] && s[i] <= 0xDBFF && |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2396 0xDC00 <= s[i+1] && s[i+1] <= 0xDFFF) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2397 pairs++; |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2398 #endif |
|
48114
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
2399 nsize = (size - pairs + (byteorder == 0)); |
|
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
2400 bytesize = nsize * 4; |
|
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
2401 if (bytesize / 4 != nsize) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2402 return PyErr_NoMemory(); |
|
48114
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
2403 v = PyString_FromStringAndSize(NULL, bytesize); |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2404 if (v == NULL) |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2405 return NULL; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2406 |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
2407 p = (unsigned char *)PyString_AS_STRING(v); |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2408 if (byteorder == 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2409 STORECHAR(0xFEFF); |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2410 if (size == 0) |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2411 return v; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2412 |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2413 if (byteorder == -1) { |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2414 /* force LE */ |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2415 iorder[0] = 0; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2416 iorder[1] = 1; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2417 iorder[2] = 2; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2418 iorder[3] = 3; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2419 } |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2420 else if (byteorder == 1) { |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2421 /* force BE */ |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2422 iorder[0] = 3; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2423 iorder[1] = 2; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2424 iorder[2] = 1; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2425 iorder[3] = 0; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2426 } |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2427 |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2428 while (size-- > 0) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2429 Py_UCS4 ch = *s++; |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2430 #ifndef Py_UNICODE_WIDE |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2431 if (0xD800 <= ch && ch <= 0xDBFF && size > 0) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2432 Py_UCS4 ch2 = *s; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2433 if (0xDC00 <= ch2 && ch2 <= 0xDFFF) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2434 ch = (((ch & 0x3FF)<<10) | (ch2 & 0x3FF)) + 0x10000; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2435 s++; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2436 size--; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2437 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2438 } |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2439 #endif |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2440 STORECHAR(ch); |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2441 } |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2442 return v; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2443 #undef STORECHAR |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2444 } |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2445 |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2446 PyObject *PyUnicode_AsUTF32String(PyObject *unicode) |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2447 { |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2448 if (!PyUnicode_Check(unicode)) { |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2449 PyErr_BadArgument(); |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2450 return NULL; |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2451 } |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2452 return PyUnicode_EncodeUTF32(PyUnicode_AS_UNICODE(unicode), |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2453 PyUnicode_GET_SIZE(unicode), |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2454 NULL, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2455 0); |
|
42649
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2456 } |
|
c916731321c0
Backport r57105 and r57145 from the py3k branch: UTF-32 codecs.
Walter Dörwald <walter@livinglogic.de>
parents:
42402
diff
changeset
|
2457 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2458 /* --- UTF-16 Codec ------------------------------------------------------- */ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2459 |
|
19121
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2460 PyObject * |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2461 PyUnicode_DecodeUTF16(const char *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2462 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2463 const char *errors, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2464 int *byteorder) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2465 { |
|
33428
57478a13fbf6
SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support
Walter Dörwald <walter@livinglogic.de>
parents:
33311
diff
changeset
|
2466 return PyUnicode_DecodeUTF16Stateful(s, size, errors, byteorder, NULL); |
|
57478a13fbf6
SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support
Walter Dörwald <walter@livinglogic.de>
parents:
33311
diff
changeset
|
2467 } |
|
57478a13fbf6
SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support
Walter Dörwald <walter@livinglogic.de>
parents:
33311
diff
changeset
|
2468 |
|
57478a13fbf6
SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support
Walter Dörwald <walter@livinglogic.de>
parents:
33311
diff
changeset
|
2469 PyObject * |
|
57478a13fbf6
SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support
Walter Dörwald <walter@livinglogic.de>
parents:
33311
diff
changeset
|
2470 PyUnicode_DecodeUTF16Stateful(const char *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2471 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2472 const char *errors, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2473 int *byteorder, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2474 Py_ssize_t *consumed) |
|
33428
57478a13fbf6
SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support
Walter Dörwald <walter@livinglogic.de>
parents:
33311
diff
changeset
|
2475 { |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
2476 const char *starts = s; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
2477 Py_ssize_t startinpos; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
2478 Py_ssize_t endinpos; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
2479 Py_ssize_t outpos; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2480 PyUnicodeObject *unicode; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2481 Py_UNICODE *p; |
|
19121
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2482 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
|
2483 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
|
2484 const char *errmsg = ""; |
|
19121
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2485 /* 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
|
2486 #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
|
2487 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
|
2488 #else |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2489 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
|
2490 #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
|
2491 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
|
2492 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
|
2493 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2494 /* 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
|
2495 character count */ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2496 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
|
2497 if (!unicode) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2498 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2499 if (size == 0) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2500 return (PyObject *)unicode; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2501 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2502 /* 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
|
2503 p = unicode->str; |
|
19121
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2504 q = (unsigned char *)s; |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2505 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
|
2506 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2507 if (byteorder) |
|
19121
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2508 bo = *byteorder; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2509 |
|
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
|
2510 /* 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
|
2511 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
|
2512 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
|
2513 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
|
2514 if (bo == 0) { |
|
33428
57478a13fbf6
SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support
Walter Dörwald <walter@livinglogic.de>
parents:
33311
diff
changeset
|
2515 if (size >= 2) { |
|
57478a13fbf6
SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support
Walter Dörwald <walter@livinglogic.de>
parents:
33311
diff
changeset
|
2516 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
|
2517 #ifdef BYTEORDER_IS_LITTLE_ENDIAN |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2518 if (bom == 0xFEFF) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2519 q += 2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2520 bo = -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2521 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2522 else if (bom == 0xFFFE) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2523 q += 2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2524 bo = 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2525 } |
|
33428
57478a13fbf6
SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support
Walter Dörwald <walter@livinglogic.de>
parents:
33311
diff
changeset
|
2526 #else |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2527 if (bom == 0xFEFF) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2528 q += 2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2529 bo = 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2530 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2531 else if (bom == 0xFFFE) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2532 q += 2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2533 bo = -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2534 } |
|
33428
57478a13fbf6
SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support
Walter Dörwald <walter@livinglogic.de>
parents:
33311
diff
changeset
|
2535 #endif |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2536 } |
|
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
|
2537 } |
|
19121
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2538 |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2539 if (bo == -1) { |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2540 /* force LE */ |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2541 ihi = 1; |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2542 ilo = 0; |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2543 } |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2544 else if (bo == 1) { |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2545 /* force BE */ |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2546 ihi = 0; |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2547 ilo = 1; |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2548 } |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2549 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2550 while (q < e) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2551 Py_UNICODE ch; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2552 /* remaining bytes at the end? (size should be even) */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2553 if (e-q<2) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2554 if (consumed) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2555 break; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2556 errmsg = "truncated data"; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2557 startinpos = ((const char *)q)-starts; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2558 endinpos = ((const char *)e)-starts; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2559 goto utf16Error; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2560 /* The remaining input chars are ignored if the callback |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2561 chooses to skip the input */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2562 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2563 ch = (q[ihi] << 8) | q[ilo]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2564 |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
2565 q += 2; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2566 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2567 if (ch < 0xD800 || ch > 0xDFFF) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2568 *p++ = ch; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2569 continue; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2570 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2571 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2572 /* UTF-16 code pair: */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2573 if (q >= e) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2574 errmsg = "unexpected end of data"; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2575 startinpos = (((const char *)q)-2)-starts; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2576 endinpos = ((const char *)e)-starts; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2577 goto utf16Error; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2578 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2579 if (0xD800 <= ch && ch <= 0xDBFF) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2580 Py_UNICODE ch2 = (q[ihi] << 8) | q[ilo]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2581 q += 2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2582 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
|
2583 #ifndef Py_UNICODE_WIDE |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2584 *p++ = ch; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2585 *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
|
2586 #else |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2587 *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
|
2588 #endif |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2589 continue; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2590 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2591 else { |
|
18292
ffbb9c918ac0
Support using UCS-4 as the Py_UNICODE type:
Martin v. Löwis <martin@v.loewis.de>
parents:
18280
diff
changeset
|
2592 errmsg = "illegal UTF-16 surrogate"; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2593 startinpos = (((const char *)q)-4)-starts; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2594 endinpos = startinpos+2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2595 goto utf16Error; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2596 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2597 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2598 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2599 errmsg = "illegal encoding"; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2600 startinpos = (((const char *)q)-2)-starts; |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
2601 endinpos = startinpos+2; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2602 /* Fall through to report the error */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2603 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2604 utf16Error: |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2605 outpos = p-PyUnicode_AS_UNICODE(unicode); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2606 if (unicode_decode_call_errorhandler( |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2607 errors, &errorHandler, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2608 "utf16", errmsg, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2609 starts, size, &startinpos, &endinpos, &exc, (const char **)&q, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2610 &unicode, &outpos, &p)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2611 goto onError; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2612 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2613 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2614 if (byteorder) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2615 *byteorder = bo; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2616 |
|
33428
57478a13fbf6
SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support
Walter Dörwald <walter@livinglogic.de>
parents:
33311
diff
changeset
|
2617 if (consumed) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2618 *consumed = (const char *)q-starts; |
|
33428
57478a13fbf6
SF patch #998993: The UTF-8 and the UTF-16 stateful decoders now support
Walter Dörwald <walter@livinglogic.de>
parents:
33311
diff
changeset
|
2619 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2620 /* Adjust length */ |
|
30431
cd0c3f916b34
Change checks of PyUnicode_Resize() return value for clarity.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
30216
diff
changeset
|
2621 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
|
2622 goto onError; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2623 |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
2624 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
|
2625 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
|
2626 return (PyObject *)unicode; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2627 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2628 onError: |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2629 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
|
2630 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
|
2631 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
|
2632 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2633 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2634 |
|
19121
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2635 PyObject * |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2636 PyUnicode_EncodeUTF16(const Py_UNICODE *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2637 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2638 const char *errors, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2639 int byteorder) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2640 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2641 PyObject *v; |
|
19121
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2642 unsigned char *p; |
|
48114
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
2643 Py_ssize_t nsize, bytesize; |
|
31238
4edf200a8118
SF #859573: Reduce compiler warnings on gcc 3.2 and above.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31199
diff
changeset
|
2644 #ifdef Py_UNICODE_WIDE |
|
48114
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
2645 Py_ssize_t 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
|
2646 #else |
|
4edf200a8118
SF #859573: Reduce compiler warnings on gcc 3.2 and above.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31199
diff
changeset
|
2647 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
|
2648 #endif |
|
19121
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2649 /* 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
|
2650 #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
|
2651 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
|
2652 #else |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2653 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
|
2654 #endif |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2655 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2656 #define STORECHAR(CH) \ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2657 do { \ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2658 p[ihi] = ((CH) >> 8) & 0xff; \ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2659 p[ilo] = (CH) & 0xff; \ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2660 p += 2; \ |
|
19121
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2661 } 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
|
2662 |
|
31238
4edf200a8118
SF #859573: Reduce compiler warnings on gcc 3.2 and above.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31199
diff
changeset
|
2663 #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
|
2664 for (i = pairs = 0; i < size; i++) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2665 if (s[i] >= 0x10000) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2666 pairs++; |
|
31238
4edf200a8118
SF #859573: Reduce compiler warnings on gcc 3.2 and above.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31199
diff
changeset
|
2667 #endif |
|
48114
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
2668 /* 2 * (size + pairs + (byteorder == 0)) */ |
|
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
2669 if (size > PY_SSIZE_T_MAX || |
|
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
2670 size > PY_SSIZE_T_MAX - pairs - (byteorder == 0)) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2671 return PyErr_NoMemory(); |
|
48114
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
2672 nsize = size + pairs + (byteorder == 0); |
|
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
2673 bytesize = nsize * 2; |
|
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
2674 if (bytesize / 2 != nsize) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2675 return PyErr_NoMemory(); |
|
48114
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
2676 v = PyString_FromStringAndSize(NULL, bytesize); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2677 if (v == NULL) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2678 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2679 |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
2680 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
|
2681 if (byteorder == 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2682 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
|
2683 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
|
2684 return v; |
|
19121
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2685 |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2686 if (byteorder == -1) { |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2687 /* force LE */ |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2688 ihi = 1; |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2689 ilo = 0; |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2690 } |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2691 else if (byteorder == 1) { |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2692 /* force BE */ |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2693 ihi = 0; |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2694 ilo = 1; |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2695 } |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2696 |
|
18292
ffbb9c918ac0
Support using UCS-4 as the Py_UNICODE type:
Martin v. Löwis <martin@v.loewis.de>
parents:
18280
diff
changeset
|
2697 while (size-- > 0) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2698 Py_UNICODE ch = *s++; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2699 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
|
2700 #ifdef Py_UNICODE_WIDE |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2701 if (ch >= 0x10000) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2702 ch2 = 0xDC00 | ((ch-0x10000) & 0x3FF); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2703 ch = 0xD800 | ((ch-0x10000) >> 10); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2704 } |
|
31238
4edf200a8118
SF #859573: Reduce compiler warnings on gcc 3.2 and above.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31199
diff
changeset
|
2705 #endif |
|
19121
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2706 STORECHAR(ch); |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2707 if (ch2) |
|
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2708 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
|
2709 } |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2710 return v; |
|
19121
77e405f3a942
SF patch #438013 Remove 2-byte Py_UCS2 assumptions
Tim Peters <tim.peters@gmail.com>
parents:
18933
diff
changeset
|
2711 #undef STORECHAR |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2712 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2713 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2714 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
|
2715 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2716 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
|
2717 PyErr_BadArgument(); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2718 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2719 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2720 return PyUnicode_EncodeUTF16(PyUnicode_AS_UNICODE(unicode), |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2721 PyUnicode_GET_SIZE(unicode), |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2722 NULL, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2723 0); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2724 } |
|
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 /* --- Unicode Escape Codec ----------------------------------------------- */ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2727 |
|
16200
3484670c37f2
Move uchhash functionality into unicodedata (after the recent
Fredrik Lundh <fredrik@pythonware.com>
parents:
16064
diff
changeset
|
2728 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
|
2729 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2730 PyObject *PyUnicode_DecodeUnicodeEscape(const char *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2731 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2732 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
|
2733 { |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
2734 const char *starts = s; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
2735 Py_ssize_t startinpos; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
2736 Py_ssize_t endinpos; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
2737 Py_ssize_t outpos; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
2738 int i; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2739 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
|
2740 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
|
2741 const char *end; |
|
16667
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2742 char* message; |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2743 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
|
2744 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
|
2745 PyObject *exc = NULL; |
|
16667
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2746 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2747 /* 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
|
2748 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
|
2749 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
|
2750 (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
|
2751 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
|
2752 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
|
2753 if (v == NULL) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2754 goto onError; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2755 if (size == 0) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2756 return (PyObject *)v; |
|
16667
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2757 |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
2758 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
|
2759 end = s + size; |
|
16667
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2760 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2761 while (s < end) { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2762 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
|
2763 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
|
2764 int digits; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2765 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2766 /* 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
|
2767 if (*s != '\\') { |
|
16667
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2768 *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
|
2769 continue; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2770 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2771 |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
2772 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
|
2773 /* \ - Escapes */ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2774 s++; |
|
43710
124cbf1a0e3e
Backport fixes for the code that decodes octal escapes (and for PyString
Guido van Rossum <guido@python.org>
parents:
43053
diff
changeset
|
2775 c = *s++; |
|
124cbf1a0e3e
Backport fixes for the code that decodes octal escapes (and for PyString
Guido van Rossum <guido@python.org>
parents:
43053
diff
changeset
|
2776 if (s > end) |
|
124cbf1a0e3e
Backport fixes for the code that decodes octal escapes (and for PyString
Guido van Rossum <guido@python.org>
parents:
43053
diff
changeset
|
2777 c = '\0'; /* Invalid after \ */ |
|
124cbf1a0e3e
Backport fixes for the code that decodes octal escapes (and for PyString
Guido van Rossum <guido@python.org>
parents:
43053
diff
changeset
|
2778 switch (c) { |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2779 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2780 /* \x escapes */ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2781 case '\n': break; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2782 case '\\': *p++ = '\\'; break; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2783 case '\'': *p++ = '\''; break; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2784 case '\"': *p++ = '\"'; break; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2785 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
|
2786 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
|
2787 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
|
2788 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
|
2789 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
|
2790 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
|
2791 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
|
2792 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2793 /* \OOO (octal) escapes */ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2794 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
|
2795 case '4': case '5': case '6': case '7': |
| 12544 | 2796 x = s[-1] - '0'; |
|
43710
124cbf1a0e3e
Backport fixes for the code that decodes octal escapes (and for PyString
Guido van Rossum <guido@python.org>
parents:
43053
diff
changeset
|
2797 if (s < end && '0' <= *s && *s <= '7') { |
| 12544 | 2798 x = (x<<3) + *s++ - '0'; |
|
43710
124cbf1a0e3e
Backport fixes for the code that decodes octal escapes (and for PyString
Guido van Rossum <guido@python.org>
parents:
43053
diff
changeset
|
2799 if (s < end && '0' <= *s && *s <= '7') |
| 12544 | 2800 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
|
2801 } |
| 12544 | 2802 *p++ = x; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2803 break; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2804 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2805 /* hex escapes */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2806 /* \xXX */ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2807 case 'x': |
|
16667
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2808 digits = 2; |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2809 message = "truncated \\xXX escape"; |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2810 goto hexescape; |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2811 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2812 /* \uXXXX */ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2813 case 'u': |
|
16667
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2814 digits = 4; |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2815 message = "truncated \\uXXXX escape"; |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2816 goto hexescape; |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2817 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2818 /* \UXXXXXXXX */ |
|
16667
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2819 case 'U': |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2820 digits = 8; |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2821 message = "truncated \\UXXXXXXXX escape"; |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2822 hexescape: |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2823 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
|
2824 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
|
2825 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
|
2826 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
|
2827 if (unicode_decode_call_errorhandler( |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2828 errors, &errorHandler, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2829 "unicodeescape", "end of string in escape sequence", |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2830 starts, size, &startinpos, &endinpos, &exc, &s, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2831 &v, &outpos, &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
|
2832 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
|
2833 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
|
2834 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
2835 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
|
2836 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
|
2837 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
|
2838 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
|
2839 if (unicode_decode_call_errorhandler( |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2840 errors, &errorHandler, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2841 "unicodeescape", message, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2842 starts, size, &startinpos, &endinpos, &exc, &s, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2843 &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
|
2844 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
|
2845 goto nextByte; |
|
14388
ef2714bb0730
changed \x to consume exactly two hex digits, also for unicode
Fredrik Lundh <fredrik@pythonware.com>
parents:
14067
diff
changeset
|
2846 } |
|
ef2714bb0730
changed \x to consume exactly two hex digits, also for unicode
Fredrik Lundh <fredrik@pythonware.com>
parents:
14067
diff
changeset
|
2847 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
|
2848 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
|
2849 chr += c - '0'; |
|
ef2714bb0730
changed \x to consume exactly two hex digits, also for unicode
Fredrik Lundh <fredrik@pythonware.com>
parents:
14067
diff
changeset
|
2850 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
|
2851 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
|
2852 else |
|
ef2714bb0730
changed \x to consume exactly two hex digits, also for unicode
Fredrik Lundh <fredrik@pythonware.com>
parents:
14067
diff
changeset
|
2853 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
|
2854 } |
|
ef2714bb0730
changed \x to consume exactly two hex digits, also for unicode
Fredrik Lundh <fredrik@pythonware.com>
parents:
14067
diff
changeset
|
2855 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
|
2856 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
|
2857 /* _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
|
2858 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
|
2859 break; |
|
16667
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2860 store: |
|
14388
ef2714bb0730
changed \x to consume exactly two hex digits, also for unicode
Fredrik Lundh <fredrik@pythonware.com>
parents:
14067
diff
changeset
|
2861 /* 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
|
2862 if (chr <= 0xffff) |
|
ef2714bb0730
changed \x to consume exactly two hex digits, also for unicode
Fredrik Lundh <fredrik@pythonware.com>
parents:
14067
diff
changeset
|
2863 /* UCS-2 character */ |
|
ef2714bb0730
changed \x to consume exactly two hex digits, also for unicode
Fredrik Lundh <fredrik@pythonware.com>
parents:
14067
diff
changeset
|
2864 *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
|
2865 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
|
2866 /* UCS-4 character. Either store directly, or as |
| 22521 | 2867 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
|
2868 #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
|
2869 *p++ = chr; |
|
ffbb9c918ac0
Support using UCS-4 as the Py_UNICODE type:
Martin v. Löwis <martin@v.loewis.de>
parents:
18280
diff
changeset
|
2870 #else |
|
14388
ef2714bb0730
changed \x to consume exactly two hex digits, also for unicode
Fredrik Lundh <fredrik@pythonware.com>
parents:
14067
diff
changeset
|
2871 chr -= 0x10000L; |
|
ef2714bb0730
changed \x to consume exactly two hex digits, also for unicode
Fredrik Lundh <fredrik@pythonware.com>
parents:
14067
diff
changeset
|
2872 *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
|
2873 *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
|
2874 #endif |
|
14388
ef2714bb0730
changed \x to consume exactly two hex digits, also for unicode
Fredrik Lundh <fredrik@pythonware.com>
parents:
14067
diff
changeset
|
2875 } 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
|
2876 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
|
2877 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
|
2878 if (unicode_decode_call_errorhandler( |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2879 errors, &errorHandler, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2880 "unicodeescape", "illegal Unicode character", |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2881 starts, size, &startinpos, &endinpos, &exc, &s, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2882 &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
|
2883 goto onError; |
|
ef2714bb0730
changed \x to consume exactly two hex digits, also for unicode
Fredrik Lundh <fredrik@pythonware.com>
parents:
14067
diff
changeset
|
2884 } |
|
16667
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2885 break; |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2886 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2887 /* \N{name} */ |
|
16667
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2888 case 'N': |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2889 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
|
2890 if (ucnhash_CAPI == NULL) { |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2891 /* load the unicode data module */ |
|
36877
e9a7a2784e17
SF #1444030: Fix several potential defects found by Coverity.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
36675
diff
changeset
|
2892 PyObject *m, *api; |
|
44439
0cbe94bea2c7
Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0
Christian Heimes <christian@cheimes.de>
parents:
44350
diff
changeset
|
2893 m = PyImport_ImportModuleNoBlock("unicodedata"); |
|
16667
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2894 if (m == NULL) |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2895 goto ucnhashError; |
|
36877
e9a7a2784e17
SF #1444030: Fix several potential defects found by Coverity.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
36675
diff
changeset
|
2896 api = PyObject_GetAttrString(m, "ucnhash_CAPI"); |
|
16667
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2897 Py_DECREF(m); |
|
36877
e9a7a2784e17
SF #1444030: Fix several potential defects found by Coverity.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
36675
diff
changeset
|
2898 if (api == NULL) |
|
16667
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2899 goto ucnhashError; |
|
37596
1b078493d538
More low-hanging fruit. Still need to re-arrange some code (or find a better
Anthony Baxter <anthonybaxter@gmail.com>
parents:
37306
diff
changeset
|
2900 ucnhash_CAPI = (_PyUnicode_Name_CAPI *)PyCObject_AsVoidPtr(api); |
|
36877
e9a7a2784e17
SF #1444030: Fix several potential defects found by Coverity.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
36675
diff
changeset
|
2901 Py_DECREF(api); |
|
16667
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2902 if (ucnhash_CAPI == NULL) |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2903 goto ucnhashError; |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2904 } |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2905 if (*s == '{') { |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2906 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
|
2907 /* 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
|
2908 while (*s != '}' && s < end) |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2909 s++; |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2910 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
|
2911 /* 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
|
2912 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
|
2913 s++; |
|
36924
48e0a5e39403
Update Unicode database to Unicode 4.1.
Martin v. Löwis <martin@v.loewis.de>
parents:
36882
diff
changeset
|
2914 if (ucnhash_CAPI->getcode(NULL, start, (int)(s-start-1), &chr)) |
|
16667
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2915 goto store; |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2916 } |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2917 } |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
2918 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
|
2919 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
|
2920 if (unicode_decode_call_errorhandler( |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2921 errors, &errorHandler, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2922 "unicodeescape", message, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2923 starts, size, &startinpos, &endinpos, &exc, &s, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2924 &v, &outpos, &p)) |
|
16667
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2925 goto onError; |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2926 break; |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2927 |
|
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2928 default: |
| 22521 | 2929 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
|
2930 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
|
2931 s--; |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
2932 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
|
2933 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
|
2934 if (unicode_decode_call_errorhandler( |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2935 errors, &errorHandler, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2936 "unicodeescape", message, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2937 starts, size, &startinpos, &endinpos, &exc, &s, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2938 &v, &outpos, &p)) |
| 22521 | 2939 goto onError; |
| 2940 } | |
| 2941 else { | |
| 2942 *p++ = '\\'; | |
| 2943 *p++ = (unsigned char)s[-1]; | |
| 2944 } | |
|
16667
725238293869
reorganized PyUnicode_DecodeUnicodeEscape a bit (in order to make it
Fredrik Lundh <fredrik@pythonware.com>
parents:
16332
diff
changeset
|
2945 break; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2946 } |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2947 nextByte: |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
2948 ; |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
2949 } |
|
37662
0678ce9fb6b2
Change more ints to Py_ssize_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
37661
diff
changeset
|
2950 if (_PyUnicode_Resize(&v, 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
|
2951 goto onError; |
|
30160
3329b058db20
Fix another refcounting leak (in PyUnicode_DecodeUnicodeEscape()).
Walter Dörwald <walter@livinglogic.de>
parents:
30149
diff
changeset
|
2952 Py_XDECREF(errorHandler); |
|
3329b058db20
Fix another refcounting leak (in PyUnicode_DecodeUnicodeEscape()).
Walter Dörwald <walter@livinglogic.de>
parents:
30149
diff
changeset
|
2953 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
|
2954 return (PyObject *)v; |
| 22521 | 2955 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2956 ucnhashError: |
|
16200
3484670c37f2
Move uchhash functionality into unicodedata (after the recent
Fredrik Lundh <fredrik@pythonware.com>
parents:
16064
diff
changeset
|
2957 PyErr_SetString( |
|
3484670c37f2
Move uchhash functionality into unicodedata (after the recent
Fredrik Lundh <fredrik@pythonware.com>
parents:
16064
diff
changeset
|
2958 PyExc_UnicodeError, |
|
3484670c37f2
Move uchhash functionality into unicodedata (after the recent
Fredrik Lundh <fredrik@pythonware.com>
parents:
16064
diff
changeset
|
2959 "\\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
|
2960 ); |
|
36877
e9a7a2784e17
SF #1444030: Fix several potential defects found by Coverity.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
36675
diff
changeset
|
2961 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
|
2962 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
|
2963 Py_XDECREF(exc); |
|
16064
a97aa9238771
Better error message if ucnhash cannot be found (obscure attribute
Fredrik Lundh <fredrik@pythonware.com>
parents:
16029
diff
changeset
|
2964 return NULL; |
|
a97aa9238771
Better error message if ucnhash cannot be found (obscure attribute
Fredrik Lundh <fredrik@pythonware.com>
parents:
16029
diff
changeset
|
2965 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2966 onError: |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2967 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
|
2968 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
|
2969 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
|
2970 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2971 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2972 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2973 /* 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
|
2974 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2975 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
|
2976 appropriate. |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2977 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2978 */ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2979 |
|
38440
5b0753b9d16a
needforspeed: replace improvements, changed to Py_LOCAL_INLINE
Fredrik Lundh <fredrik@pythonware.com>
parents:
38427
diff
changeset
|
2980 Py_LOCAL_INLINE(const Py_UNICODE *) findchar(const Py_UNICODE *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2981 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
2982 Py_UNICODE ch) |
|
38278
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
2983 { |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
2984 /* like wcschr, but doesn't stop at NULL characters */ |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
2985 |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
2986 while (size-- > 0) { |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
2987 if (*s == ch) |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
2988 return s; |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
2989 s++; |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
2990 } |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
2991 |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
2992 return NULL; |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
2993 } |
|
12025
7994d9db7f4d
On 17-Mar-2000, Marc-Andre Lemburg said:
Barry Warsaw <barry@python.org>
parents:
11997
diff
changeset
|
2994 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2995 static |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2996 PyObject *unicodeescape_string(const Py_UNICODE *s, |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
2997 Py_ssize_t size, |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2998 int quotes) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
2999 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3000 PyObject *repr; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3001 char *p; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3002 |
|
16226
c7c404b35f33
Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings.
Ka-Ping Yee <ping@zesty.ca>
parents:
16200
diff
changeset
|
3003 static const char *hexdigit = "0123456789abcdef"; |
|
48114
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
3004 #ifdef Py_UNICODE_WIDE |
|
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
3005 const Py_ssize_t expandsize = 10; |
|
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
3006 #else |
|
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
3007 const Py_ssize_t expandsize = 6; |
|
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
3008 #endif |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3009 |
|
39621
e8a65bbd6a29
Patch #1541585: fix buffer overrun when performing repr() on
Neal Norwitz <nnorwitz@gmail.com>
parents:
39491
diff
changeset
|
3010 /* XXX(nnorwitz): rather than over-allocating, it would be |
|
e8a65bbd6a29
Patch #1541585: fix buffer overrun when performing repr() on
Neal Norwitz <nnorwitz@gmail.com>
parents:
39491
diff
changeset
|
3011 better to choose a different scheme. Perhaps scan the |
|
e8a65bbd6a29
Patch #1541585: fix buffer overrun when performing repr() on
Neal Norwitz <nnorwitz@gmail.com>
parents:
39491
diff
changeset
|
3012 first N-chars of the string and allocate based on that size. |
|
e8a65bbd6a29
Patch #1541585: fix buffer overrun when performing repr() on
Neal Norwitz <nnorwitz@gmail.com>
parents:
39491
diff
changeset
|
3013 */ |
|
e8a65bbd6a29
Patch #1541585: fix buffer overrun when performing repr() on
Neal Norwitz <nnorwitz@gmail.com>
parents:
39491
diff
changeset
|
3014 /* Initial allocation is based on the longest-possible unichr |
|
e8a65bbd6a29
Patch #1541585: fix buffer overrun when performing repr() on
Neal Norwitz <nnorwitz@gmail.com>
parents:
39491
diff
changeset
|
3015 escape. |
|
e8a65bbd6a29
Patch #1541585: fix buffer overrun when performing repr() on
Neal Norwitz <nnorwitz@gmail.com>
parents:
39491
diff
changeset
|
3016 |
|
e8a65bbd6a29
Patch #1541585: fix buffer overrun when performing repr() on
Neal Norwitz <nnorwitz@gmail.com>
parents:
39491
diff
changeset
|
3017 In wide (UTF-32) builds '\U00xxxxxx' is 10 chars per source |
|
e8a65bbd6a29
Patch #1541585: fix buffer overrun when performing repr() on
Neal Norwitz <nnorwitz@gmail.com>
parents:
39491
diff
changeset
|
3018 unichr, so in this case it's the longest unichr escape. In |
|
e8a65bbd6a29
Patch #1541585: fix buffer overrun when performing repr() on
Neal Norwitz <nnorwitz@gmail.com>
parents:
39491
diff
changeset
|
3019 narrow (UTF-16) builds this is five chars per source unichr |
|
e8a65bbd6a29
Patch #1541585: fix buffer overrun when performing repr() on
Neal Norwitz <nnorwitz@gmail.com>
parents:
39491
diff
changeset
|
3020 since there are two unichrs in the surrogate pair, so in narrow |
|
e8a65bbd6a29
Patch #1541585: fix buffer overrun when performing repr() on
Neal Norwitz <nnorwitz@gmail.com>
parents:
39491
diff
changeset
|
3021 (UTF-16) builds it's not the longest unichr escape. |
|
e8a65bbd6a29
Patch #1541585: fix buffer overrun when performing repr() on
Neal Norwitz <nnorwitz@gmail.com>
parents:
39491
diff
changeset
|
3022 |
|
e8a65bbd6a29
Patch #1541585: fix buffer overrun when performing repr() on
Neal Norwitz <nnorwitz@gmail.com>
parents:
39491
diff
changeset
|
3023 In wide or narrow builds '\uxxxx' is 6 chars per source unichr, |
|
e8a65bbd6a29
Patch #1541585: fix buffer overrun when performing repr() on
Neal Norwitz <nnorwitz@gmail.com>
parents:
39491
diff
changeset
|
3024 so in the narrow (UTF-16) build case it's the longest unichr |
|
e8a65bbd6a29
Patch #1541585: fix buffer overrun when performing repr() on
Neal Norwitz <nnorwitz@gmail.com>
parents:
39491
diff
changeset
|
3025 escape. |
|
e8a65bbd6a29
Patch #1541585: fix buffer overrun when performing repr() on
Neal Norwitz <nnorwitz@gmail.com>
parents:
39491
diff
changeset
|
3026 */ |
|
e8a65bbd6a29
Patch #1541585: fix buffer overrun when performing repr() on
Neal Norwitz <nnorwitz@gmail.com>
parents:
39491
diff
changeset
|
3027 |
|
48114
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
3028 if (size > (PY_SSIZE_T_MAX - 2 - 1) / expandsize) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3029 return PyErr_NoMemory(); |
|
48114
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
3030 |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
3031 repr = PyString_FromStringAndSize(NULL, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3032 2 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3033 + expandsize*size |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3034 + 1); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3035 if (repr == NULL) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3036 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3037 |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
3038 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
|
3039 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3040 if (quotes) { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3041 *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
|
3042 *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
|
3043 !findchar(s, size, '"')) ? '"' : '\''; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3044 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3045 while (size-- > 0) { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3046 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
|
3047 |
|
36056
f1ae11457d34
Bug #1379994: Fix *unicode_escape codecs to encode r'\' as r'\\'
Hye-Shik Chang <hyeshik@gmail.com>
parents:
35999
diff
changeset
|
3048 /* Escape quotes and backslashes */ |
|
f1ae11457d34
Bug #1379994: Fix *unicode_escape codecs to encode r'\' as r'\\'
Hye-Shik Chang <hyeshik@gmail.com>
parents:
35999
diff
changeset
|
3049 if ((quotes && |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3050 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
|
3051 *p++ = '\\'; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3052 *p++ = (char) ch; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3053 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
|
3054 } |
|
18828
081d96fbcf43
Fix for bug #444493: u'\U00010001' segfaults with current CVS on
Marc-André Lemburg <mal@egenix.com>
parents:
18774
diff
changeset
|
3055 |
|
18773
743f8e1d953c
#ifdef out generation of \U escapes unless Py_UNICODE_WIDE. This
Guido van Rossum <guido@python.org>
parents:
18324
diff
changeset
|
3056 #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
|
3057 /* 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
|
3058 else if (ch >= 0x10000) { |
|
ffbb9c918ac0
Support using UCS-4 as the Py_UNICODE type:
Martin v. Löwis <martin@v.loewis.de>
parents:
18280
diff
changeset
|
3059 *p++ = '\\'; |
|
ffbb9c918ac0
Support using UCS-4 as the Py_UNICODE type:
Martin v. Löwis <martin@v.loewis.de>
parents:
18280
diff
changeset
|
3060 *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
|
3061 *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
|
3062 *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
|
3063 *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
|
3064 *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
|
3065 *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
|
3066 *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
|
3067 *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
|
3068 *p++ = hexdigit[ch & 0x0000000F]; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3069 continue; |
|
18292
ffbb9c918ac0
Support using UCS-4 as the Py_UNICODE type:
Martin v. Löwis <martin@v.loewis.de>
parents:
18280
diff
changeset
|
3070 } |
|
39621
e8a65bbd6a29
Patch #1541585: fix buffer overrun when performing repr() on
Neal Norwitz <nnorwitz@gmail.com>
parents:
39491
diff
changeset
|
3071 #else |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3072 /* Map UTF-16 surrogate pairs to '\U00xxxxxx' */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3073 else if (ch >= 0xD800 && ch < 0xDC00) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3074 Py_UNICODE ch2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3075 Py_UCS4 ucs; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3076 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3077 ch2 = *s++; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3078 size--; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3079 if (ch2 >= 0xDC00 && ch2 <= 0xDFFF) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3080 ucs = (((ch & 0x03FF) << 10) | (ch2 & 0x03FF)) + 0x00010000; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3081 *p++ = '\\'; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3082 *p++ = 'U'; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3083 *p++ = hexdigit[(ucs >> 28) & 0x0000000F]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3084 *p++ = hexdigit[(ucs >> 24) & 0x0000000F]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3085 *p++ = hexdigit[(ucs >> 20) & 0x0000000F]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3086 *p++ = hexdigit[(ucs >> 16) & 0x0000000F]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3087 *p++ = hexdigit[(ucs >> 12) & 0x0000000F]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3088 *p++ = hexdigit[(ucs >> 8) & 0x0000000F]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3089 *p++ = hexdigit[(ucs >> 4) & 0x0000000F]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3090 *p++ = hexdigit[ucs & 0x0000000F]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3091 continue; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3092 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3093 /* Fall through: isolated surrogates are copied as-is */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3094 s--; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3095 size++; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3096 } |
|
39621
e8a65bbd6a29
Patch #1541585: fix buffer overrun when performing repr() on
Neal Norwitz <nnorwitz@gmail.com>
parents:
39491
diff
changeset
|
3097 #endif |
|
18774
57684d3cefce
Make the unicode-escape and the UTF-16 codecs handle surrogates
Marc-André Lemburg <mal@egenix.com>
parents:
18773
diff
changeset
|
3098 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3099 /* 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
|
3100 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
|
3101 *p++ = '\\'; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3102 *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
|
3103 *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
|
3104 *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
|
3105 *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
|
3106 *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
|
3107 } |
|
18828
081d96fbcf43
Fix for bug #444493: u'\U00010001' segfaults with current CVS on
Marc-André Lemburg <mal@egenix.com>
parents:
18774
diff
changeset
|
3108 |
|
16226
c7c404b35f33
Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings.
Ka-Ping Yee <ping@zesty.ca>
parents:
16200
diff
changeset
|
3109 /* 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
|
3110 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
|
3111 *p++ = '\\'; |
|
c7c404b35f33
Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings.
Ka-Ping Yee <ping@zesty.ca>
parents:
16200
diff
changeset
|
3112 *p++ = 't'; |
|
c7c404b35f33
Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings.
Ka-Ping Yee <ping@zesty.ca>
parents:
16200
diff
changeset
|
3113 } |
|
c7c404b35f33
Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings.
Ka-Ping Yee <ping@zesty.ca>
parents:
16200
diff
changeset
|
3114 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
|
3115 *p++ = '\\'; |
|
c7c404b35f33
Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings.
Ka-Ping Yee <ping@zesty.ca>
parents:
16200
diff
changeset
|
3116 *p++ = 'n'; |
|
c7c404b35f33
Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings.
Ka-Ping Yee <ping@zesty.ca>
parents:
16200
diff
changeset
|
3117 } |
|
c7c404b35f33
Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings.
Ka-Ping Yee <ping@zesty.ca>
parents:
16200
diff
changeset
|
3118 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
|
3119 *p++ = '\\'; |
|
c7c404b35f33
Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings.
Ka-Ping Yee <ping@zesty.ca>
parents:
16200
diff
changeset
|
3120 *p++ = 'r'; |
|
c7c404b35f33
Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings.
Ka-Ping Yee <ping@zesty.ca>
parents:
16200
diff
changeset
|
3121 } |
|
18828
081d96fbcf43
Fix for bug #444493: u'\U00010001' segfaults with current CVS on
Marc-André Lemburg <mal@egenix.com>
parents:
18774
diff
changeset
|
3122 |
|
16226
c7c404b35f33
Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings.
Ka-Ping Yee <ping@zesty.ca>
parents:
16200
diff
changeset
|
3123 /* 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
|
3124 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
|
3125 *p++ = '\\'; |
|
16226
c7c404b35f33
Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings.
Ka-Ping Yee <ping@zesty.ca>
parents:
16200
diff
changeset
|
3126 *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
|
3127 *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
|
3128 *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
|
3129 } |
|
18828
081d96fbcf43
Fix for bug #444493: u'\U00010001' segfaults with current CVS on
Marc-André Lemburg <mal@egenix.com>
parents:
18774
diff
changeset
|
3130 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3131 /* 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
|
3132 else |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3133 *p++ = (char) ch; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3134 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3135 if (quotes) |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
3136 *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
|
3137 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3138 *p = '\0'; |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
3139 _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
|
3140 return repr; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3141 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3142 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3143 PyObject *PyUnicode_EncodeUnicodeEscape(const Py_UNICODE *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3144 Py_ssize_t size) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3145 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3146 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
|
3147 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3148 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3149 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
|
3150 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3151 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
|
3152 PyErr_BadArgument(); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3153 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3154 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3155 return PyUnicode_EncodeUnicodeEscape(PyUnicode_AS_UNICODE(unicode), |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3156 PyUnicode_GET_SIZE(unicode)); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3157 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3158 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3159 /* --- 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
|
3160 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3161 PyObject *PyUnicode_DecodeRawUnicodeEscape(const char *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3162 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3163 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
|
3164 { |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3165 const char *starts = s; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
3166 Py_ssize_t startinpos; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
3167 Py_ssize_t endinpos; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
3168 Py_ssize_t outpos; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3169 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
|
3170 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
|
3171 const char *end; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3172 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
|
3173 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
|
3174 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
|
3175 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3176 /* 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
|
3177 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
|
3178 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
|
3179 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
|
3180 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
|
3181 if (v == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3182 goto onError; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3183 if (size == 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3184 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
|
3185 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
|
3186 end = s + size; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3187 while (s < end) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3188 unsigned char c; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3189 Py_UCS4 x; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3190 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
|
3191 int count; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3192 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3193 /* Non-escape characters are interpreted as Unicode ordinals */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3194 if (*s != '\\') { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3195 *p++ = (unsigned char)*s++; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3196 continue; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3197 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3198 startinpos = s-starts; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3199 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3200 /* \u-escapes are only interpreted iff the number of leading |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3201 backslashes if odd */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3202 bs = s; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3203 for (;s < end;) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3204 if (*s != '\\') |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3205 break; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3206 *p++ = (unsigned char)*s++; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3207 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3208 if (((s - bs) & 1) == 0 || |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3209 s >= end || |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3210 (*s != 'u' && *s != 'U')) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3211 continue; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3212 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3213 p--; |
|
29164
4d9017ef7b5f
Consider \U-escapes in raw-unicode-escape. Fixes #444514.
Martin v. Löwis <martin@v.loewis.de>
parents:
28575
diff
changeset
|
3214 count = *s=='u' ? 4 : 8; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3215 s++; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3216 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3217 /* \uXXXX with 4 hex digits, \Uxxxxxxxx with 8 */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3218 outpos = p-PyUnicode_AS_UNICODE(v); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3219 for (x = 0, i = 0; i < count; ++i, ++s) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3220 c = (unsigned char)*s; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3221 if (!isxdigit(c)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3222 endinpos = s-starts; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3223 if (unicode_decode_call_errorhandler( |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3224 errors, &errorHandler, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3225 "rawunicodeescape", "truncated \\uXXXX", |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3226 starts, size, &startinpos, &endinpos, &exc, &s, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3227 &v, &outpos, &p)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3228 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3229 goto nextByte; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3230 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3231 x = (x<<4) & ~0xF; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3232 if (c >= '0' && c <= '9') |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3233 x += c - '0'; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3234 else if (c >= 'a' && c <= 'f') |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3235 x += 10 + c - 'a'; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3236 else |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3237 x += 10 + c - 'A'; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3238 } |
|
46028
8710ba7fba2b
#1477: ur'\U0010FFFF' raised in narrow unicode builds.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
46026
diff
changeset
|
3239 if (x <= 0xffff) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3240 /* UCS-2 character */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3241 *p++ = (Py_UNICODE) x; |
|
46028
8710ba7fba2b
#1477: ur'\U0010FFFF' raised in narrow unicode builds.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
46026
diff
changeset
|
3242 else if (x <= 0x10ffff) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3243 /* UCS-4 character. Either store directly, or as |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3244 surrogate pair. */ |
|
46028
8710ba7fba2b
#1477: ur'\U0010FFFF' raised in narrow unicode builds.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
46026
diff
changeset
|
3245 #ifdef Py_UNICODE_WIDE |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3246 *p++ = (Py_UNICODE) x; |
|
46028
8710ba7fba2b
#1477: ur'\U0010FFFF' raised in narrow unicode builds.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
46026
diff
changeset
|
3247 #else |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3248 x -= 0x10000L; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3249 *p++ = 0xD800 + (Py_UNICODE) (x >> 10); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3250 *p++ = 0xDC00 + (Py_UNICODE) (x & 0x03FF); |
|
46028
8710ba7fba2b
#1477: ur'\U0010FFFF' raised in narrow unicode builds.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
46026
diff
changeset
|
3251 #endif |
|
8710ba7fba2b
#1477: ur'\U0010FFFF' raised in narrow unicode builds.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
46026
diff
changeset
|
3252 } else { |
|
8710ba7fba2b
#1477: ur'\U0010FFFF' raised in narrow unicode builds.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
46026
diff
changeset
|
3253 endinpos = s-starts; |
|
8710ba7fba2b
#1477: ur'\U0010FFFF' raised in narrow unicode builds.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
46026
diff
changeset
|
3254 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
|
3255 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
|
3256 errors, &errorHandler, |
|
4d9017ef7b5f
Consider \U-escapes in raw-unicode-escape. Fixes #444514.
Martin v. Löwis <martin@v.loewis.de>
parents:
28575
diff
changeset
|
3257 "rawunicodeescape", "\\Uxxxxxxxx out of range", |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3258 starts, size, &startinpos, &endinpos, &exc, &s, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3259 &v, &outpos, &p)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3260 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3261 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3262 nextByte: |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3263 ; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3264 } |
|
37662
0678ce9fb6b2
Change more ints to Py_ssize_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
37661
diff
changeset
|
3265 if (_PyUnicode_Resize(&v, p - PyUnicode_AS_UNICODE(v)) < 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3266 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
|
3267 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
|
3268 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
|
3269 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
|
3270 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3271 onError: |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3272 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
|
3273 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
|
3274 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
|
3275 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3276 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3277 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3278 PyObject *PyUnicode_EncodeRawUnicodeEscape(const Py_UNICODE *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3279 Py_ssize_t size) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3280 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3281 PyObject *repr; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3282 char *p; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3283 char *q; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3284 |
|
16226
c7c404b35f33
Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings.
Ka-Ping Yee <ping@zesty.ca>
parents:
16200
diff
changeset
|
3285 static const char *hexdigit = "0123456789abcdef"; |
|
29164
4d9017ef7b5f
Consider \U-escapes in raw-unicode-escape. Fixes #444514.
Martin v. Löwis <martin@v.loewis.de>
parents:
28575
diff
changeset
|
3286 #ifdef Py_UNICODE_WIDE |
|
48114
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
3287 const Py_ssize_t expandsize = 10; |
|
29164
4d9017ef7b5f
Consider \U-escapes in raw-unicode-escape. Fixes #444514.
Martin v. Löwis <martin@v.loewis.de>
parents:
28575
diff
changeset
|
3288 #else |
|
48114
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
3289 const Py_ssize_t expandsize = 6; |
|
29164
4d9017ef7b5f
Consider \U-escapes in raw-unicode-escape. Fixes #444514.
Martin v. Löwis <martin@v.loewis.de>
parents:
28575
diff
changeset
|
3290 #endif |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
3291 |
|
48114
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
3292 if (size > PY_SSIZE_T_MAX / expandsize) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3293 return PyErr_NoMemory(); |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
3294 |
|
48114
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
3295 repr = PyString_FromStringAndSize(NULL, expandsize * size); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3296 if (repr == NULL) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3297 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
|
3298 if (size == 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3299 return repr; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3300 |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
3301 p = q = 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
|
3302 while (size-- > 0) { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3303 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
|
3304 #ifdef Py_UNICODE_WIDE |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3305 /* Map 32-bit characters to '\Uxxxxxxxx' */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3306 if (ch >= 0x10000) { |
|
29164
4d9017ef7b5f
Consider \U-escapes in raw-unicode-escape. Fixes #444514.
Martin v. Löwis <martin@v.loewis.de>
parents:
28575
diff
changeset
|
3307 *p++ = '\\'; |
|
4d9017ef7b5f
Consider \U-escapes in raw-unicode-escape. Fixes #444514.
Martin v. Löwis <martin@v.loewis.de>
parents:
28575
diff
changeset
|
3308 *p++ = 'U'; |
|
4d9017ef7b5f
Consider \U-escapes in raw-unicode-escape. Fixes #444514.
Martin v. Löwis <martin@v.loewis.de>
parents:
28575
diff
changeset
|
3309 *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
|
3310 *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
|
3311 *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
|
3312 *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
|
3313 *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
|
3314 *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
|
3315 *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
|
3316 *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
|
3317 } |
|
29164
4d9017ef7b5f
Consider \U-escapes in raw-unicode-escape. Fixes #444514.
Martin v. Löwis <martin@v.loewis.de>
parents:
28575
diff
changeset
|
3318 else |
|
46028
8710ba7fba2b
#1477: ur'\U0010FFFF' raised in narrow unicode builds.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
46026
diff
changeset
|
3319 #else |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3320 /* Map UTF-16 surrogate pairs to '\U00xxxxxx' */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3321 if (ch >= 0xD800 && ch < 0xDC00) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3322 Py_UNICODE ch2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3323 Py_UCS4 ucs; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3324 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3325 ch2 = *s++; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3326 size--; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3327 if (ch2 >= 0xDC00 && ch2 <= 0xDFFF) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3328 ucs = (((ch & 0x03FF) << 10) | (ch2 & 0x03FF)) + 0x00010000; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3329 *p++ = '\\'; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3330 *p++ = 'U'; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3331 *p++ = hexdigit[(ucs >> 28) & 0xf]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3332 *p++ = hexdigit[(ucs >> 24) & 0xf]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3333 *p++ = hexdigit[(ucs >> 20) & 0xf]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3334 *p++ = hexdigit[(ucs >> 16) & 0xf]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3335 *p++ = hexdigit[(ucs >> 12) & 0xf]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3336 *p++ = hexdigit[(ucs >> 8) & 0xf]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3337 *p++ = hexdigit[(ucs >> 4) & 0xf]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3338 *p++ = hexdigit[ucs & 0xf]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3339 continue; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3340 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3341 /* Fall through: isolated surrogates are copied as-is */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3342 s--; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3343 size++; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3344 } |
|
29164
4d9017ef7b5f
Consider \U-escapes in raw-unicode-escape. Fixes #444514.
Martin v. Löwis <martin@v.loewis.de>
parents:
28575
diff
changeset
|
3345 #endif |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3346 /* Map 16-bit characters to '\uxxxx' */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3347 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
|
3348 *p++ = '\\'; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3349 *p++ = 'u'; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3350 *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
|
3351 *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
|
3352 *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
|
3353 *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
|
3354 } |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3355 /* Copy everything else as-is */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3356 else |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3357 *p++ = (char) ch; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3358 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3359 *p = '\0'; |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
3360 _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
|
3361 return repr; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3362 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3363 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3364 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
|
3365 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3366 if (!PyUnicode_Check(unicode)) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3367 PyErr_BadArgument(); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3368 return NULL; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3369 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3370 return PyUnicode_EncodeRawUnicodeEscape(PyUnicode_AS_UNICODE(unicode), |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3371 PyUnicode_GET_SIZE(unicode)); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3372 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3373 |
| 35485 | 3374 /* --- Unicode Internal Codec ------------------------------------------- */ |
| 3375 | |
| 3376 PyObject *_PyUnicode_DecodeUnicodeInternal(const char *s, | |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3377 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3378 const char *errors) |
| 35485 | 3379 { |
| 3380 const char *starts = s; | |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
3381 Py_ssize_t startinpos; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
3382 Py_ssize_t endinpos; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
3383 Py_ssize_t outpos; |
| 35485 | 3384 PyUnicodeObject *v; |
| 3385 Py_UNICODE *p; | |
| 3386 const char *end; | |
| 3387 const char *reason; | |
| 3388 PyObject *errorHandler = NULL; | |
| 3389 PyObject *exc = NULL; | |
| 3390 | |
|
36236
ecd423718a32
Fix icc warnings: remove (sometimes) unused variable conditionally
Neal Norwitz <nnorwitz@gmail.com>
parents:
36203
diff
changeset
|
3391 #ifdef Py_UNICODE_WIDE |
|
ecd423718a32
Fix icc warnings: remove (sometimes) unused variable conditionally
Neal Norwitz <nnorwitz@gmail.com>
parents:
36203
diff
changeset
|
3392 Py_UNICODE unimax = PyUnicode_GetMax(); |
|
ecd423718a32
Fix icc warnings: remove (sometimes) unused variable conditionally
Neal Norwitz <nnorwitz@gmail.com>
parents:
36203
diff
changeset
|
3393 #endif |
|
ecd423718a32
Fix icc warnings: remove (sometimes) unused variable conditionally
Neal Norwitz <nnorwitz@gmail.com>
parents:
36203
diff
changeset
|
3394 |
|
39995
6ba402b60041
Forward-port of r52136,52138: a review of overflow-detecting code.
Armin Rigo <arigo@tunes.org>
parents:
39734
diff
changeset
|
3395 /* XXX overflow detection missing */ |
| 35485 | 3396 v = _PyUnicode_New((size+Py_UNICODE_SIZE-1)/ Py_UNICODE_SIZE); |
| 3397 if (v == NULL) | |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3398 goto onError; |
| 35485 | 3399 if (PyUnicode_GetSize((PyObject *)v) == 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3400 return (PyObject *)v; |
| 35485 | 3401 p = PyUnicode_AS_UNICODE(v); |
| 3402 end = s + size; | |
| 3403 | |
| 3404 while (s < end) { | |
|
38182
d8355cccff4a
Patch #1488312, Fix memory alignment problem on SPARC in unicode. Will backport
Neal Norwitz <nnorwitz@gmail.com>
parents:
37775
diff
changeset
|
3405 memcpy(p, s, sizeof(Py_UNICODE)); |
| 35485 | 3406 /* We have to sanity check the raw data, otherwise doom looms for |
| 3407 some malformed UCS-4 data. */ | |
| 3408 if ( | |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3409 #ifdef Py_UNICODE_WIDE |
| 35485 | 3410 *p > unimax || *p < 0 || |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3411 #endif |
| 35485 | 3412 end-s < Py_UNICODE_SIZE |
| 3413 ) | |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3414 { |
| 35485 | 3415 startinpos = s - starts; |
| 3416 if (end-s < Py_UNICODE_SIZE) { | |
| 3417 endinpos = end-starts; | |
| 3418 reason = "truncated input"; | |
| 3419 } | |
| 3420 else { | |
| 3421 endinpos = s - starts + Py_UNICODE_SIZE; | |
| 3422 reason = "illegal code point (> 0x10FFFF)"; | |
| 3423 } | |
| 3424 outpos = p - PyUnicode_AS_UNICODE(v); | |
| 3425 if (unicode_decode_call_errorhandler( | |
| 3426 errors, &errorHandler, | |
| 3427 "unicode_internal", reason, | |
| 3428 starts, size, &startinpos, &endinpos, &exc, &s, | |
|
50305
e673632e1885
Merged revisions 67898,67904-67907,67912,67918,67920-67921,67923-67924,67927,67930,67932,67943 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
50004
diff
changeset
|
3429 &v, &outpos, &p)) { |
| 35485 | 3430 goto onError; |
| 3431 } | |
| 3432 } | |
| 3433 else { | |
| 3434 p++; | |
| 3435 s += Py_UNICODE_SIZE; | |
| 3436 } | |
| 3437 } | |
| 3438 | |
|
37662
0678ce9fb6b2
Change more ints to Py_ssize_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
37661
diff
changeset
|
3439 if (_PyUnicode_Resize(&v, p - PyUnicode_AS_UNICODE(v)) < 0) |
| 35485 | 3440 goto onError; |
| 3441 Py_XDECREF(errorHandler); | |
| 3442 Py_XDECREF(exc); | |
| 3443 return (PyObject *)v; | |
| 3444 | |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3445 onError: |
| 35485 | 3446 Py_XDECREF(v); |
| 3447 Py_XDECREF(errorHandler); | |
| 3448 Py_XDECREF(exc); | |
| 3449 return NULL; | |
| 3450 } | |
| 3451 | |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3452 /* --- Latin-1 Codec ------------------------------------------------------ */ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3453 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3454 PyObject *PyUnicode_DecodeLatin1(const char *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3455 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3456 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
|
3457 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3458 PyUnicodeObject *v; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3459 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
|
3460 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3461 /* 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
|
3462 if (size == 1) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3463 Py_UNICODE r = *(unsigned char*)s; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3464 return PyUnicode_FromUnicode(&r, 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
|
3465 } |
|
b44ba7c01217
This patch originated from an idea by Martin v. Loewis who submitted a
Marc-André Lemburg <mal@egenix.com>
parents:
17600
diff
changeset
|
3466 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3467 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
|
3468 if (v == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3469 goto onError; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3470 if (size == 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3471 return (PyObject *)v; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3472 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
|
3473 while (size-- > 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3474 *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
|
3475 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
|
3476 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3477 onError: |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3478 Py_XDECREF(v); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3479 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3480 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3481 |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3482 /* 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
|
3483 static void make_encode_exception(PyObject **exceptionObject, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3484 const char *encoding, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3485 const Py_UNICODE *unicode, Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3486 Py_ssize_t startpos, Py_ssize_t endpos, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3487 const char *reason) |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3488 { |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3489 if (*exceptionObject == NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3490 *exceptionObject = PyUnicodeEncodeError_Create( |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3491 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
|
3492 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3493 else { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3494 if (PyUnicodeEncodeError_SetStart(*exceptionObject, startpos)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3495 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3496 if (PyUnicodeEncodeError_SetEnd(*exceptionObject, endpos)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3497 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3498 if (PyUnicodeEncodeError_SetReason(*exceptionObject, reason)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3499 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3500 return; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3501 onError: |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3502 Py_DECREF(*exceptionObject); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3503 *exceptionObject = NULL; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3504 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3505 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3506 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3507 /* 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
|
3508 static void raise_encode_exception(PyObject **exceptionObject, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3509 const char *encoding, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3510 const Py_UNICODE *unicode, Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3511 Py_ssize_t startpos, Py_ssize_t endpos, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3512 const char *reason) |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3513 { |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3514 make_encode_exception(exceptionObject, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3515 encoding, unicode, size, startpos, endpos, reason); |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3516 if (*exceptionObject != NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3517 PyCodec_StrictErrors(*exceptionObject); |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3518 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3519 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3520 /* 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
|
3521 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
|
3522 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
|
3523 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
|
3524 static PyObject *unicode_encode_call_errorhandler(const char *errors, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3525 PyObject **errorHandler, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3526 const char *encoding, const char *reason, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3527 const Py_UNICODE *unicode, Py_ssize_t size, PyObject **exceptionObject, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3528 Py_ssize_t startpos, Py_ssize_t endpos, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3529 Py_ssize_t *newpos) |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
3530 { |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
3531 static char *argparse = "O!n;encoding error handler must return (unicode, int) tuple"; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3532 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3533 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
|
3534 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
|
3535 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3536 if (*errorHandler == NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3537 *errorHandler = PyCodec_LookupError(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
|
3538 if (*errorHandler == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3539 return NULL; |
|
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 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3541 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3542 make_encode_exception(exceptionObject, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3543 encoding, unicode, size, startpos, endpos, reason); |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3544 if (*exceptionObject == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3545 return NULL; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3546 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3547 restuple = PyObject_CallFunctionObjArgs( |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3548 *errorHandler, *exceptionObject, NULL); |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3549 if (restuple == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3550 return NULL; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3551 if (!PyTuple_Check(restuple)) { |
|
51598
512c5a5de00b
Fix warnings GCC emits where the argument of PyErr_Format is a single variable.
Georg Brandl <georg@python.org>
parents:
51218
diff
changeset
|
3552 PyErr_SetString(PyExc_TypeError, &argparse[4]); |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3553 Py_DECREF(restuple); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3554 return NULL; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3555 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3556 if (!PyArg_ParseTuple(restuple, argparse, &PyUnicode_Type, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3557 &resunicode, newpos)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3558 Py_DECREF(restuple); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3559 return NULL; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3560 } |
|
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 (*newpos<0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3562 *newpos = size+*newpos; |
|
27555
c267f28724dd
Change the treatment of positions returned by PEP293
Walter Dörwald <walter@livinglogic.de>
parents:
27521
diff
changeset
|
3563 if (*newpos<0 || *newpos>size) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3564 PyErr_Format(PyExc_IndexError, "position %zd from error handler out of bounds", *newpos); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3565 Py_DECREF(restuple); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3566 return NULL; |
|
27555
c267f28724dd
Change the treatment of positions returned by PEP293
Walter Dörwald <walter@livinglogic.de>
parents:
27521
diff
changeset
|
3567 } |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3568 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
|
3569 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
|
3570 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
|
3571 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3572 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3573 static PyObject *unicode_encode_ucs1(const Py_UNICODE *p, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3574 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3575 const char *errors, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3576 int limit) |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3577 { |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3578 /* 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
|
3579 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
|
3580 /* 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
|
3581 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
|
3582 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
|
3583 /* 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
|
3584 /* 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
|
3585 /* 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
|
3586 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
|
3587 /* current output position */ |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
3588 Py_ssize_t respos = 0; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
3589 Py_ssize_t ressize; |
|
37596
1b078493d538
More low-hanging fruit. Still need to re-arrange some code (or find a better
Anthony Baxter <anthonybaxter@gmail.com>
parents:
37306
diff
changeset
|
3590 const char *encoding = (limit == 256) ? "latin-1" : "ascii"; |
|
1b078493d538
More low-hanging fruit. Still need to re-arrange some code (or find a better
Anthony Baxter <anthonybaxter@gmail.com>
parents:
37306
diff
changeset
|
3591 const char *reason = (limit == 256) ? "ordinal not in range(256)" : "ordinal not in range(128)"; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3592 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
|
3593 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
|
3594 /* 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
|
3595 * -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
|
3596 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
|
3597 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3598 /* 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
|
3599 replacements, if we need more, we'll resize */ |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
3600 res = PyString_FromStringAndSize(NULL, size); |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3601 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
|
3602 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
|
3603 if (size == 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3604 return res; |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
3605 str = PyString_AS_STRING(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
|
3606 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
|
3607 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3608 while (p<endp) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3609 Py_UNICODE c = *p; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3610 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3611 /* can we encode this? */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3612 if (c<limit) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3613 /* no overflow check, because we know that the space is enough */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3614 *str++ = (char)c; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3615 ++p; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3616 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3617 else { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3618 Py_ssize_t unicodepos = p-startp; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3619 Py_ssize_t requiredsize; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3620 PyObject *repunicode; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3621 Py_ssize_t repsize; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3622 Py_ssize_t newpos; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3623 Py_ssize_t respos; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3624 Py_UNICODE *uni2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3625 /* startpos for collecting unencodable chars */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3626 const Py_UNICODE *collstart = p; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3627 const Py_UNICODE *collend = p; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3628 /* find all unecodable characters */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3629 while ((collend < endp) && ((*collend)>=limit)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3630 ++collend; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3631 /* cache callback name lookup (if not done yet, i.e. it's the first error) */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3632 if (known_errorHandler==-1) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3633 if ((errors==NULL) || (!strcmp(errors, "strict"))) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3634 known_errorHandler = 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3635 else if (!strcmp(errors, "replace")) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3636 known_errorHandler = 2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3637 else if (!strcmp(errors, "ignore")) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3638 known_errorHandler = 3; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3639 else if (!strcmp(errors, "xmlcharrefreplace")) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3640 known_errorHandler = 4; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3641 else |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3642 known_errorHandler = 0; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3643 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3644 switch (known_errorHandler) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3645 case 1: /* strict */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3646 raise_encode_exception(&exc, encoding, startp, size, collstart-startp, collend-startp, reason); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3647 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3648 case 2: /* replace */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3649 while (collstart++<collend) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3650 *str++ = '?'; /* fall through */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3651 case 3: /* ignore */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3652 p = collend; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3653 break; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3654 case 4: /* xmlcharrefreplace */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3655 respos = str-PyString_AS_STRING(res); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3656 /* determine replacement size (temporarily (mis)uses p) */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3657 for (p = collstart, repsize = 0; p < collend; ++p) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3658 if (*p<10) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3659 repsize += 2+1+1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3660 else if (*p<100) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3661 repsize += 2+2+1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3662 else if (*p<1000) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3663 repsize += 2+3+1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3664 else if (*p<10000) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3665 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
|
3666 #ifndef Py_UNICODE_WIDE |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3667 else |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3668 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
|
3669 #else |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3670 else if (*p<100000) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3671 repsize += 2+5+1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3672 else if (*p<1000000) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3673 repsize += 2+6+1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3674 else |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3675 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
|
3676 #endif |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3677 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3678 requiredsize = respos+repsize+(endp-collend); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3679 if (requiredsize > ressize) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3680 if (requiredsize<2*ressize) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3681 requiredsize = 2*ressize; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3682 if (_PyString_Resize(&res, requiredsize)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3683 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3684 str = PyString_AS_STRING(res) + respos; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3685 ressize = requiredsize; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3686 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3687 /* generate replacement (temporarily (mis)uses p) */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3688 for (p = collstart; p < collend; ++p) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3689 str += sprintf(str, "&#%d;", (int)*p); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3690 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3691 p = collend; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3692 break; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3693 default: |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3694 repunicode = unicode_encode_call_errorhandler(errors, &errorHandler, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3695 encoding, reason, startp, size, &exc, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3696 collstart-startp, collend-startp, &newpos); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3697 if (repunicode == NULL) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3698 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3699 /* need more space? (at least enough for what we have+the |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3700 replacement+the rest of the string, so we won't have to |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3701 check space for encodable characters) */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3702 respos = str-PyString_AS_STRING(res); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3703 repsize = PyUnicode_GET_SIZE(repunicode); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3704 requiredsize = respos+repsize+(endp-collend); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3705 if (requiredsize > ressize) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3706 if (requiredsize<2*ressize) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3707 requiredsize = 2*ressize; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3708 if (_PyString_Resize(&res, requiredsize)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3709 Py_DECREF(repunicode); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3710 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3711 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3712 str = PyString_AS_STRING(res) + respos; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3713 ressize = requiredsize; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3714 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3715 /* check if there is anything unencodable in the replacement |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3716 and copy it to the output */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3717 for (uni2 = PyUnicode_AS_UNICODE(repunicode);repsize-->0; ++uni2, ++str) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3718 c = *uni2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3719 if (c >= limit) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3720 raise_encode_exception(&exc, encoding, startp, size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3721 unicodepos, unicodepos+1, reason); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3722 Py_DECREF(repunicode); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3723 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3724 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3725 *str = (char)c; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3726 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3727 p = startp + newpos; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3728 Py_DECREF(repunicode); |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
3729 } |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3730 } |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3731 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3732 /* Resize if we allocated to much */ |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
3733 respos = str-PyString_AS_STRING(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
|
3734 if (respos<ressize) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3735 /* If this falls res will be NULL */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3736 _PyString_Resize(&res, respos); |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3737 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
|
3738 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
|
3739 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
|
3740 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3741 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
|
3742 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
|
3743 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
|
3744 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
|
3745 return NULL; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3746 } |
|
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 PyObject *PyUnicode_EncodeLatin1(const Py_UNICODE *p, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3749 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3750 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
|
3751 { |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3752 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
|
3753 } |
|
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 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
|
3756 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3757 if (!PyUnicode_Check(unicode)) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3758 PyErr_BadArgument(); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3759 return NULL; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3760 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3761 return PyUnicode_EncodeLatin1(PyUnicode_AS_UNICODE(unicode), |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3762 PyUnicode_GET_SIZE(unicode), |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3763 NULL); |
|
11968
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 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3766 /* --- 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
|
3767 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3768 PyObject *PyUnicode_DecodeASCII(const char *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3769 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3770 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
|
3771 { |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3772 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
|
3773 PyUnicodeObject *v; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3774 Py_UNICODE *p; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
3775 Py_ssize_t startinpos; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
3776 Py_ssize_t endinpos; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
3777 Py_ssize_t outpos; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3778 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
|
3779 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
|
3780 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
|
3781 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3782 /* 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
|
3783 if (size == 1 && *(unsigned char*)s < 128) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3784 Py_UNICODE r = *(unsigned char*)s; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3785 return PyUnicode_FromUnicode(&r, 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
|
3786 } |
|
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
|
3787 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3788 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
|
3789 if (v == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3790 goto onError; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3791 if (size == 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3792 return (PyObject *)v; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3793 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
|
3794 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
|
3795 while (s < e) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3796 register unsigned char c = (unsigned char)*s; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3797 if (c < 128) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3798 *p++ = c; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3799 ++s; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3800 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3801 else { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3802 startinpos = s-starts; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3803 endinpos = startinpos + 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3804 outpos = p - (Py_UNICODE *)PyUnicode_AS_UNICODE(v); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3805 if (unicode_decode_call_errorhandler( |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3806 errors, &errorHandler, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3807 "ascii", "ordinal not in range(128)", |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3808 starts, size, &startinpos, &endinpos, &exc, &s, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3809 &v, &outpos, &p)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3810 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3811 } |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3812 } |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
3813 if (p - PyUnicode_AS_UNICODE(v) < PyString_GET_SIZE(v)) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3814 if (_PyUnicode_Resize(&v, p - PyUnicode_AS_UNICODE(v)) < 0) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3815 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
|
3816 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
|
3817 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
|
3818 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
|
3819 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3820 onError: |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3821 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
|
3822 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
|
3823 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
|
3824 return NULL; |
|
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 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3827 PyObject *PyUnicode_EncodeASCII(const Py_UNICODE *p, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3828 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3829 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
|
3830 { |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
3831 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
|
3832 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3833 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3834 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
|
3835 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3836 if (!PyUnicode_Check(unicode)) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3837 PyErr_BadArgument(); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3838 return NULL; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3839 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
3840 return PyUnicode_EncodeASCII(PyUnicode_AS_UNICODE(unicode), |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3841 PyUnicode_GET_SIZE(unicode), |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3842 NULL); |
|
11968
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 |
|
24071
8142f8d668a0
Patch #569753: Remove support for WIN16.
Martin v. Löwis <martin@v.loewis.de>
parents:
23837
diff
changeset
|
3845 #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T) |
| 12193 | 3846 |
|
12067
bcab189ddf86
MBCS codecs. (Win32 only.) By Mark Hammond.
Guido van Rossum <guido@python.org>
parents:
12025
diff
changeset
|
3847 /* --- MBCS codecs for Windows -------------------------------------------- */ |
| 12193 | 3848 |
|
52251
b846d709cb76
There is no macro named SIZEOF_SSIZE_T. Should use SIZEOF_SIZE_T instead.
Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
parents:
52210
diff
changeset
|
3849 #if SIZEOF_INT < SIZEOF_SIZE_T |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3850 #define NEED_RETRY |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3851 #endif |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3852 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3853 /* XXX This code is limited to "true" double-byte encodings, as |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3854 a) it assumes an incomplete character consists of a single byte, and |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3855 b) IsDBCSLeadByte (probably) does not work for non-DBCS multi-byte |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3856 encodings, see IsDBCSLeadByteEx documentation. */ |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3857 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3858 static int is_dbcs_lead_byte(const char *s, int offset) |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3859 { |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3860 const char *curr = s + offset; |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3861 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3862 if (IsDBCSLeadByte(*curr)) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3863 const char *prev = CharPrev(s, curr); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3864 return (prev == curr) || !IsDBCSLeadByte(*prev) || (curr - prev == 2); |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3865 } |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3866 return 0; |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3867 } |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3868 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3869 /* |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3870 * Decode MBCS string into unicode object. If 'final' is set, converts |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3871 * trailing lead-byte too. Returns consumed size if succeed, -1 otherwise. |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3872 */ |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3873 static int decode_mbcs(PyUnicodeObject **v, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3874 const char *s, /* MBCS string */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3875 int size, /* sizeof MBCS string */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3876 int final) |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3877 { |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3878 Py_UNICODE *p; |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3879 Py_ssize_t n = 0; |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3880 int usize = 0; |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3881 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3882 assert(size >= 0); |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3883 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3884 /* Skip trailing lead-byte unless 'final' is set */ |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3885 if (!final && size >= 1 && is_dbcs_lead_byte(s, size - 1)) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3886 --size; |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3887 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3888 /* First get the size of the result */ |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3889 if (size > 0) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3890 usize = MultiByteToWideChar(CP_ACP, 0, s, size, NULL, 0); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3891 if (usize == 0) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3892 PyErr_SetFromWindowsErrWithFilename(0, NULL); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3893 return -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3894 } |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3895 } |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3896 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3897 if (*v == NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3898 /* Create unicode object */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3899 *v = _PyUnicode_New(usize); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3900 if (*v == NULL) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3901 return -1; |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3902 } |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3903 else { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3904 /* Extend unicode object */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3905 n = PyUnicode_GET_SIZE(*v); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3906 if (_PyUnicode_Resize(v, n + usize) < 0) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3907 return -1; |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3908 } |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3909 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3910 /* Do the conversion */ |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3911 if (size > 0) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3912 p = PyUnicode_AS_UNICODE(*v) + n; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3913 if (0 == MultiByteToWideChar(CP_ACP, 0, s, size, p, usize)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3914 PyErr_SetFromWindowsErrWithFilename(0, NULL); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3915 return -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3916 } |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3917 } |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3918 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3919 return size; |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3920 } |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3921 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3922 PyObject *PyUnicode_DecodeMBCSStateful(const char *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3923 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3924 const char *errors, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3925 Py_ssize_t *consumed) |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3926 { |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3927 PyUnicodeObject *v = NULL; |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3928 int done; |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3929 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3930 if (consumed) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3931 *consumed = 0; |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3932 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3933 #ifdef NEED_RETRY |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3934 retry: |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3935 if (size > INT_MAX) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3936 done = decode_mbcs(&v, s, INT_MAX, 0); |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3937 else |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3938 #endif |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3939 done = decode_mbcs(&v, s, (int)size, !consumed); |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3940 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3941 if (done < 0) { |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3942 Py_XDECREF(v); |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3943 return NULL; |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3944 } |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3945 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3946 if (consumed) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3947 *consumed += done; |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3948 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3949 #ifdef NEED_RETRY |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3950 if (size > INT_MAX) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3951 s += done; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3952 size -= done; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3953 goto retry; |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3954 } |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3955 #endif |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3956 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3957 return (PyObject *)v; |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3958 } |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3959 |
|
12067
bcab189ddf86
MBCS codecs. (Win32 only.) By Mark Hammond.
Guido van Rossum <guido@python.org>
parents:
12025
diff
changeset
|
3960 PyObject *PyUnicode_DecodeMBCS(const char *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3961 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3962 const char *errors) |
|
12067
bcab189ddf86
MBCS codecs. (Win32 only.) By Mark Hammond.
Guido van Rossum <guido@python.org>
parents:
12025
diff
changeset
|
3963 { |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3964 return PyUnicode_DecodeMBCSStateful(s, size, errors, NULL); |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3965 } |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3966 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3967 /* |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3968 * Convert unicode into string object (MBCS). |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3969 * Returns 0 if succeed, -1 otherwise. |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3970 */ |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3971 static int encode_mbcs(PyObject **repr, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3972 const Py_UNICODE *p, /* unicode */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3973 int size) /* size of unicode */ |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3974 { |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3975 int mbcssize = 0; |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3976 Py_ssize_t n = 0; |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3977 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3978 assert(size >= 0); |
|
12067
bcab189ddf86
MBCS codecs. (Win32 only.) By Mark Hammond.
Guido van Rossum <guido@python.org>
parents:
12025
diff
changeset
|
3979 |
|
bcab189ddf86
MBCS codecs. (Win32 only.) By Mark Hammond.
Guido van Rossum <guido@python.org>
parents:
12025
diff
changeset
|
3980 /* First get the size of the result */ |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3981 if (size > 0) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3982 mbcssize = WideCharToMultiByte(CP_ACP, 0, p, size, NULL, 0, NULL, NULL); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3983 if (mbcssize == 0) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3984 PyErr_SetFromWindowsErrWithFilename(0, NULL); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3985 return -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3986 } |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3987 } |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3988 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3989 if (*repr == NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3990 /* Create string object */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3991 *repr = PyString_FromStringAndSize(NULL, mbcssize); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3992 if (*repr == NULL) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3993 return -1; |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3994 } |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
3995 else { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3996 /* Extend string object */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3997 n = PyString_Size(*repr); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3998 if (_PyString_Resize(repr, n + mbcssize) < 0) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
3999 return -1; |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4000 } |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4001 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4002 /* Do the conversion */ |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4003 if (size > 0) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4004 char *s = PyString_AS_STRING(*repr) + n; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4005 if (0 == WideCharToMultiByte(CP_ACP, 0, p, size, s, mbcssize, NULL, NULL)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4006 PyErr_SetFromWindowsErrWithFilename(0, NULL); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4007 return -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4008 } |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4009 } |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4010 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4011 return 0; |
|
12067
bcab189ddf86
MBCS codecs. (Win32 only.) By Mark Hammond.
Guido van Rossum <guido@python.org>
parents:
12025
diff
changeset
|
4012 } |
|
bcab189ddf86
MBCS codecs. (Win32 only.) By Mark Hammond.
Guido van Rossum <guido@python.org>
parents:
12025
diff
changeset
|
4013 |
|
bcab189ddf86
MBCS codecs. (Win32 only.) By Mark Hammond.
Guido van Rossum <guido@python.org>
parents:
12025
diff
changeset
|
4014 PyObject *PyUnicode_EncodeMBCS(const Py_UNICODE *p, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4015 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4016 const char *errors) |
|
12067
bcab189ddf86
MBCS codecs. (Win32 only.) By Mark Hammond.
Guido van Rossum <guido@python.org>
parents:
12025
diff
changeset
|
4017 { |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4018 PyObject *repr = NULL; |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4019 int ret; |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4020 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4021 #ifdef NEED_RETRY |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4022 retry: |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4023 if (size > INT_MAX) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4024 ret = encode_mbcs(&repr, p, INT_MAX); |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4025 else |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4026 #endif |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4027 ret = encode_mbcs(&repr, p, (int)size); |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4028 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4029 if (ret < 0) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4030 Py_XDECREF(repr); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4031 return NULL; |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4032 } |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4033 |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4034 #ifdef NEED_RETRY |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4035 if (size > INT_MAX) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4036 p += INT_MAX; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4037 size -= INT_MAX; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4038 goto retry; |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4039 } |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4040 #endif |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4041 |
|
12067
bcab189ddf86
MBCS codecs. (Win32 only.) By Mark Hammond.
Guido van Rossum <guido@python.org>
parents:
12025
diff
changeset
|
4042 return repr; |
|
bcab189ddf86
MBCS codecs. (Win32 only.) By Mark Hammond.
Guido van Rossum <guido@python.org>
parents:
12025
diff
changeset
|
4043 } |
| 12193 | 4044 |
|
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
|
4045 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
|
4046 { |
|
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
|
4047 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
|
4048 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
|
4049 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
|
4050 } |
|
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
|
4051 return PyUnicode_EncodeMBCS(PyUnicode_AS_UNICODE(unicode), |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4052 PyUnicode_GET_SIZE(unicode), |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4053 NULL); |
|
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
|
4054 } |
|
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
|
4055 |
|
38817
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4056 #undef NEED_RETRY |
|
549c547700af
Patch #1455898: Incremental mode for "mbcs" codec.
Martin v. Löwis <martin@v.loewis.de>
parents:
38786
diff
changeset
|
4057 |
|
24071
8142f8d668a0
Patch #569753: Remove support for WIN16.
Martin v. Löwis <martin@v.loewis.de>
parents:
23837
diff
changeset
|
4058 #endif /* MS_WINDOWS */ |
|
12067
bcab189ddf86
MBCS codecs. (Win32 only.) By Mark Hammond.
Guido van Rossum <guido@python.org>
parents:
12025
diff
changeset
|
4059 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4060 /* --- Character Mapping Codec -------------------------------------------- */ |
|
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 PyObject *PyUnicode_DecodeCharmap(const char *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4063 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4064 PyObject *mapping, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4065 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
|
4066 { |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4067 const char *starts = s; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
4068 Py_ssize_t startinpos; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
4069 Py_ssize_t endinpos; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
4070 Py_ssize_t outpos; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4071 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
|
4072 PyUnicodeObject *v; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4073 Py_UNICODE *p; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
4074 Py_ssize_t 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
|
4075 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
|
4076 PyObject *exc = NULL; |
|
35702
22a720b35314
Part of SF patch #1313939: Speedup charmap decoding by extending
Walter Dörwald <walter@livinglogic.de>
parents:
35485
diff
changeset
|
4077 Py_UNICODE *mapstring = NULL; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
4078 Py_ssize_t maplen = 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
|
4079 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4080 /* 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
|
4081 if (mapping == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4082 return PyUnicode_DecodeLatin1(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
|
4083 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4084 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
|
4085 if (v == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4086 goto onError; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4087 if (size == 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4088 return (PyObject *)v; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4089 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
|
4090 e = s + size; |
|
35702
22a720b35314
Part of SF patch #1313939: Speedup charmap decoding by extending
Walter Dörwald <walter@livinglogic.de>
parents:
35485
diff
changeset
|
4091 if (PyUnicode_CheckExact(mapping)) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4092 mapstring = PyUnicode_AS_UNICODE(mapping); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4093 maplen = PyUnicode_GET_SIZE(mapping); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4094 while (s < e) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4095 unsigned char ch = *s; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4096 Py_UNICODE x = 0xfffe; /* illegal value */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4097 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4098 if (ch < maplen) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4099 x = mapstring[ch]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4100 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4101 if (x == 0xfffe) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4102 /* undefined mapping */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4103 outpos = p-PyUnicode_AS_UNICODE(v); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4104 startinpos = s-starts; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4105 endinpos = startinpos+1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4106 if (unicode_decode_call_errorhandler( |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4107 errors, &errorHandler, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4108 "charmap", "character maps to <undefined>", |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4109 starts, size, &startinpos, &endinpos, &exc, &s, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4110 &v, &outpos, &p)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4111 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4112 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4113 continue; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4114 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4115 *p++ = x; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4116 ++s; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4117 } |
|
35702
22a720b35314
Part of SF patch #1313939: Speedup charmap decoding by extending
Walter Dörwald <walter@livinglogic.de>
parents:
35485
diff
changeset
|
4118 } |
|
22a720b35314
Part of SF patch #1313939: Speedup charmap decoding by extending
Walter Dörwald <walter@livinglogic.de>
parents:
35485
diff
changeset
|
4119 else { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4120 while (s < e) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4121 unsigned char ch = *s; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4122 PyObject *w, *x; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4123 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4124 /* Get mapping (char ordinal -> integer, Unicode char or None) */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4125 w = PyInt_FromLong((long)ch); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4126 if (w == NULL) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4127 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4128 x = PyObject_GetItem(mapping, w); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4129 Py_DECREF(w); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4130 if (x == NULL) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4131 if (PyErr_ExceptionMatches(PyExc_LookupError)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4132 /* No mapping found means: mapping is undefined. */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4133 PyErr_Clear(); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4134 x = Py_None; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4135 Py_INCREF(x); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4136 } else |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4137 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4138 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4139 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4140 /* Apply mapping */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4141 if (PyInt_Check(x)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4142 long value = PyInt_AS_LONG(x); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4143 if (value < 0 || value > 65535) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4144 PyErr_SetString(PyExc_TypeError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4145 "character mapping must be in range(65536)"); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4146 Py_DECREF(x); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4147 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4148 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4149 *p++ = (Py_UNICODE)value; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4150 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4151 else if (x == Py_None) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4152 /* undefined mapping */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4153 outpos = p-PyUnicode_AS_UNICODE(v); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4154 startinpos = s-starts; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4155 endinpos = startinpos+1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4156 if (unicode_decode_call_errorhandler( |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4157 errors, &errorHandler, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4158 "charmap", "character maps to <undefined>", |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4159 starts, size, &startinpos, &endinpos, &exc, &s, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4160 &v, &outpos, &p)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4161 Py_DECREF(x); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4162 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4163 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4164 Py_DECREF(x); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4165 continue; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4166 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4167 else if (PyUnicode_Check(x)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4168 Py_ssize_t targetsize = PyUnicode_GET_SIZE(x); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4169 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4170 if (targetsize == 1) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4171 /* 1-1 mapping */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4172 *p++ = *PyUnicode_AS_UNICODE(x); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4173 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4174 else if (targetsize > 1) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4175 /* 1-n mapping */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4176 if (targetsize > extrachars) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4177 /* resize first */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4178 Py_ssize_t oldpos = p - PyUnicode_AS_UNICODE(v); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4179 Py_ssize_t needed = (targetsize - extrachars) + \ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4180 (targetsize << 2); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4181 extrachars += needed; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4182 /* XXX overflow detection missing */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4183 if (_PyUnicode_Resize(&v, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4184 PyUnicode_GET_SIZE(v) + needed) < 0) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4185 Py_DECREF(x); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4186 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4187 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4188 p = PyUnicode_AS_UNICODE(v) + oldpos; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4189 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4190 Py_UNICODE_COPY(p, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4191 PyUnicode_AS_UNICODE(x), |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4192 targetsize); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4193 p += targetsize; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4194 extrachars -= targetsize; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4195 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4196 /* 1-0 mapping: skip the character */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4197 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4198 else { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4199 /* wrong return value */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4200 PyErr_SetString(PyExc_TypeError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4201 "character mapping must return integer, None or unicode"); |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4202 Py_DECREF(x); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4203 goto onError; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4204 } |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4205 Py_DECREF(x); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4206 ++s; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4207 } |
|
11968
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 if (p - PyUnicode_AS_UNICODE(v) < PyUnicode_GET_SIZE(v)) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4210 if (_PyUnicode_Resize(&v, p - PyUnicode_AS_UNICODE(v)) < 0) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4211 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
|
4212 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
|
4213 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
|
4214 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
|
4215 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4216 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
|
4217 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
|
4218 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
|
4219 Py_XDECREF(v); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4220 return NULL; |
|
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 |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4223 /* Charmap encoding: the lookup table */ |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4224 |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4225 struct encoding_map{ |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4226 PyObject_HEAD |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4227 unsigned char level1[32]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4228 int count2, count3; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4229 unsigned char level23[1]; |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4230 }; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4231 |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4232 static PyObject* |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4233 encoding_map_size(PyObject *obj, PyObject* args) |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4234 { |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4235 struct encoding_map *map = (struct encoding_map*)obj; |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4236 return PyInt_FromLong(sizeof(*map) - 1 + 16*map->count2 + |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4237 128*map->count3); |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4238 } |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4239 |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4240 static PyMethodDef encoding_map_methods[] = { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4241 {"size", encoding_map_size, METH_NOARGS, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4242 PyDoc_STR("Return the size (in bytes) of this object") }, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4243 { 0 } |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4244 }; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4245 |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4246 static void |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4247 encoding_map_dealloc(PyObject* o) |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4248 { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4249 PyObject_FREE(o); |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4250 } |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4251 |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4252 static PyTypeObject EncodingMapType = { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4253 PyVarObject_HEAD_INIT(NULL, 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4254 "EncodingMap", /*tp_name*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4255 sizeof(struct encoding_map), /*tp_basicsize*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4256 0, /*tp_itemsize*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4257 /* methods */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4258 encoding_map_dealloc, /*tp_dealloc*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4259 0, /*tp_print*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4260 0, /*tp_getattr*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4261 0, /*tp_setattr*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4262 0, /*tp_compare*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4263 0, /*tp_repr*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4264 0, /*tp_as_number*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4265 0, /*tp_as_sequence*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4266 0, /*tp_as_mapping*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4267 0, /*tp_hash*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4268 0, /*tp_call*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4269 0, /*tp_str*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4270 0, /*tp_getattro*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4271 0, /*tp_setattro*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4272 0, /*tp_as_buffer*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4273 Py_TPFLAGS_DEFAULT, /*tp_flags*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4274 0, /*tp_doc*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4275 0, /*tp_traverse*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4276 0, /*tp_clear*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4277 0, /*tp_richcompare*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4278 0, /*tp_weaklistoffset*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4279 0, /*tp_iter*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4280 0, /*tp_iternext*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4281 encoding_map_methods, /*tp_methods*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4282 0, /*tp_members*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4283 0, /*tp_getset*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4284 0, /*tp_base*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4285 0, /*tp_dict*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4286 0, /*tp_descr_get*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4287 0, /*tp_descr_set*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4288 0, /*tp_dictoffset*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4289 0, /*tp_init*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4290 0, /*tp_alloc*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4291 0, /*tp_new*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4292 0, /*tp_free*/ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4293 0, /*tp_is_gc*/ |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4294 }; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4295 |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4296 PyObject* |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4297 PyUnicode_BuildEncodingMap(PyObject* string) |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4298 { |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4299 Py_UNICODE *decode; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4300 PyObject *result; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4301 struct encoding_map *mresult; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4302 int i; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4303 int need_dict = 0; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4304 unsigned char level1[32]; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4305 unsigned char level2[512]; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4306 unsigned char *mlevel1, *mlevel2, *mlevel3; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4307 int count2 = 0, count3 = 0; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4308 |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4309 if (!PyUnicode_Check(string) || PyUnicode_GetSize(string) != 256) { |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4310 PyErr_BadArgument(); |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4311 return NULL; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4312 } |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4313 decode = PyUnicode_AS_UNICODE(string); |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4314 memset(level1, 0xFF, sizeof level1); |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4315 memset(level2, 0xFF, sizeof level2); |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4316 |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4317 /* If there isn't a one-to-one mapping of NULL to \0, |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4318 or if there are non-BMP characters, we need to use |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4319 a mapping dictionary. */ |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4320 if (decode[0] != 0) |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4321 need_dict = 1; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4322 for (i = 1; i < 256; i++) { |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4323 int l1, l2; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4324 if (decode[i] == 0 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4325 #ifdef Py_UNICODE_WIDE |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4326 || decode[i] > 0xFFFF |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4327 #endif |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4328 ) { |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4329 need_dict = 1; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4330 break; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4331 } |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4332 if (decode[i] == 0xFFFE) |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4333 /* unmapped character */ |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4334 continue; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4335 l1 = decode[i] >> 11; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4336 l2 = decode[i] >> 7; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4337 if (level1[l1] == 0xFF) |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4338 level1[l1] = count2++; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4339 if (level2[l2] == 0xFF) |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4340 level2[l2] = count3++; |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4341 } |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4342 |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4343 if (count2 >= 0xFF || count3 >= 0xFF) |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4344 need_dict = 1; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4345 |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4346 if (need_dict) { |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4347 PyObject *result = PyDict_New(); |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4348 PyObject *key, *value; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4349 if (!result) |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4350 return NULL; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4351 for (i = 0; i < 256; i++) { |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4352 key = value = NULL; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4353 key = PyInt_FromLong(decode[i]); |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4354 value = PyInt_FromLong(i); |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4355 if (!key || !value) |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4356 goto failed1; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4357 if (PyDict_SetItem(result, key, value) == -1) |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4358 goto failed1; |
|
38587
21969b71c36d
Repair refleaks in unicodeobject.
Georg Brandl <georg@python.org>
parents:
38586
diff
changeset
|
4359 Py_DECREF(key); |
|
21969b71c36d
Repair refleaks in unicodeobject.
Georg Brandl <georg@python.org>
parents:
38586
diff
changeset
|
4360 Py_DECREF(value); |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4361 } |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4362 return result; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4363 failed1: |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4364 Py_XDECREF(key); |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4365 Py_XDECREF(value); |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4366 Py_DECREF(result); |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4367 return NULL; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4368 } |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4369 |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4370 /* Create a three-level trie */ |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4371 result = PyObject_MALLOC(sizeof(struct encoding_map) + |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4372 16*count2 + 128*count3 - 1); |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4373 if (!result) |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4374 return PyErr_NoMemory(); |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4375 PyObject_Init(result, &EncodingMapType); |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4376 mresult = (struct encoding_map*)result; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4377 mresult->count2 = count2; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4378 mresult->count3 = count3; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4379 mlevel1 = mresult->level1; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4380 mlevel2 = mresult->level23; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4381 mlevel3 = mresult->level23 + 16*count2; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4382 memcpy(mlevel1, level1, 32); |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4383 memset(mlevel2, 0xFF, 16*count2); |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4384 memset(mlevel3, 0, 128*count3); |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4385 count3 = 0; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4386 for (i = 1; i < 256; i++) { |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4387 int o1, o2, o3, i2, i3; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4388 if (decode[i] == 0xFFFE) |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4389 /* unmapped character */ |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4390 continue; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4391 o1 = decode[i]>>11; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4392 o2 = (decode[i]>>7) & 0xF; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4393 i2 = 16*mlevel1[o1] + o2; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4394 if (mlevel2[i2] == 0xFF) |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4395 mlevel2[i2] = count3++; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4396 o3 = decode[i] & 0x7F; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4397 i3 = 128*mlevel2[i2] + o3; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4398 mlevel3[i3] = i; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4399 } |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4400 return result; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4401 } |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4402 |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4403 static int |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4404 encoding_map_lookup(Py_UNICODE c, PyObject *mapping) |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4405 { |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4406 struct encoding_map *map = (struct encoding_map*)mapping; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4407 int l1 = c>>11; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4408 int l2 = (c>>7) & 0xF; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4409 int l3 = c & 0x7F; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4410 int i; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4411 |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4412 #ifdef Py_UNICODE_WIDE |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4413 if (c > 0xFFFF) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4414 return -1; |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4415 } |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4416 #endif |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4417 if (c == 0) |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4418 return 0; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4419 /* level 1*/ |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4420 i = map->level1[l1]; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4421 if (i == 0xFF) { |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4422 return -1; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4423 } |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4424 /* level 2*/ |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4425 i = map->level23[16*i+l2]; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4426 if (i == 0xFF) { |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4427 return -1; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4428 } |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4429 /* level 3 */ |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4430 i = map->level23[16*map->count2 + 128*i + l3]; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4431 if (i == 0) { |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4432 return -1; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4433 } |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4434 return i; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4435 } |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4436 |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4437 /* 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
|
4438 can't be found, Py_None is returned (or NULL, if another |
|
35806
44fe157255bc
fix typos, mostly in comments
Fred Drake <fdrake@acm.org>
parents:
35758
diff
changeset
|
4439 error 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
|
4440 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
|
4441 { |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4442 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
|
4443 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
|
4444 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4445 if (w == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4446 return NULL; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4447 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
|
4448 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
|
4449 if (x == NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4450 if (PyErr_ExceptionMatches(PyExc_LookupError)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4451 /* No mapping found means: mapping is undefined. */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4452 PyErr_Clear(); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4453 x = Py_None; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4454 Py_INCREF(x); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4455 return x; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4456 } else |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4457 return NULL; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4458 } |
|
27175
47b134bb51c3
Fix charmapencode_lookup(), so that a None value in the mapping
Walter Dörwald <walter@livinglogic.de>
parents:
27170
diff
changeset
|
4459 else if (x == Py_None) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4460 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
|
4461 else if (PyInt_Check(x)) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4462 long value = PyInt_AS_LONG(x); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4463 if (value < 0 || value > 255) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4464 PyErr_SetString(PyExc_TypeError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4465 "character mapping must be in range(256)"); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4466 Py_DECREF(x); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4467 return NULL; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4468 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4469 return x; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4470 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4471 else if (PyString_Check(x)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4472 return x; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4473 else { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4474 /* wrong return value */ |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4475 PyErr_SetString(PyExc_TypeError, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4476 "character mapping must return integer, None or str"); |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4477 Py_DECREF(x); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4478 return NULL; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4479 } |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4480 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4481 |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4482 static int |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4483 charmapencode_resize(PyObject **outobj, Py_ssize_t *outpos, Py_ssize_t requiredsize) |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4484 { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4485 Py_ssize_t outsize = PyString_GET_SIZE(*outobj); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4486 /* exponentially overallocate to minimize reallocations */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4487 if (requiredsize < 2*outsize) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4488 requiredsize = 2*outsize; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4489 if (_PyString_Resize(outobj, requiredsize)) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4490 return 0; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4491 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4492 return 1; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4493 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4494 |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4495 typedef enum charmapencode_result { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4496 enc_SUCCESS, enc_FAILED, enc_EXCEPTION |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4497 }charmapencode_result; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4498 /* 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
|
4499 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
|
4500 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
|
4501 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
|
4502 (in which case no character was written) or NULL, if a |
| 35827 | 4503 reallocation error occurred. The caller 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
|
4504 static |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4505 charmapencode_result charmapencode_output(Py_UNICODE c, PyObject *mapping, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4506 PyObject **outobj, Py_ssize_t *outpos) |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4507 { |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4508 PyObject *rep; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4509 char *outstart; |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
4510 Py_ssize_t outsize = PyString_GET_SIZE(*outobj); |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4511 |
|
44350
26384b8180c7
#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available.
Christian Heimes <christian@cheimes.de>
parents:
43932
diff
changeset
|
4512 if (Py_TYPE(mapping) == &EncodingMapType) { |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4513 int res = encoding_map_lookup(c, mapping); |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4514 Py_ssize_t requiredsize = *outpos+1; |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4515 if (res == -1) |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4516 return enc_FAILED; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4517 if (outsize<requiredsize) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4518 if (!charmapencode_resize(outobj, outpos, requiredsize)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4519 return enc_EXCEPTION; |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
4520 outstart = PyString_AS_STRING(*outobj); |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4521 outstart[(*outpos)++] = (char)res; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4522 return enc_SUCCESS; |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4523 } |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4524 |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4525 rep = charmapencode_lookup(c, 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
|
4526 if (rep==NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4527 return enc_EXCEPTION; |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4528 else if (rep==Py_None) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4529 Py_DECREF(rep); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4530 return enc_FAILED; |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4531 } else { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4532 if (PyInt_Check(rep)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4533 Py_ssize_t requiredsize = *outpos+1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4534 if (outsize<requiredsize) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4535 if (!charmapencode_resize(outobj, outpos, requiredsize)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4536 Py_DECREF(rep); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4537 return enc_EXCEPTION; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4538 } |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
4539 outstart = PyString_AS_STRING(*outobj); |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4540 outstart[(*outpos)++] = (char)PyInt_AS_LONG(rep); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4541 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4542 else { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4543 const char *repchars = PyString_AS_STRING(rep); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4544 Py_ssize_t repsize = PyString_GET_SIZE(rep); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4545 Py_ssize_t requiredsize = *outpos+repsize; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4546 if (outsize<requiredsize) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4547 if (!charmapencode_resize(outobj, outpos, requiredsize)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4548 Py_DECREF(rep); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4549 return enc_EXCEPTION; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4550 } |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
4551 outstart = PyString_AS_STRING(*outobj); |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4552 memcpy(outstart + *outpos, repchars, repsize); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4553 *outpos += repsize; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4554 } |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4555 } |
|
38587
21969b71c36d
Repair refleaks in unicodeobject.
Georg Brandl <georg@python.org>
parents:
38586
diff
changeset
|
4556 Py_DECREF(rep); |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4557 return enc_SUCCESS; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4558 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4559 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4560 /* 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
|
4561 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
|
4562 static |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4563 int charmap_encoding_error( |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
4564 const Py_UNICODE *p, Py_ssize_t size, Py_ssize_t *inpos, PyObject *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
|
4565 PyObject **exceptionObject, |
|
30149
59bad7efff02
Fix refcount leak in PyUnicode_EncodeCharmap(). The bug surfaces
Walter Dörwald <walter@livinglogic.de>
parents:
29706
diff
changeset
|
4566 int *known_errorHandler, PyObject **errorHandler, const char *errors, |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
4567 PyObject **res, Py_ssize_t *respos) |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4568 { |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4569 PyObject *repunicode = NULL; /* initialize to prevent gcc warning */ |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
4570 Py_ssize_t repsize; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
4571 Py_ssize_t newpos; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4572 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
|
4573 /* startpos for collecting unencodable chars */ |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
4574 Py_ssize_t collstartpos = *inpos; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
4575 Py_ssize_t collendpos = *inpos+1; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
4576 Py_ssize_t collpos; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4577 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
|
4578 char *reason = "character maps to <undefined>"; |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4579 charmapencode_result x; |
|
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4580 |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4581 /* 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
|
4582 while (collendpos < size) { |
|
38586
9e0b050ce46f
Patch #1359618: Speed-up charmap encoder.
Martin v. Löwis <martin@v.loewis.de>
parents:
38441
diff
changeset
|
4583 PyObject *rep; |
|
44350
26384b8180c7
#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available.
Christian Heimes <christian@cheimes.de>
parents:
43932
diff
changeset
|
4584 if (Py_TYPE(mapping) == &EncodingMapType) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4585 int res = encoding_map_lookup(p[collendpos], mapping); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4586 if (res != -1) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4587 break; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4588 ++collendpos; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4589 continue; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4590 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4591 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4592 rep = charmapencode_lookup(p[collendpos], mapping); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4593 if (rep==NULL) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4594 return -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4595 else if (rep!=Py_None) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4596 Py_DECREF(rep); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4597 break; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4598 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4599 Py_DECREF(rep); |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4600 ++collendpos; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4601 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4602 /* 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
|
4603 * (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
|
4604 if (*known_errorHandler==-1) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4605 if ((errors==NULL) || (!strcmp(errors, "strict"))) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4606 *known_errorHandler = 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4607 else if (!strcmp(errors, "replace")) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4608 *known_errorHandler = 2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4609 else if (!strcmp(errors, "ignore")) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4610 *known_errorHandler = 3; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4611 else if (!strcmp(errors, "xmlcharrefreplace")) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4612 *known_errorHandler = 4; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4613 else |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4614 *known_errorHandler = 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
|
4615 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4616 switch (*known_errorHandler) { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4617 case 1: /* strict */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4618 raise_encode_exception(exceptionObject, encoding, p, size, collstartpos, collendpos, reason); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4619 return -1; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4620 case 2: /* replace */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4621 for (collpos = collstartpos; collpos<collendpos; ++collpos) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4622 x = charmapencode_output('?', mapping, res, respos); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4623 if (x==enc_EXCEPTION) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4624 return -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4625 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4626 else if (x==enc_FAILED) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4627 raise_encode_exception(exceptionObject, encoding, p, size, collstartpos, collendpos, reason); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4628 return -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4629 } |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4630 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4631 /* fall through */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4632 case 3: /* ignore */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4633 *inpos = collendpos; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4634 break; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4635 case 4: /* xmlcharrefreplace */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4636 /* generate replacement (temporarily (mis)uses p) */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4637 for (collpos = collstartpos; collpos < collendpos; ++collpos) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4638 char buffer[2+29+1+1]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4639 char *cp; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4640 sprintf(buffer, "&#%d;", (int)p[collpos]); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4641 for (cp = buffer; *cp; ++cp) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4642 x = charmapencode_output(*cp, mapping, res, respos); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4643 if (x==enc_EXCEPTION) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4644 return -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4645 else if (x==enc_FAILED) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4646 raise_encode_exception(exceptionObject, encoding, p, size, collstartpos, collendpos, reason); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4647 return -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4648 } |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4649 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4650 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4651 *inpos = collendpos; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4652 break; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4653 default: |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4654 repunicode = unicode_encode_call_errorhandler(errors, errorHandler, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4655 encoding, reason, p, size, exceptionObject, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4656 collstartpos, collendpos, &newpos); |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4657 if (repunicode == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4658 return -1; |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4659 /* generate replacement */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4660 repsize = PyUnicode_GET_SIZE(repunicode); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4661 for (uni2 = PyUnicode_AS_UNICODE(repunicode); repsize-->0; ++uni2) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4662 x = charmapencode_output(*uni2, mapping, res, respos); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4663 if (x==enc_EXCEPTION) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4664 return -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4665 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4666 else if (x==enc_FAILED) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4667 Py_DECREF(repunicode); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4668 raise_encode_exception(exceptionObject, encoding, p, size, collstartpos, collendpos, reason); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4669 return -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4670 } |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4671 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4672 *inpos = newpos; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4673 Py_DECREF(repunicode); |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4674 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4675 return 0; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4676 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4677 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4678 PyObject *PyUnicode_EncodeCharmap(const Py_UNICODE *p, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4679 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4680 PyObject *mapping, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4681 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
|
4682 { |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4683 /* 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
|
4684 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
|
4685 /* current input position */ |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
4686 Py_ssize_t inpos = 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
|
4687 /* current output position */ |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
4688 Py_ssize_t respos = 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
|
4689 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
|
4690 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
|
4691 /* 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
|
4692 * -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
|
4693 * 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
|
4694 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
|
4695 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4696 /* 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
|
4697 if (mapping == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4698 return PyUnicode_EncodeLatin1(p, size, errors); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4699 |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4700 /* 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
|
4701 replacements, if we need more, we'll resize */ |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
4702 res = PyString_FromStringAndSize(NULL, size); |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4703 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
|
4704 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
|
4705 if (size == 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4706 return 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
|
4707 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4708 while (inpos<size) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4709 /* try to encode it */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4710 charmapencode_result x = charmapencode_output(p[inpos], mapping, &res, &respos); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4711 if (x==enc_EXCEPTION) /* error */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4712 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4713 if (x==enc_FAILED) { /* unencodable character */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4714 if (charmap_encoding_error(p, size, &inpos, mapping, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4715 &exc, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4716 &known_errorHandler, &errorHandler, errors, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4717 &res, &respos)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4718 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4719 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4720 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4721 else |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4722 /* done with this character => adjust input position */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4723 ++inpos; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4724 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4725 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4726 /* Resize if we allocated to much */ |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
4727 if (respos<PyString_GET_SIZE(res)) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4728 if (_PyString_Resize(&res, respos)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4729 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
|
4730 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4731 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
|
4732 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
|
4733 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
|
4734 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4735 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
|
4736 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
|
4737 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
|
4738 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
|
4739 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4740 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4741 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4742 PyObject *PyUnicode_AsCharmapString(PyObject *unicode, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4743 PyObject *mapping) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4744 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4745 if (!PyUnicode_Check(unicode) || mapping == NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4746 PyErr_BadArgument(); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4747 return NULL; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4748 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4749 return PyUnicode_EncodeCharmap(PyUnicode_AS_UNICODE(unicode), |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4750 PyUnicode_GET_SIZE(unicode), |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4751 mapping, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4752 NULL); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4753 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4754 |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4755 /* 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
|
4756 static void make_translate_exception(PyObject **exceptionObject, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4757 const Py_UNICODE *unicode, Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4758 Py_ssize_t startpos, Py_ssize_t endpos, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4759 const char *reason) |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4760 { |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4761 if (*exceptionObject == NULL) { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4762 *exceptionObject = PyUnicodeTranslateError_Create( |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4763 unicode, size, startpos, endpos, reason); |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4764 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4765 else { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4766 if (PyUnicodeTranslateError_SetStart(*exceptionObject, startpos)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4767 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4768 if (PyUnicodeTranslateError_SetEnd(*exceptionObject, endpos)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4769 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4770 if (PyUnicodeTranslateError_SetReason(*exceptionObject, reason)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4771 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4772 return; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4773 onError: |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4774 Py_DECREF(*exceptionObject); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4775 *exceptionObject = NULL; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4776 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4777 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4778 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4779 /* 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
|
4780 static void raise_translate_exception(PyObject **exceptionObject, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4781 const Py_UNICODE *unicode, Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4782 Py_ssize_t startpos, Py_ssize_t endpos, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4783 const char *reason) |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4784 { |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4785 make_translate_exception(exceptionObject, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4786 unicode, size, startpos, endpos, reason); |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4787 if (*exceptionObject != NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4788 PyCodec_StrictErrors(*exceptionObject); |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4789 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4790 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4791 /* 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
|
4792 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
|
4793 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
|
4794 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
|
4795 static PyObject *unicode_translate_call_errorhandler(const char *errors, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4796 PyObject **errorHandler, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4797 const char *reason, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4798 const Py_UNICODE *unicode, Py_ssize_t size, PyObject **exceptionObject, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4799 Py_ssize_t startpos, Py_ssize_t endpos, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4800 Py_ssize_t *newpos) |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4801 { |
|
37662
0678ce9fb6b2
Change more ints to Py_ssize_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
37661
diff
changeset
|
4802 static char *argparse = "O!n;translating error handler must return (unicode, int) tuple"; |
|
0678ce9fb6b2
Change more ints to Py_ssize_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
37661
diff
changeset
|
4803 |
|
0678ce9fb6b2
Change more ints to Py_ssize_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
37661
diff
changeset
|
4804 Py_ssize_t i_newpos; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4805 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
|
4806 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
|
4807 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4808 if (*errorHandler == NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4809 *errorHandler = PyCodec_LookupError(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
|
4810 if (*errorHandler == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4811 return NULL; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4812 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4813 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4814 make_translate_exception(exceptionObject, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4815 unicode, size, startpos, endpos, reason); |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4816 if (*exceptionObject == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4817 return NULL; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4818 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4819 restuple = PyObject_CallFunctionObjArgs( |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4820 *errorHandler, *exceptionObject, NULL); |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4821 if (restuple == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4822 return NULL; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4823 if (!PyTuple_Check(restuple)) { |
|
51598
512c5a5de00b
Fix warnings GCC emits where the argument of PyErr_Format is a single variable.
Georg Brandl <georg@python.org>
parents:
51218
diff
changeset
|
4824 PyErr_SetString(PyExc_TypeError, &argparse[4]); |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4825 Py_DECREF(restuple); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4826 return NULL; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4827 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4828 if (!PyArg_ParseTuple(restuple, argparse, &PyUnicode_Type, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4829 &resunicode, &i_newpos)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4830 Py_DECREF(restuple); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4831 return NULL; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4832 } |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
4833 if (i_newpos<0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4834 *newpos = size+i_newpos; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
4835 else |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
4836 *newpos = i_newpos; |
|
27555
c267f28724dd
Change the treatment of positions returned by PEP293
Walter Dörwald <walter@livinglogic.de>
parents:
27521
diff
changeset
|
4837 if (*newpos<0 || *newpos>size) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4838 PyErr_Format(PyExc_IndexError, "position %zd from error handler out of bounds", *newpos); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4839 Py_DECREF(restuple); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4840 return NULL; |
|
27555
c267f28724dd
Change the treatment of positions returned by PEP293
Walter Dörwald <walter@livinglogic.de>
parents:
27521
diff
changeset
|
4841 } |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4842 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
|
4843 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
|
4844 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
|
4845 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4846 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4847 /* 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
|
4848 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
|
4849 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
|
4850 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
|
4851 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
|
4852 { |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4853 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
|
4854 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
|
4855 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4856 if (w == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4857 return -1; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4858 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
|
4859 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
|
4860 if (x == NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4861 if (PyErr_ExceptionMatches(PyExc_LookupError)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4862 /* No mapping found means: use 1:1 mapping. */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4863 PyErr_Clear(); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4864 *result = NULL; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4865 return 0; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4866 } else |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4867 return -1; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4868 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4869 else if (x == Py_None) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4870 *result = x; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4871 return 0; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4872 } |
|
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 else if (PyInt_Check(x)) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4874 long value = PyInt_AS_LONG(x); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4875 long max = PyUnicode_GetMax(); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4876 if (value < 0 || value > max) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4877 PyErr_Format(PyExc_TypeError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4878 "character mapping must be in range(0x%lx)", max+1); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4879 Py_DECREF(x); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4880 return -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4881 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4882 *result = x; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4883 return 0; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4884 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4885 else if (PyUnicode_Check(x)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4886 *result = x; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4887 return 0; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4888 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4889 else { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4890 /* wrong return value */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4891 PyErr_SetString(PyExc_TypeError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4892 "character mapping must return integer, None or unicode"); |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4893 Py_DECREF(x); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4894 return -1; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
4895 } |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4896 } |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4897 /* ensure that *outobj is at least requiredsize characters long, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4898 if not reallocate and adjust various state variables. |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4899 Return 0 on success, -1 on 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
|
4900 static |
|
30765
fe3f5592305d
Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap().
Walter Dörwald <walter@livinglogic.de>
parents:
30707
diff
changeset
|
4901 int charmaptranslate_makespace(PyObject **outobj, Py_UNICODE **outp, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4902 Py_ssize_t requiredsize) |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
4903 { |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
4904 Py_ssize_t oldsize = PyUnicode_GET_SIZE(*outobj); |
|
30765
fe3f5592305d
Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap().
Walter Dörwald <walter@livinglogic.de>
parents:
30707
diff
changeset
|
4905 if (requiredsize > oldsize) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4906 /* remember old output position */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4907 Py_ssize_t outpos = *outp-PyUnicode_AS_UNICODE(*outobj); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4908 /* exponentially overallocate to minimize reallocations */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4909 if (requiredsize < 2 * oldsize) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4910 requiredsize = 2 * oldsize; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4911 if (PyUnicode_Resize(outobj, requiredsize) < 0) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4912 return -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4913 *outp = PyUnicode_AS_UNICODE(*outobj) + outpos; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4914 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4915 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
|
4916 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4917 /* 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
|
4918 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
|
4919 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
|
4920 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
|
4921 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
|
4922 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
|
4923 static |
|
30765
fe3f5592305d
Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap().
Walter Dörwald <walter@livinglogic.de>
parents:
30707
diff
changeset
|
4924 int charmaptranslate_output(const Py_UNICODE *startinp, const Py_UNICODE *curinp, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4925 Py_ssize_t insize, PyObject *mapping, PyObject **outobj, Py_UNICODE **outp, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4926 PyObject **res) |
|
30765
fe3f5592305d
Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap().
Walter Dörwald <walter@livinglogic.de>
parents:
30707
diff
changeset
|
4927 { |
|
fe3f5592305d
Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap().
Walter Dörwald <walter@livinglogic.de>
parents:
30707
diff
changeset
|
4928 if (charmaptranslate_lookup(*curinp, mapping, res)) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4929 return -1; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4930 if (*res==NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4931 /* not found => default to 1:1 mapping */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4932 *(*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
|
4933 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4934 else if (*res==Py_None) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4935 ; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4936 else if (PyInt_Check(*res)) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4937 /* no overflow check, because we know that the space is enough */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4938 *(*outp)++ = (Py_UNICODE)PyInt_AS_LONG(*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
|
4939 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4940 else if (PyUnicode_Check(*res)) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4941 Py_ssize_t repsize = PyUnicode_GET_SIZE(*res); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4942 if (repsize==1) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4943 /* no overflow check, because we know that the space is enough */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4944 *(*outp)++ = *PyUnicode_AS_UNICODE(*res); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4945 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4946 else if (repsize!=0) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4947 /* more than one character */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4948 Py_ssize_t requiredsize = (*outp-PyUnicode_AS_UNICODE(*outobj)) + |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4949 (insize - (curinp-startinp)) + |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4950 repsize - 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4951 if (charmaptranslate_makespace(outobj, outp, requiredsize)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4952 return -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4953 memcpy(*outp, PyUnicode_AS_UNICODE(*res), sizeof(Py_UNICODE)*repsize); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4954 *outp += repsize; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4955 } |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4956 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4957 else |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4958 return -1; |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4959 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
|
4960 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4961 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4962 PyObject *PyUnicode_TranslateCharmap(const Py_UNICODE *p, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4963 Py_ssize_t size, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4964 PyObject *mapping, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4965 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
|
4966 { |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4967 /* 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
|
4968 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
|
4969 /* 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
|
4970 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
|
4971 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
|
4972 /* 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
|
4973 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
|
4974 /* current output position */ |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
4975 Py_ssize_t respos = 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
|
4976 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
|
4977 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
|
4978 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
|
4979 /* 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
|
4980 * -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
|
4981 * 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
|
4982 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
|
4983 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4984 if (mapping == NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4985 PyErr_BadArgument(); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4986 return NULL; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4987 } |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4988 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4989 /* 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
|
4990 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
|
4991 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
|
4992 if (res == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4993 goto onError; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
4994 if (size == 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4995 return 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
|
4996 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
|
4997 |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
4998 while (p<endp) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
4999 /* try to encode it */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5000 PyObject *x = NULL; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5001 if (charmaptranslate_output(startp, p, size, mapping, &res, &str, &x)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5002 Py_XDECREF(x); |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
5003 goto onError; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5004 } |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
5005 Py_XDECREF(x); |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5006 if (x!=Py_None) /* it worked => adjust input pointer */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5007 ++p; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5008 else { /* untranslatable character */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5009 PyObject *repunicode = NULL; /* initialize to prevent gcc warning */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5010 Py_ssize_t repsize; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5011 Py_ssize_t newpos; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5012 Py_UNICODE *uni2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5013 /* startpos for collecting untranslatable chars */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5014 const Py_UNICODE *collstart = p; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5015 const Py_UNICODE *collend = p+1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5016 const Py_UNICODE *coll; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5017 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5018 /* find all untranslatable characters */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5019 while (collend < endp) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5020 if (charmaptranslate_lookup(*collend, mapping, &x)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5021 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5022 Py_XDECREF(x); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5023 if (x!=Py_None) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5024 break; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5025 ++collend; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5026 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5027 /* cache callback name lookup |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5028 * (if not done yet, i.e. it's the first error) */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5029 if (known_errorHandler==-1) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5030 if ((errors==NULL) || (!strcmp(errors, "strict"))) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5031 known_errorHandler = 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5032 else if (!strcmp(errors, "replace")) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5033 known_errorHandler = 2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5034 else if (!strcmp(errors, "ignore")) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5035 known_errorHandler = 3; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5036 else if (!strcmp(errors, "xmlcharrefreplace")) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5037 known_errorHandler = 4; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5038 else |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5039 known_errorHandler = 0; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5040 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5041 switch (known_errorHandler) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5042 case 1: /* strict */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5043 raise_translate_exception(&exc, startp, size, collstart-startp, collend-startp, reason); |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
5044 goto onError; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5045 case 2: /* replace */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5046 /* No need to check for space, this is a 1:1 replacement */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5047 for (coll = collstart; coll<collend; ++coll) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5048 *str++ = '?'; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5049 /* fall through */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5050 case 3: /* ignore */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5051 p = collend; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5052 break; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5053 case 4: /* xmlcharrefreplace */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5054 /* generate replacement (temporarily (mis)uses p) */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5055 for (p = collstart; p < collend; ++p) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5056 char buffer[2+29+1+1]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5057 char *cp; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5058 sprintf(buffer, "&#%d;", (int)*p); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5059 if (charmaptranslate_makespace(&res, &str, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5060 (str-PyUnicode_AS_UNICODE(res))+strlen(buffer)+(endp-collend))) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5061 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5062 for (cp = buffer; *cp; ++cp) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5063 *str++ = *cp; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5064 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5065 p = collend; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5066 break; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5067 default: |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5068 repunicode = unicode_translate_call_errorhandler(errors, &errorHandler, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5069 reason, startp, size, &exc, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5070 collstart-startp, collend-startp, &newpos); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5071 if (repunicode == NULL) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5072 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5073 /* generate replacement */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5074 repsize = PyUnicode_GET_SIZE(repunicode); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5075 if (charmaptranslate_makespace(&res, &str, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5076 (str-PyUnicode_AS_UNICODE(res))+repsize+(endp-collend))) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5077 Py_DECREF(repunicode); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5078 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5079 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5080 for (uni2 = PyUnicode_AS_UNICODE(repunicode); repsize-->0; ++uni2) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5081 *str++ = *uni2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5082 p = startp + newpos; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5083 Py_DECREF(repunicode); |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
5084 } |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5085 } |
|
25091
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
5086 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
5087 /* 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
|
5088 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
|
5089 if (respos<PyUnicode_GET_SIZE(res)) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5090 if (PyUnicode_Resize(&res, respos) < 0) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5091 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
|
5092 } |
|
0337dad8403e
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Walter Dörwald <walter@livinglogic.de>
parents:
25005
diff
changeset
|
5093 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
|
5094 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
|
5095 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
|
5096 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5097 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
|
5098 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
|
5099 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
|
5100 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
|
5101 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5102 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5103 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5104 PyObject *PyUnicode_Translate(PyObject *str, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5105 PyObject *mapping, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5106 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
|
5107 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5108 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
|
5109 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5110 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
|
5111 if (str == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5112 goto onError; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5113 result = PyUnicode_TranslateCharmap(PyUnicode_AS_UNICODE(str), |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5114 PyUnicode_GET_SIZE(str), |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5115 mapping, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5116 errors); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5117 Py_DECREF(str); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5118 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
|
5119 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5120 onError: |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5121 Py_XDECREF(str); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5122 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5123 } |
|
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
|
5124 |
|
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
|
5125 /* --- 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
|
5126 |
|
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
|
5127 int PyUnicode_EncodeDecimal(Py_UNICODE *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5128 Py_ssize_t length, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5129 char *output, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5130 const char *errors) |
|
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
|
5131 { |
|
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
|
5132 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
|
5133 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
|
5134 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
|
5135 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
|
5136 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
|
5137 /* 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
|
5138 * -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
|
5139 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
|
5140 |
|
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
|
5141 if (output == NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5142 PyErr_BadArgument(); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5143 return -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
|
5144 } |
|
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
|
5145 |
|
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
|
5146 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
|
5147 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
|
5148 while (p < end) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5149 register Py_UNICODE ch = *p; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5150 int decimal; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5151 PyObject *repunicode; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5152 Py_ssize_t repsize; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5153 Py_ssize_t newpos; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5154 Py_UNICODE *uni2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5155 Py_UNICODE *collstart; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5156 Py_UNICODE *collend; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5157 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5158 if (Py_UNICODE_ISSPACE(ch)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5159 *output++ = ' '; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5160 ++p; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5161 continue; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5162 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5163 decimal = Py_UNICODE_TODECIMAL(ch); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5164 if (decimal >= 0) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5165 *output++ = '0' + decimal; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5166 ++p; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5167 continue; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5168 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5169 if (0 < ch && ch < 256) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5170 *output++ = (char)ch; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5171 ++p; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5172 continue; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5173 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5174 /* All other characters are considered unencodable */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5175 collstart = p; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5176 collend = p+1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5177 while (collend < end) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5178 if ((0 < *collend && *collend < 256) || |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5179 !Py_UNICODE_ISSPACE(*collend) || |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5180 Py_UNICODE_TODECIMAL(*collend)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5181 break; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5182 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5183 /* cache callback name lookup |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5184 * (if not done yet, i.e. it's the first error) */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5185 if (known_errorHandler==-1) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5186 if ((errors==NULL) || (!strcmp(errors, "strict"))) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5187 known_errorHandler = 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5188 else if (!strcmp(errors, "replace")) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5189 known_errorHandler = 2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5190 else if (!strcmp(errors, "ignore")) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5191 known_errorHandler = 3; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5192 else if (!strcmp(errors, "xmlcharrefreplace")) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5193 known_errorHandler = 4; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5194 else |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5195 known_errorHandler = 0; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5196 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5197 switch (known_errorHandler) { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
5198 case 1: /* strict */ |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5199 raise_encode_exception(&exc, encoding, s, length, collstart-s, collend-s, reason); |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
5200 goto onError; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5201 case 2: /* replace */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5202 for (p = collstart; p < collend; ++p) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5203 *output++ = '?'; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5204 /* fall through */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5205 case 3: /* ignore */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5206 p = collend; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5207 break; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5208 case 4: /* xmlcharrefreplace */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5209 /* generate replacement (temporarily (mis)uses p) */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5210 for (p = collstart; p < collend; ++p) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5211 output += sprintf(output, "&#%d;", (int)*p); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5212 p = collend; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5213 break; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5214 default: |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5215 repunicode = unicode_encode_call_errorhandler(errors, &errorHandler, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5216 encoding, reason, s, length, &exc, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5217 collstart-s, collend-s, &newpos); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5218 if (repunicode == NULL) |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
5219 goto onError; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5220 /* generate replacement */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5221 repsize = PyUnicode_GET_SIZE(repunicode); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5222 for (uni2 = PyUnicode_AS_UNICODE(repunicode); repsize-->0; ++uni2) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5223 Py_UNICODE ch = *uni2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5224 if (Py_UNICODE_ISSPACE(ch)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5225 *output++ = ' '; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5226 else { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5227 decimal = Py_UNICODE_TODECIMAL(ch); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5228 if (decimal >= 0) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5229 *output++ = '0' + decimal; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5230 else if (0 < ch && ch < 256) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5231 *output++ = (char)ch; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5232 else { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5233 Py_DECREF(repunicode); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5234 raise_encode_exception(&exc, encoding, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5235 s, length, collstart-s, collend-s, reason); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5236 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5237 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5238 } |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
5239 } |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5240 p = s + newpos; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5241 Py_DECREF(repunicode); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5242 } |
|
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
|
5243 } |
|
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
|
5244 /* 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
|
5245 *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
|
5246 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
|
5247 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
|
5248 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
|
5249 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5250 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
|
5251 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
|
5252 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
|
5253 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
|
5254 } |
|
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
|
5255 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5256 /* --- Helpers ------------------------------------------------------------ */ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5257 |
|
45381
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45341
diff
changeset
|
5258 #include "stringlib/unicodedefs.h" |
|
38381
b32f9bb2e077
needforspeed: stringlib refactoring (in progress)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38347
diff
changeset
|
5259 #include "stringlib/fastsearch.h" |
|
38400
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
5260 |
|
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
5261 #include "stringlib/count.h" |
|
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
5262 #include "stringlib/find.h" |
|
38383
05744917b7c3
needforspeed: stringlib refactoring (in progress)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38381
diff
changeset
|
5263 #include "stringlib/partition.h" |
|
58288
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5264 #include "stringlib/split.h" |
|
38383
05744917b7c3
needforspeed: stringlib refactoring (in progress)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38381
diff
changeset
|
5265 |
|
38402
6b03a47eb54d
needforspeed: use a macro to fix slice indexes
Fredrik Lundh <fredrik@pythonware.com>
parents:
38401
diff
changeset
|
5266 /* helper macro to fixup start/end slice values */ |
|
58288
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5267 #define ADJUST_INDICES(start, end, len) \ |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5268 if (end > len) \ |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5269 end = len; \ |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5270 else if (end < 0) { \ |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5271 end += len; \ |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5272 if (end < 0) \ |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5273 end = 0; \ |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5274 } \ |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5275 if (start < 0) { \ |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5276 start += len; \ |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5277 if (start < 0) \ |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5278 start = 0; \ |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5279 } |
|
38402
6b03a47eb54d
needforspeed: use a macro to fix slice indexes
Fredrik Lundh <fredrik@pythonware.com>
parents:
38401
diff
changeset
|
5280 |
|
38400
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
5281 Py_ssize_t PyUnicode_Count(PyObject *str, |
|
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
5282 PyObject *substr, |
|
38347
6d8615f9f1cc
use Py_LOCAL also for string and unicode objects
Fredrik Lundh <fredrik@pythonware.com>
parents:
38339
diff
changeset
|
5283 Py_ssize_t start, |
|
38400
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
5284 Py_ssize_t end) |
|
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
5285 { |
|
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
5286 Py_ssize_t result; |
|
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
5287 PyUnicodeObject* str_obj; |
|
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
5288 PyUnicodeObject* sub_obj; |
|
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
5289 |
|
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
5290 str_obj = (PyUnicodeObject*) PyUnicode_FromObject(str); |
|
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
5291 if (!str_obj) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5292 return -1; |
|
38400
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
5293 sub_obj = (PyUnicodeObject*) PyUnicode_FromObject(substr); |
|
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
5294 if (!sub_obj) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5295 Py_DECREF(str_obj); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5296 return -1; |
|
38400
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
5297 } |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5298 |
|
58288
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5299 ADJUST_INDICES(start, end, str_obj->length); |
|
38400
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
5300 result = stringlib_count( |
|
58288
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5301 str_obj->str + start, end - start, sub_obj->str, sub_obj->length, |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5302 PY_SSIZE_T_MAX |
|
38275
43b1474b512b
needforspeed: use "fastsearch" for count and findstring helpers. this
Fredrik Lundh <fredrik@pythonware.com>
parents:
38274
diff
changeset
|
5303 ); |
|
38335
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
5304 |
|
38400
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
5305 Py_DECREF(sub_obj); |
|
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
5306 Py_DECREF(str_obj); |
|
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
5307 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5308 return result; |
|
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 |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
5311 Py_ssize_t PyUnicode_Find(PyObject *str, |
|
38424
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
5312 PyObject *sub, |
|
38401
adc214fc1e1c
needforspeed: stringlib refactoring: use stringlib/find for unicode
Fredrik Lundh <fredrik@pythonware.com>
parents:
38400
diff
changeset
|
5313 Py_ssize_t start, |
|
adc214fc1e1c
needforspeed: stringlib refactoring: use stringlib/find for unicode
Fredrik Lundh <fredrik@pythonware.com>
parents:
38400
diff
changeset
|
5314 Py_ssize_t end, |
|
adc214fc1e1c
needforspeed: stringlib refactoring: use stringlib/find for unicode
Fredrik Lundh <fredrik@pythonware.com>
parents:
38400
diff
changeset
|
5315 int direction) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5316 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
5317 Py_ssize_t result; |
|
38424
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
5318 |
|
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
5319 str = PyUnicode_FromObject(str); |
|
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
5320 if (!str) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5321 return -2; |
|
38424
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
5322 sub = PyUnicode_FromObject(sub); |
|
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
5323 if (!sub) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5324 Py_DECREF(str); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5325 return -2; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5326 } |
|
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
|
5327 |
|
38401
adc214fc1e1c
needforspeed: stringlib refactoring: use stringlib/find for unicode
Fredrik Lundh <fredrik@pythonware.com>
parents:
38400
diff
changeset
|
5328 if (direction > 0) |
|
38441
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
5329 result = stringlib_find_slice( |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
5330 PyUnicode_AS_UNICODE(str), PyUnicode_GET_SIZE(str), |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
5331 PyUnicode_AS_UNICODE(sub), PyUnicode_GET_SIZE(sub), |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
5332 start, end |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
5333 ); |
|
38401
adc214fc1e1c
needforspeed: stringlib refactoring: use stringlib/find for unicode
Fredrik Lundh <fredrik@pythonware.com>
parents:
38400
diff
changeset
|
5334 else |
|
38441
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
5335 result = stringlib_rfind_slice( |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
5336 PyUnicode_AS_UNICODE(str), PyUnicode_GET_SIZE(str), |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
5337 PyUnicode_AS_UNICODE(sub), PyUnicode_GET_SIZE(sub), |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
5338 start, end |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
5339 ); |
|
38424
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
5340 |
|
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
5341 Py_DECREF(str); |
|
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
5342 Py_DECREF(sub); |
|
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
5343 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5344 return result; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5345 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5346 |
|
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
|
5347 static |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5348 int tailmatch(PyUnicodeObject *self, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5349 PyUnicodeObject *substring, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5350 Py_ssize_t start, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5351 Py_ssize_t end, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5352 int direction) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5353 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5354 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
|
5355 return 1; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5356 |
|
58288
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5357 ADJUST_INDICES(start, end, self->length); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5358 end -= substring->length; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5359 if (end < start) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5360 return 0; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5361 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5362 if (direction > 0) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5363 if (Py_UNICODE_MATCH(self, end, substring)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5364 return 1; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5365 } else { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5366 if (Py_UNICODE_MATCH(self, start, substring)) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5367 return 1; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5368 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5369 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5370 return 0; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5371 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5372 |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
5373 Py_ssize_t PyUnicode_Tailmatch(PyObject *str, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5374 PyObject *substr, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5375 Py_ssize_t start, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5376 Py_ssize_t end, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5377 int direction) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5378 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
5379 Py_ssize_t 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
|
5380 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5381 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
|
5382 if (str == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5383 return -1; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5384 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
|
5385 if (substr == NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5386 Py_DECREF(str); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5387 return -1; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5388 } |
|
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
|
5389 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5390 result = tailmatch((PyUnicodeObject *)str, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5391 (PyUnicodeObject *)substr, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5392 start, end, direction); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5393 Py_DECREF(str); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5394 Py_DECREF(substr); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5395 return result; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5396 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5397 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5398 /* 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
|
5399 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
|
5400 |
|
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
|
5401 static |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5402 PyObject *fixup(PyUnicodeObject *self, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5403 int (*fixfct)(PyUnicodeObject *s)) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5404 { |
|
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 PyUnicodeObject *u; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5407 |
|
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
|
5408 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
|
5409 if (u == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5410 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
|
5411 |
|
b44ba7c01217
This patch originated from an idea by Martin v. Loewis who submitted a
Marc-André Lemburg <mal@egenix.com>
parents:
17600
diff
changeset
|
5412 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
|
5413 |
|
19885
72e6eb653312
More on bug 460020: disable many optimizations of unicode subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
19849
diff
changeset
|
5414 if (!fixfct(u) && PyUnicode_CheckExact(self)) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5415 /* fixfct should return TRUE if it modified the buffer. If |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5416 FALSE, return a reference to the original buffer instead |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5417 (to save space, not time) */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5418 Py_INCREF(self); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5419 Py_DECREF(u); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5420 return (PyObject*) self; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5421 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5422 return (PyObject*) u; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5423 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5424 |
|
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
|
5425 static |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5426 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
|
5427 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
5428 Py_ssize_t len = self->length; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5429 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
|
5430 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
|
5431 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5432 while (len-- > 0) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5433 register Py_UNICODE ch; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5434 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5435 ch = Py_UNICODE_TOUPPER(*s); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5436 if (ch != *s) { |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5437 status = 1; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5438 *s = ch; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5439 } |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5440 s++; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5441 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5442 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5443 return status; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5444 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5445 |
|
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
|
5446 static |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5447 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
|
5448 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
5449 Py_ssize_t len = self->length; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5450 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
|
5451 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
|
5452 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5453 while (len-- > 0) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5454 register Py_UNICODE ch; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5455 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5456 ch = Py_UNICODE_TOLOWER(*s); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5457 if (ch != *s) { |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5458 status = 1; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5459 *s = ch; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5460 } |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5461 s++; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5462 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5463 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5464 return status; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5465 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5466 |
|
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
|
5467 static |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5468 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
|
5469 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
5470 Py_ssize_t len = self->length; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5471 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
|
5472 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
|
5473 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5474 while (len-- > 0) { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5475 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
|
5476 *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
|
5477 status = 1; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5478 } 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
|
5479 *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
|
5480 status = 1; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5481 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5482 s++; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5483 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5484 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5485 return status; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5486 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5487 |
|
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
|
5488 static |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5489 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
|
5490 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
5491 Py_ssize_t len = self->length; |
|
16332
bacbb45fe844
Fixed .capitalize() method of Unicode objects to work like the
Marc-André Lemburg <mal@egenix.com>
parents:
16226
diff
changeset
|
5492 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
|
5493 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
|
5494 |
|
16332
bacbb45fe844
Fixed .capitalize() method of Unicode objects to work like the
Marc-André Lemburg <mal@egenix.com>
parents:
16226
diff
changeset
|
5495 if (len == 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5496 return 0; |
|
16332
bacbb45fe844
Fixed .capitalize() method of Unicode objects to work like the
Marc-André Lemburg <mal@egenix.com>
parents:
16226
diff
changeset
|
5497 if (Py_UNICODE_ISLOWER(*s)) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5498 *s = Py_UNICODE_TOUPPER(*s); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5499 status = 1; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5500 } |
|
16332
bacbb45fe844
Fixed .capitalize() method of Unicode objects to work like the
Marc-André Lemburg <mal@egenix.com>
parents:
16226
diff
changeset
|
5501 s++; |
|
bacbb45fe844
Fixed .capitalize() method of Unicode objects to work like the
Marc-André Lemburg <mal@egenix.com>
parents:
16226
diff
changeset
|
5502 while (--len > 0) { |
|
bacbb45fe844
Fixed .capitalize() method of Unicode objects to work like the
Marc-André Lemburg <mal@egenix.com>
parents:
16226
diff
changeset
|
5503 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
|
5504 *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
|
5505 status = 1; |
|
bacbb45fe844
Fixed .capitalize() method of Unicode objects to work like the
Marc-André Lemburg <mal@egenix.com>
parents:
16226
diff
changeset
|
5506 } |
|
bacbb45fe844
Fixed .capitalize() method of Unicode objects to work like the
Marc-André Lemburg <mal@egenix.com>
parents:
16226
diff
changeset
|
5507 s++; |
|
bacbb45fe844
Fixed .capitalize() method of Unicode objects to work like the
Marc-André Lemburg <mal@egenix.com>
parents:
16226
diff
changeset
|
5508 } |
|
bacbb45fe844
Fixed .capitalize() method of Unicode objects to work like the
Marc-André Lemburg <mal@egenix.com>
parents:
16226
diff
changeset
|
5509 return status; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5510 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5511 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5512 static |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5513 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
|
5514 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5515 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
|
5516 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
|
5517 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
|
5518 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5519 /* 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
|
5520 if (PyUnicode_GET_SIZE(self) == 1) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5521 Py_UNICODE ch = Py_UNICODE_TOTITLE(*p); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5522 if (*p != ch) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5523 *p = ch; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5524 return 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5525 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5526 else |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5527 return 0; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5528 } |
|
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
|
5529 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5530 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
|
5531 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
|
5532 for (; p < e; p++) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5533 register const Py_UNICODE ch = *p; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5534 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5535 if (previous_is_cased) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5536 *p = Py_UNICODE_TOLOWER(ch); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5537 else |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5538 *p = Py_UNICODE_TOTITLE(ch); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5539 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5540 if (Py_UNICODE_ISLOWER(ch) || |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5541 Py_UNICODE_ISUPPER(ch) || |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5542 Py_UNICODE_ISTITLE(ch)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5543 previous_is_cased = 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5544 else |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5545 previous_is_cased = 0; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5546 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5547 return 1; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5548 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5549 |
|
33300
77de38534d26
PyUnicode_Join(): Two primary aims:
Tim Peters <tim.peters@gmail.com>
parents:
32951
diff
changeset
|
5550 PyObject * |
|
77de38534d26
PyUnicode_Join(): Two primary aims:
Tim Peters <tim.peters@gmail.com>
parents:
32951
diff
changeset
|
5551 PyUnicode_Join(PyObject *separator, PyObject *seq) |
|
77de38534d26
PyUnicode_Join(): Two primary aims:
Tim Peters <tim.peters@gmail.com>
parents:
32951
diff
changeset
|
5552 { |
|
77de38534d26
PyUnicode_Join(): Two primary aims:
Tim Peters <tim.peters@gmail.com>
parents:
32951
diff
changeset
|
5553 PyObject *internal_separator = NULL; |
|
33499
a4d3673bcd66
Initialize sep and seplen to suppress warning from gcc.
Skip Montanaro <skip@pobox.com>
parents:
33495
diff
changeset
|
5554 const Py_UNICODE blank = ' '; |
|
a4d3673bcd66
Initialize sep and seplen to suppress warning from gcc.
Skip Montanaro <skip@pobox.com>
parents:
33495
diff
changeset
|
5555 const Py_UNICODE *sep = ␣ |
|
38240
0373a074004c
PyUnicode_Join(): Recent code changes introduced new
Tim Peters <tim.peters@gmail.com>
parents:
38239
diff
changeset
|
5556 Py_ssize_t seplen = 1; |
|
33310
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5557 PyUnicodeObject *res = NULL; /* the result */ |
|
38240
0373a074004c
PyUnicode_Join(): Recent code changes introduced new
Tim Peters <tim.peters@gmail.com>
parents:
38239
diff
changeset
|
5558 Py_ssize_t res_alloc = 100; /* # allocated bytes for string in res */ |
|
0373a074004c
PyUnicode_Join(): Recent code changes introduced new
Tim Peters <tim.peters@gmail.com>
parents:
38239
diff
changeset
|
5559 Py_ssize_t res_used; /* # used bytes */ |
|
33310
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5560 Py_UNICODE *res_p; /* pointer to free byte in res's string area */ |
|
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5561 PyObject *fseq; /* PySequence_Fast(seq) */ |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
5562 Py_ssize_t seqlen; /* len(fseq) -- number of items in sequence */ |
|
33300
77de38534d26
PyUnicode_Join(): Two primary aims:
Tim Peters <tim.peters@gmail.com>
parents:
32951
diff
changeset
|
5563 PyObject *item; |
|
37662
0678ce9fb6b2
Change more ints to Py_ssize_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
37661
diff
changeset
|
5564 Py_ssize_t i; |
|
33310
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5565 |
|
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5566 fseq = PySequence_Fast(seq, ""); |
|
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5567 if (fseq == NULL) { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
5568 return NULL; |
|
33310
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5569 } |
|
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5570 |
|
33311
59bd121eeeb7
PyUnicode_Join(): Bozo Alert. While this is chugging along, it may
Tim Peters <tim.peters@gmail.com>
parents:
33310
diff
changeset
|
5571 /* Grrrr. A codec may be invoked to convert str objects to |
|
59bd121eeeb7
PyUnicode_Join(): Bozo Alert. While this is chugging along, it may
Tim Peters <tim.peters@gmail.com>
parents:
33310
diff
changeset
|
5572 * Unicode, and so it's possible to call back into Python code |
|
59bd121eeeb7
PyUnicode_Join(): Bozo Alert. While this is chugging along, it may
Tim Peters <tim.peters@gmail.com>
parents:
33310
diff
changeset
|
5573 * during PyUnicode_FromObject(), and so it's possible for a sick |
|
59bd121eeeb7
PyUnicode_Join(): Bozo Alert. While this is chugging along, it may
Tim Peters <tim.peters@gmail.com>
parents:
33310
diff
changeset
|
5574 * codec to change the size of fseq (if seq is a list). Therefore |
|
59bd121eeeb7
PyUnicode_Join(): Bozo Alert. While this is chugging along, it may
Tim Peters <tim.peters@gmail.com>
parents:
33310
diff
changeset
|
5575 * we have to keep refetching the size -- can't assume seqlen |
|
59bd121eeeb7
PyUnicode_Join(): Bozo Alert. While this is chugging along, it may
Tim Peters <tim.peters@gmail.com>
parents:
33310
diff
changeset
|
5576 * is invariant. |
|
59bd121eeeb7
PyUnicode_Join(): Bozo Alert. While this is chugging along, it may
Tim Peters <tim.peters@gmail.com>
parents:
33310
diff
changeset
|
5577 */ |
|
33310
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5578 seqlen = PySequence_Fast_GET_SIZE(fseq); |
|
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5579 /* If empty sequence, return u"". */ |
|
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5580 if (seqlen == 0) { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
5581 res = _PyUnicode_New(0); /* empty sequence; return u"" */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
5582 goto Done; |
|
33310
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5583 } |
|
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5584 /* If singleton sequence with an exact Unicode, return that. */ |
|
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5585 if (seqlen == 1) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5586 item = PySequence_Fast_GET_ITEM(fseq, 0); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5587 if (PyUnicode_CheckExact(item)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5588 Py_INCREF(item); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5589 res = (PyUnicodeObject *)item; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5590 goto Done; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5591 } |
|
33310
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5592 } |
|
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5593 |
|
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5594 /* At least two items to join, or one that isn't exact Unicode. */ |
|
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5595 if (seqlen > 1) { |
|
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5596 /* Set up sep and seplen -- they're needed. */ |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
5597 if (separator == NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5598 sep = ␣ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5599 seplen = 1; |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
5600 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
5601 else { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5602 internal_separator = PyUnicode_FromObject(separator); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5603 if (internal_separator == NULL) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5604 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5605 sep = PyUnicode_AS_UNICODE(internal_separator); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5606 seplen = PyUnicode_GET_SIZE(internal_separator); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5607 /* In case PyUnicode_FromObject() mutated seq. */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5608 seqlen = PySequence_Fast_GET_SIZE(fseq); |
|
33310
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5609 } |
|
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5610 } |
|
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5611 |
|
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5612 /* Get space. */ |
|
37662
0678ce9fb6b2
Change more ints to Py_ssize_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
37661
diff
changeset
|
5613 res = _PyUnicode_New(res_alloc); |
|
33310
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5614 if (res == NULL) |
|
33300
77de38534d26
PyUnicode_Join(): Two primary aims:
Tim Peters <tim.peters@gmail.com>
parents:
32951
diff
changeset
|
5615 goto onError; |
|
33310
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5616 res_p = PyUnicode_AS_UNICODE(res); |
|
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5617 res_used = 0; |
|
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5618 |
|
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5619 for (i = 0; i < seqlen; ++i) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5620 Py_ssize_t itemlen; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5621 Py_ssize_t new_res_used; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5622 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5623 item = PySequence_Fast_GET_ITEM(fseq, i); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5624 /* Convert item to Unicode. */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5625 if (! PyUnicode_Check(item) && ! PyString_Check(item)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5626 PyErr_Format(PyExc_TypeError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5627 "sequence item %zd: expected string or Unicode," |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5628 " %.80s found", |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5629 i, Py_TYPE(item)->tp_name); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5630 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5631 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5632 item = PyUnicode_FromObject(item); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5633 if (item == NULL) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5634 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5635 /* We own a reference to item from here on. */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5636 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5637 /* In case PyUnicode_FromObject() mutated seq. */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5638 seqlen = PySequence_Fast_GET_SIZE(fseq); |
|
33311
59bd121eeeb7
PyUnicode_Join(): Bozo Alert. While this is chugging along, it may
Tim Peters <tim.peters@gmail.com>
parents:
33310
diff
changeset
|
5639 |
|
33310
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5640 /* Make sure we have enough space for the separator and the item. */ |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5641 itemlen = PyUnicode_GET_SIZE(item); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5642 new_res_used = res_used + itemlen; |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
5643 if (new_res_used < 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5644 goto Overflow; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5645 if (i < seqlen - 1) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5646 new_res_used += seplen; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5647 if (new_res_used < 0) |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
5648 goto Overflow; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5649 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5650 if (new_res_used > res_alloc) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5651 /* double allocated size until it's big enough */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5652 do { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5653 res_alloc += res_alloc; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5654 if (res_alloc <= 0) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5655 goto Overflow; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5656 } while (new_res_used > res_alloc); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5657 if (_PyUnicode_Resize(&res, res_alloc) < 0) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5658 Py_DECREF(item); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5659 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5660 } |
|
33310
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5661 res_p = PyUnicode_AS_UNICODE(res) + res_used; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5662 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5663 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5664 /* Copy item, and maybe the separator. */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5665 Py_UNICODE_COPY(res_p, PyUnicode_AS_UNICODE(item), itemlen); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5666 res_p += itemlen; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5667 if (i < seqlen - 1) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5668 Py_UNICODE_COPY(res_p, sep, seplen); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5669 res_p += seplen; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5670 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5671 Py_DECREF(item); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5672 res_used = new_res_used; |
|
33310
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5673 } |
|
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5674 |
|
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5675 /* Shrink res to match the used area; this probably can't fail, |
|
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5676 * but it's cheap to check. |
|
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5677 */ |
|
37662
0678ce9fb6b2
Change more ints to Py_ssize_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
37661
diff
changeset
|
5678 if (_PyUnicode_Resize(&res, res_used) < 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5679 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5680 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5681 Done: |
|
33300
77de38534d26
PyUnicode_Join(): Two primary aims:
Tim Peters <tim.peters@gmail.com>
parents:
32951
diff
changeset
|
5682 Py_XDECREF(internal_separator); |
|
33310
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5683 Py_DECREF(fseq); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5684 return (PyObject *)res; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5685 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5686 Overflow: |
|
33300
77de38534d26
PyUnicode_Join(): Two primary aims:
Tim Peters <tim.peters@gmail.com>
parents:
32951
diff
changeset
|
5687 PyErr_SetString(PyExc_OverflowError, |
|
38709
67450db26f81
Apply perky's fix for #1503157: "/".join([u"", u""]) raising OverflowError.
Georg Brandl <georg@python.org>
parents:
38697
diff
changeset
|
5688 "join() result is too long for a Python string"); |
|
33300
77de38534d26
PyUnicode_Join(): Two primary aims:
Tim Peters <tim.peters@gmail.com>
parents:
32951
diff
changeset
|
5689 Py_DECREF(item); |
|
77de38534d26
PyUnicode_Join(): Two primary aims:
Tim Peters <tim.peters@gmail.com>
parents:
32951
diff
changeset
|
5690 /* fall through */ |
|
77de38534d26
PyUnicode_Join(): Two primary aims:
Tim Peters <tim.peters@gmail.com>
parents:
32951
diff
changeset
|
5691 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5692 onError: |
|
33300
77de38534d26
PyUnicode_Join(): Two primary aims:
Tim Peters <tim.peters@gmail.com>
parents:
32951
diff
changeset
|
5693 Py_XDECREF(internal_separator); |
|
33310
8579859f198c
PyUnicode_Join(): Rewrote to use PySequence_Fast(). This doesn't do
Tim Peters <tim.peters@gmail.com>
parents:
33304
diff
changeset
|
5694 Py_DECREF(fseq); |
|
17687
9e093bf8f6a9
Make unicode.join() work nice with iterators. This also required a change
Tim Peters <tim.peters@gmail.com>
parents:
17640
diff
changeset
|
5695 Py_XDECREF(res); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5696 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5697 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5698 |
|
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
|
5699 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
|
5700 PyUnicodeObject *pad(PyUnicodeObject *self, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5701 Py_ssize_t left, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5702 Py_ssize_t right, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5703 Py_UNICODE fill) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5704 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5705 PyUnicodeObject *u; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5706 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5707 if (left < 0) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5708 left = 0; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5709 if (right < 0) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5710 right = 0; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5711 |
|
19885
72e6eb653312
More on bug 460020: disable many optimizations of unicode subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
19849
diff
changeset
|
5712 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
|
5713 Py_INCREF(self); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5714 return self; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5715 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5716 |
|
48114
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
5717 if (left > PY_SSIZE_T_MAX - self->length || |
|
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
5718 right > PY_SSIZE_T_MAX - (left + self->length)) { |
|
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
5719 PyErr_SetString(PyExc_OverflowError, "padded string is too long"); |
|
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
5720 return NULL; |
|
c4d24fc8ba8a
Security patches from Apple: prevent int overflow when allocating memory
Neal Norwitz <nnorwitz@gmail.com>
parents:
48070
diff
changeset
|
5721 } |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5722 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
|
5723 if (u) { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5724 if (left) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5725 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
|
5726 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
|
5727 if (right) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5728 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
|
5729 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5730 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5731 return u; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5732 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5733 |
|
58288
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5734 PyObject *PyUnicode_Splitlines(PyObject *string, int keepends) |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5735 { |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5736 PyObject *list; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5737 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5738 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
|
5739 if (string == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5740 return NULL; |
|
58288
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5741 |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5742 list = stringlib_splitlines( |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5743 (PyObject*) string, PyUnicode_AS_UNICODE(string), |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5744 PyUnicode_GET_SIZE(string), keepends); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5745 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5746 Py_DECREF(string); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5747 return list; |
|
58288
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5748 } |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5749 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5750 static |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5751 PyObject *split(PyUnicodeObject *self, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5752 PyUnicodeObject *substring, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5753 Py_ssize_t maxcount) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5754 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5755 if (maxcount < 0) |
|
37662
0678ce9fb6b2
Change more ints to Py_ssize_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
37661
diff
changeset
|
5756 maxcount = PY_SSIZE_T_MAX; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5757 |
|
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) |
|
58288
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5759 return stringlib_split_whitespace( |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5760 (PyObject*) self, self->str, self->length, maxcount |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5761 ); |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5762 |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5763 return stringlib_split( |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5764 (PyObject*) self, self->str, self->length, |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5765 substring->str, substring->length, |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5766 maxcount |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5767 ); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5768 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5769 |
|
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
|
5770 static |
|
31199
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
5771 PyObject *rsplit(PyUnicodeObject *self, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5772 PyUnicodeObject *substring, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5773 Py_ssize_t maxcount) |
|
31199
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
5774 { |
|
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
5775 if (maxcount < 0) |
|
37662
0678ce9fb6b2
Change more ints to Py_ssize_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
37661
diff
changeset
|
5776 maxcount = PY_SSIZE_T_MAX; |
|
31199
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
5777 |
|
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
5778 if (substring == NULL) |
|
58288
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5779 return stringlib_rsplit_whitespace( |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5780 (PyObject*) self, self->str, self->length, maxcount |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5781 ); |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5782 |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5783 return stringlib_rsplit( |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5784 (PyObject*) self, self->str, self->length, |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5785 substring->str, substring->length, |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5786 maxcount |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5787 ); |
|
31199
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
5788 } |
|
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
5789 |
|
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
5790 static |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5791 PyObject *replace(PyUnicodeObject *self, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5792 PyUnicodeObject *str1, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5793 PyUnicodeObject *str2, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5794 Py_ssize_t maxcount) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5795 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5796 PyUnicodeObject *u; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5797 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5798 if (maxcount < 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5799 maxcount = PY_SSIZE_T_MAX; |
|
58288
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5800 else if (maxcount == 0 || self->length == 0) |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5801 goto nothing; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5802 |
|
38278
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5803 if (str1->length == str2->length) { |
|
58290
d51358645e60
Fix Windows build (re r77461)
Antoine Pitrou <solipsis@pitrou.net>
parents:
58288
diff
changeset
|
5804 Py_ssize_t i; |
|
38278
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5805 /* same length */ |
|
58288
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5806 if (str1->length == 0) |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5807 goto nothing; |
|
38278
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5808 if (str1->length == 1) { |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5809 /* replace characters */ |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5810 Py_UNICODE u1, u2; |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5811 if (!findchar(self->str, self->length, str1->str[0])) |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5812 goto nothing; |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5813 u = (PyUnicodeObject*) PyUnicode_FromUnicode(NULL, self->length); |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5814 if (!u) |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5815 return NULL; |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5816 Py_UNICODE_COPY(u->str, self->str, self->length); |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5817 u1 = str1->str[0]; |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5818 u2 = str2->str[0]; |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5819 for (i = 0; i < u->length; i++) |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5820 if (u->str[i] == u1) { |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5821 if (--maxcount < 0) |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5822 break; |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5823 u->str[i] = u2; |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5824 } |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5825 } else { |
|
58288
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5826 i = stringlib_find( |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5827 self->str, self->length, str1->str, str1->length, 0 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5828 ); |
|
38278
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5829 if (i < 0) |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5830 goto nothing; |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5831 u = (PyUnicodeObject*) PyUnicode_FromUnicode(NULL, self->length); |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5832 if (!u) |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5833 return NULL; |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5834 Py_UNICODE_COPY(u->str, self->str, self->length); |
|
58288
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5835 |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5836 /* change everything in-place, starting with this one */ |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5837 Py_UNICODE_COPY(u->str+i, str2->str, str2->length); |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5838 i += str1->length; |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5839 |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5840 while ( --maxcount > 0) { |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5841 i = stringlib_find(self->str+i, self->length-i, |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5842 str1->str, str1->length, |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5843 i); |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5844 if (i == -1) |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5845 break; |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5846 Py_UNICODE_COPY(u->str+i, str2->str, str2->length); |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5847 i += str1->length; |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5848 } |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5849 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5850 } else { |
|
38278
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5851 |
|
38440
5b0753b9d16a
needforspeed: replace improvements, changed to Py_LOCAL_INLINE
Fredrik Lundh <fredrik@pythonware.com>
parents:
38427
diff
changeset
|
5852 Py_ssize_t n, i, j, e; |
|
38299
ae6bbf2f2a41
needforspeed: check for overflow in replace (from Andrew Dalke)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38278
diff
changeset
|
5853 Py_ssize_t product, new_size, delta; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5854 Py_UNICODE *p; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5855 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5856 /* replace strings */ |
|
58288
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5857 n = stringlib_count(self->str, self->length, str1->str, str1->length, |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5858 maxcount); |
|
38278
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5859 if (n == 0) |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5860 goto nothing; |
|
38299
ae6bbf2f2a41
needforspeed: check for overflow in replace (from Andrew Dalke)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38278
diff
changeset
|
5861 /* new_size = self->length + n * (str2->length - str1->length)); */ |
|
ae6bbf2f2a41
needforspeed: check for overflow in replace (from Andrew Dalke)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38278
diff
changeset
|
5862 delta = (str2->length - str1->length); |
|
ae6bbf2f2a41
needforspeed: check for overflow in replace (from Andrew Dalke)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38278
diff
changeset
|
5863 if (delta == 0) { |
|
ae6bbf2f2a41
needforspeed: check for overflow in replace (from Andrew Dalke)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38278
diff
changeset
|
5864 new_size = self->length; |
|
ae6bbf2f2a41
needforspeed: check for overflow in replace (from Andrew Dalke)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38278
diff
changeset
|
5865 } else { |
|
ae6bbf2f2a41
needforspeed: check for overflow in replace (from Andrew Dalke)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38278
diff
changeset
|
5866 product = n * (str2->length - str1->length); |
|
ae6bbf2f2a41
needforspeed: check for overflow in replace (from Andrew Dalke)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38278
diff
changeset
|
5867 if ((product / (str2->length - str1->length)) != n) { |
|
ae6bbf2f2a41
needforspeed: check for overflow in replace (from Andrew Dalke)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38278
diff
changeset
|
5868 PyErr_SetString(PyExc_OverflowError, |
|
ae6bbf2f2a41
needforspeed: check for overflow in replace (from Andrew Dalke)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38278
diff
changeset
|
5869 "replace string is too long"); |
|
ae6bbf2f2a41
needforspeed: check for overflow in replace (from Andrew Dalke)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38278
diff
changeset
|
5870 return NULL; |
|
ae6bbf2f2a41
needforspeed: check for overflow in replace (from Andrew Dalke)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38278
diff
changeset
|
5871 } |
|
ae6bbf2f2a41
needforspeed: check for overflow in replace (from Andrew Dalke)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38278
diff
changeset
|
5872 new_size = self->length + product; |
|
ae6bbf2f2a41
needforspeed: check for overflow in replace (from Andrew Dalke)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38278
diff
changeset
|
5873 if (new_size < 0) { |
|
ae6bbf2f2a41
needforspeed: check for overflow in replace (from Andrew Dalke)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38278
diff
changeset
|
5874 PyErr_SetString(PyExc_OverflowError, |
|
ae6bbf2f2a41
needforspeed: check for overflow in replace (from Andrew Dalke)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38278
diff
changeset
|
5875 "replace string is too long"); |
|
ae6bbf2f2a41
needforspeed: check for overflow in replace (from Andrew Dalke)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38278
diff
changeset
|
5876 return NULL; |
|
ae6bbf2f2a41
needforspeed: check for overflow in replace (from Andrew Dalke)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38278
diff
changeset
|
5877 } |
|
ae6bbf2f2a41
needforspeed: check for overflow in replace (from Andrew Dalke)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38278
diff
changeset
|
5878 } |
|
ae6bbf2f2a41
needforspeed: check for overflow in replace (from Andrew Dalke)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38278
diff
changeset
|
5879 u = _PyUnicode_New(new_size); |
|
38278
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5880 if (!u) |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5881 return NULL; |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5882 i = 0; |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5883 p = u->str; |
|
38440
5b0753b9d16a
needforspeed: replace improvements, changed to Py_LOCAL_INLINE
Fredrik Lundh <fredrik@pythonware.com>
parents:
38427
diff
changeset
|
5884 e = self->length - str1->length; |
|
38278
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5885 if (str1->length > 0) { |
|
38440
5b0753b9d16a
needforspeed: replace improvements, changed to Py_LOCAL_INLINE
Fredrik Lundh <fredrik@pythonware.com>
parents:
38427
diff
changeset
|
5886 while (n-- > 0) { |
|
5b0753b9d16a
needforspeed: replace improvements, changed to Py_LOCAL_INLINE
Fredrik Lundh <fredrik@pythonware.com>
parents:
38427
diff
changeset
|
5887 /* look for next match */ |
|
58288
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5888 j = stringlib_find(self->str+i, self->length-i, |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5889 str1->str, str1->length, |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5890 i); |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5891 if (j == -1) |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5892 break; |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
5893 else if (j > i) { |
|
38440
5b0753b9d16a
needforspeed: replace improvements, changed to Py_LOCAL_INLINE
Fredrik Lundh <fredrik@pythonware.com>
parents:
38427
diff
changeset
|
5894 /* copy unchanged part [i:j] */ |
|
5b0753b9d16a
needforspeed: replace improvements, changed to Py_LOCAL_INLINE
Fredrik Lundh <fredrik@pythonware.com>
parents:
38427
diff
changeset
|
5895 Py_UNICODE_COPY(p, self->str+i, j-i); |
|
5b0753b9d16a
needforspeed: replace improvements, changed to Py_LOCAL_INLINE
Fredrik Lundh <fredrik@pythonware.com>
parents:
38427
diff
changeset
|
5896 p += j - i; |
|
5b0753b9d16a
needforspeed: replace improvements, changed to Py_LOCAL_INLINE
Fredrik Lundh <fredrik@pythonware.com>
parents:
38427
diff
changeset
|
5897 } |
|
5b0753b9d16a
needforspeed: replace improvements, changed to Py_LOCAL_INLINE
Fredrik Lundh <fredrik@pythonware.com>
parents:
38427
diff
changeset
|
5898 /* copy substitution string */ |
|
5b0753b9d16a
needforspeed: replace improvements, changed to Py_LOCAL_INLINE
Fredrik Lundh <fredrik@pythonware.com>
parents:
38427
diff
changeset
|
5899 if (str2->length > 0) { |
|
38278
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5900 Py_UNICODE_COPY(p, str2->str, str2->length); |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5901 p += str2->length; |
|
38440
5b0753b9d16a
needforspeed: replace improvements, changed to Py_LOCAL_INLINE
Fredrik Lundh <fredrik@pythonware.com>
parents:
38427
diff
changeset
|
5902 } |
|
5b0753b9d16a
needforspeed: replace improvements, changed to Py_LOCAL_INLINE
Fredrik Lundh <fredrik@pythonware.com>
parents:
38427
diff
changeset
|
5903 i = j + str1->length; |
|
5b0753b9d16a
needforspeed: replace improvements, changed to Py_LOCAL_INLINE
Fredrik Lundh <fredrik@pythonware.com>
parents:
38427
diff
changeset
|
5904 } |
|
5b0753b9d16a
needforspeed: replace improvements, changed to Py_LOCAL_INLINE
Fredrik Lundh <fredrik@pythonware.com>
parents:
38427
diff
changeset
|
5905 if (i < self->length) |
|
5b0753b9d16a
needforspeed: replace improvements, changed to Py_LOCAL_INLINE
Fredrik Lundh <fredrik@pythonware.com>
parents:
38427
diff
changeset
|
5906 /* copy tail [i:] */ |
|
5b0753b9d16a
needforspeed: replace improvements, changed to Py_LOCAL_INLINE
Fredrik Lundh <fredrik@pythonware.com>
parents:
38427
diff
changeset
|
5907 Py_UNICODE_COPY(p, self->str+i, self->length-i); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5908 } else { |
|
38440
5b0753b9d16a
needforspeed: replace improvements, changed to Py_LOCAL_INLINE
Fredrik Lundh <fredrik@pythonware.com>
parents:
38427
diff
changeset
|
5909 /* interleave */ |
|
38278
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5910 while (n > 0) { |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5911 Py_UNICODE_COPY(p, str2->str, str2->length); |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5912 p += str2->length; |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5913 if (--n <= 0) |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5914 break; |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5915 *p++ = self->str[i++]; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5916 } |
|
38278
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5917 Py_UNICODE_COPY(p, self->str+i, self->length-i); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5918 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5919 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5920 return (PyObject *) u; |
|
38278
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5921 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5922 nothing: |
|
38278
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5923 /* nothing to replace; return original string (when possible) */ |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5924 if (PyUnicode_CheckExact(self)) { |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5925 Py_INCREF(self); |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5926 return (PyObject *) self; |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5927 } |
|
260d5a6ce30f
needforspeed: refactored the replace code slightly; special-case
Fredrik Lundh <fredrik@pythonware.com>
parents:
38276
diff
changeset
|
5928 return PyUnicode_FromUnicode(self->str, self->length); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5929 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5930 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5931 /* --- Unicode Object Methods --------------------------------------------- */ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5932 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
5933 PyDoc_STRVAR(title__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5934 "S.title() -> unicode\n\ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5935 \n\ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5936 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
|
5937 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
|
5938 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5939 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
|
5940 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
|
5941 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5942 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
|
5943 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5944 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
5945 PyDoc_STRVAR(capitalize__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5946 "S.capitalize() -> unicode\n\ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5947 \n\ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5948 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
|
5949 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
|
5950 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5951 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
|
5952 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
|
5953 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5954 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
|
5955 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5956 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5957 #if 0 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
5958 PyDoc_STRVAR(capwords__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5959 "S.capwords() -> unicode\n\ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5960 \n\ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5961 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
|
5962 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
|
5963 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5964 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
|
5965 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
|
5966 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5967 PyObject *list; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5968 PyObject *item; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
5969 Py_ssize_t i; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5970 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5971 /* Split into words */ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5972 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
|
5973 if (!list) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5974 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5975 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5976 /* Capitalize each word */ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5977 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
|
5978 item = fixup((PyUnicodeObject *)PyList_GET_ITEM(list, i), |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5979 fixcapitalize); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5980 if (item == NULL) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5981 goto onError; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5982 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
|
5983 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
|
5984 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5985 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5986 /* 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
|
5987 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
|
5988 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
5989 onError: |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5990 Py_DECREF(list); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5991 return (PyObject *)item; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5992 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5993 #endif |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
5994 |
|
31021
21a10c3600b5
Add optional fillchar argument to ljust(), rjust(), and center() string methods.
Raymond Hettinger <python@rcn.com>
parents:
30765
diff
changeset
|
5995 /* 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
|
5996 |
|
21a10c3600b5
Add optional fillchar argument to ljust(), rjust(), and center() string methods.
Raymond Hettinger <python@rcn.com>
parents:
30765
diff
changeset
|
5997 static int |
|
21a10c3600b5
Add optional fillchar argument to ljust(), rjust(), and center() string methods.
Raymond Hettinger <python@rcn.com>
parents:
30765
diff
changeset
|
5998 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
|
5999 { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6000 Py_UNICODE *fillcharloc = (Py_UNICODE *)addr; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6001 PyObject *uniobj; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6002 Py_UNICODE *unistr; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6003 |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6004 uniobj = PyUnicode_FromObject(obj); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6005 if (uniobj == NULL) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6006 PyErr_SetString(PyExc_TypeError, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6007 "The fill character cannot be converted to Unicode"); |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6008 return 0; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6009 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6010 if (PyUnicode_GET_SIZE(uniobj) != 1) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6011 PyErr_SetString(PyExc_TypeError, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6012 "The fill character must be exactly one character long"); |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6013 Py_DECREF(uniobj); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6014 return 0; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6015 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6016 unistr = PyUnicode_AS_UNICODE(uniobj); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6017 *fillcharloc = unistr[0]; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6018 Py_DECREF(uniobj); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6019 return 1; |
|
31021
21a10c3600b5
Add optional fillchar argument to ljust(), rjust(), and center() string methods.
Raymond Hettinger <python@rcn.com>
parents:
30765
diff
changeset
|
6020 } |
|
21a10c3600b5
Add optional fillchar argument to ljust(), rjust(), and center() string methods.
Raymond Hettinger <python@rcn.com>
parents:
30765
diff
changeset
|
6021 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
6022 PyDoc_STRVAR(center__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6023 "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
|
6024 \n\ |
|
31021
21a10c3600b5
Add optional fillchar argument to ljust(), rjust(), and center() string methods.
Raymond Hettinger <python@rcn.com>
parents:
30765
diff
changeset
|
6025 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
|
6026 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
|
6027 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6028 static PyObject * |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6029 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
|
6030 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
6031 Py_ssize_t marg, left; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
6032 Py_ssize_t width; |
|
31021
21a10c3600b5
Add optional fillchar argument to ljust(), rjust(), and center() string methods.
Raymond Hettinger <python@rcn.com>
parents:
30765
diff
changeset
|
6033 Py_UNICODE fillchar = ' '; |
|
21a10c3600b5
Add optional fillchar argument to ljust(), rjust(), and center() string methods.
Raymond Hettinger <python@rcn.com>
parents:
30765
diff
changeset
|
6034 |
|
36532
0c096be27000
Use correct PyArg_Parse format char for Py_ssize_t in unicode.center().
Thomas Wouters <thomas@python.org>
parents:
36519
diff
changeset
|
6035 if (!PyArg_ParseTuple(args, "n|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
|
6036 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6037 |
|
19885
72e6eb653312
More on bug 460020: disable many optimizations of unicode subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
19849
diff
changeset
|
6038 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
|
6039 Py_INCREF(self); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6040 return (PyObject*) self; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6041 } |
|
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 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
|
6044 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
|
6045 |
|
31021
21a10c3600b5
Add optional fillchar argument to ljust(), rjust(), and center() string methods.
Raymond Hettinger <python@rcn.com>
parents:
30765
diff
changeset
|
6046 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
|
6047 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6048 |
|
13890
8f0fc0b5f784
Removing UTF-16 aware Unicode comparison code. This kind of compare
Marc-André Lemburg <mal@egenix.com>
parents:
13837
diff
changeset
|
6049 #if 0 |
|
8f0fc0b5f784
Removing UTF-16 aware Unicode comparison code. This kind of compare
Marc-André Lemburg <mal@egenix.com>
parents:
13837
diff
changeset
|
6050 |
|
8f0fc0b5f784
Removing UTF-16 aware Unicode comparison code. This kind of compare
Marc-André Lemburg <mal@egenix.com>
parents:
13837
diff
changeset
|
6051 /* 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
|
6052 module. The basic comparison should compare ordinals on a naive |
|
54600
8888a6fe9dd7
#6224: s/JPython/Jython/, and remove one link to a module nine years old.
Georg Brandl <georg@python.org>
parents:
53780
diff
changeset
|
6053 basis (this is what Java does and thus Jython too). */ |
|
13890
8f0fc0b5f784
Removing UTF-16 aware Unicode comparison code. This kind of compare
Marc-André Lemburg <mal@egenix.com>
parents:
13837
diff
changeset
|
6054 |
| 13337 | 6055 /* speedy UTF-16 code point order comparison */ |
| 6056 /* gleaned from: */ | |
| 6057 /* http://www-4.ibm.com/software/developer/library/utf16.html?dwzone=unicode */ | |
| 6058 | |
|
13411
9a8391054840
New surrogate support in the UTF-8 codec. By Bill Tutt.
Marc-André Lemburg <mal@egenix.com>
parents:
13401
diff
changeset
|
6059 static short utf16Fixup[32] = |
| 13337 | 6060 { |
|
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
|
6061 0, 0, 0, 0, 0, 0, 0, 0, |
| 13337 | 6062 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
|
6063 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
|
6064 0, 0, 0, 0x2000, -0x800, -0x800, -0x800, -0x800 |
| 13337 | 6065 }; |
| 6066 | |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6067 static int |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6068 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
|
6069 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
6070 Py_ssize_t len1, len2; |
| 13337 | 6071 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6072 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
|
6073 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
|
6074 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6075 len1 = str1->length; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6076 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
|
6077 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6078 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
|
6079 Py_UNICODE c1, c2; |
| 13337 | 6080 |
| 6081 c1 = *s1++; | |
| 6082 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
|
6083 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6084 if (c1 > (1<<11) * 26) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6085 c1 += utf16Fixup[c1>>11]; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6086 if (c2 > (1<<11) * 26) |
| 13337 | 6087 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
|
6088 /* 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
|
6089 |
|
8b7ff44b4669
experimental UCS-4 support: made compare a bit more robust, in case
Fredrik Lundh <fredrik@pythonware.com>
parents:
18278
diff
changeset
|
6090 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
|
6091 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
|
6092 |
| 13337 | 6093 len1--; len2--; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6094 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6095 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6096 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
|
6097 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6098 |
|
13890
8f0fc0b5f784
Removing UTF-16 aware Unicode comparison code. This kind of compare
Marc-André Lemburg <mal@egenix.com>
parents:
13837
diff
changeset
|
6099 #else |
|
8f0fc0b5f784
Removing UTF-16 aware Unicode comparison code. This kind of compare
Marc-André Lemburg <mal@egenix.com>
parents:
13837
diff
changeset
|
6100 |
|
8f0fc0b5f784
Removing UTF-16 aware Unicode comparison code. This kind of compare
Marc-André Lemburg <mal@egenix.com>
parents:
13837
diff
changeset
|
6101 static int |
|
8f0fc0b5f784
Removing UTF-16 aware Unicode comparison code. This kind of compare
Marc-André Lemburg <mal@egenix.com>
parents:
13837
diff
changeset
|
6102 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
|
6103 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
6104 register Py_ssize_t len1, len2; |
|
13890
8f0fc0b5f784
Removing UTF-16 aware Unicode comparison code. This kind of compare
Marc-André Lemburg <mal@egenix.com>
parents:
13837
diff
changeset
|
6105 |
|
8f0fc0b5f784
Removing UTF-16 aware Unicode comparison code. This kind of compare
Marc-André Lemburg <mal@egenix.com>
parents:
13837
diff
changeset
|
6106 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
|
6107 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
|
6108 |
|
8f0fc0b5f784
Removing UTF-16 aware Unicode comparison code. This kind of compare
Marc-André Lemburg <mal@egenix.com>
parents:
13837
diff
changeset
|
6109 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
|
6110 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
|
6111 |
|
13890
8f0fc0b5f784
Removing UTF-16 aware Unicode comparison code. This kind of compare
Marc-André Lemburg <mal@egenix.com>
parents:
13837
diff
changeset
|
6112 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
|
6113 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
|
6114 |
|
8b7ff44b4669
experimental UCS-4 support: made compare a bit more robust, in case
Fredrik Lundh <fredrik@pythonware.com>
parents:
18278
diff
changeset
|
6115 c1 = *s1++; |
|
8b7ff44b4669
experimental UCS-4 support: made compare a bit more robust, in case
Fredrik Lundh <fredrik@pythonware.com>
parents:
18278
diff
changeset
|
6116 c2 = *s2++; |
|
8b7ff44b4669
experimental UCS-4 support: made compare a bit more robust, in case
Fredrik Lundh <fredrik@pythonware.com>
parents:
18278
diff
changeset
|
6117 |
|
8b7ff44b4669
experimental UCS-4 support: made compare a bit more robust, in case
Fredrik Lundh <fredrik@pythonware.com>
parents:
18278
diff
changeset
|
6118 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
|
6119 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
|
6120 |
|
13890
8f0fc0b5f784
Removing UTF-16 aware Unicode comparison code. This kind of compare
Marc-André Lemburg <mal@egenix.com>
parents:
13837
diff
changeset
|
6121 len1--; len2--; |
|
8f0fc0b5f784
Removing UTF-16 aware Unicode comparison code. This kind of compare
Marc-André Lemburg <mal@egenix.com>
parents:
13837
diff
changeset
|
6122 } |
|
8f0fc0b5f784
Removing UTF-16 aware Unicode comparison code. This kind of compare
Marc-André Lemburg <mal@egenix.com>
parents:
13837
diff
changeset
|
6123 |
|
8f0fc0b5f784
Removing UTF-16 aware Unicode comparison code. This kind of compare
Marc-André Lemburg <mal@egenix.com>
parents:
13837
diff
changeset
|
6124 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
|
6125 } |
|
8f0fc0b5f784
Removing UTF-16 aware Unicode comparison code. This kind of compare
Marc-André Lemburg <mal@egenix.com>
parents:
13837
diff
changeset
|
6126 |
|
8f0fc0b5f784
Removing UTF-16 aware Unicode comparison code. This kind of compare
Marc-André Lemburg <mal@egenix.com>
parents:
13837
diff
changeset
|
6127 #endif |
|
8f0fc0b5f784
Removing UTF-16 aware Unicode comparison code. This kind of compare
Marc-André Lemburg <mal@egenix.com>
parents:
13837
diff
changeset
|
6128 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6129 int PyUnicode_Compare(PyObject *left, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6130 PyObject *right) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6131 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6132 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
|
6133 int result; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6134 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6135 /* 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
|
6136 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
|
6137 if (u == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6138 goto onError; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6139 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
|
6140 if (v == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6141 goto onError; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6142 |
|
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
|
6143 /* 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
|
6144 if (v == u) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6145 Py_DECREF(u); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6146 Py_DECREF(v); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6147 return 0; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6148 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6149 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6150 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
|
6151 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6152 Py_DECREF(u); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6153 Py_DECREF(v); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6154 return result; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6155 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6156 onError: |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6157 Py_XDECREF(u); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6158 Py_XDECREF(v); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6159 return -1; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6160 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6161 |
|
39487
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6162 PyObject *PyUnicode_RichCompare(PyObject *left, |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6163 PyObject *right, |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6164 int op) |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6165 { |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6166 int result; |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6167 |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6168 result = PyUnicode_Compare(left, right); |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6169 if (result == -1 && PyErr_Occurred()) |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6170 goto onError; |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6171 |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6172 /* Convert the return value to a Boolean */ |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6173 switch (op) { |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6174 case Py_EQ: |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6175 result = (result == 0); |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6176 break; |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6177 case Py_NE: |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6178 result = (result != 0); |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6179 break; |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6180 case Py_LE: |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6181 result = (result <= 0); |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6182 break; |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6183 case Py_GE: |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6184 result = (result >= 0); |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6185 break; |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6186 case Py_LT: |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6187 result = (result == -1); |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6188 break; |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6189 case Py_GT: |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6190 result = (result == 1); |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6191 break; |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6192 } |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6193 return PyBool_FromLong(result); |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6194 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6195 onError: |
|
39487
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6196 |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6197 /* Standard case |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6198 |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6199 Type errors mean that PyUnicode_FromObject() could not convert |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6200 one of the arguments (usually the right hand side) to Unicode, |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6201 ie. we can't handle the comparison request. However, it is |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6202 possible that the other object knows a comparison method, which |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6203 is why we return Py_NotImplemented to give the other object a |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6204 chance. |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6205 |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6206 */ |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6207 if (PyErr_ExceptionMatches(PyExc_TypeError)) { |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6208 PyErr_Clear(); |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6209 Py_INCREF(Py_NotImplemented); |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6210 return Py_NotImplemented; |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6211 } |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6212 if (op != Py_EQ && op != Py_NE) |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6213 return NULL; |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6214 |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6215 /* Equality comparison. |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6216 |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6217 This is a special case: we silence any PyExc_UnicodeDecodeError |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6218 and instead turn it into a PyErr_UnicodeWarning. |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6219 |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6220 */ |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6221 if (!PyErr_ExceptionMatches(PyExc_UnicodeDecodeError)) |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6222 return NULL; |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6223 PyErr_Clear(); |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6224 if (PyErr_Warn(PyExc_UnicodeWarning, |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6225 (op == Py_EQ) ? |
|
39487
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6226 "Unicode equal comparison " |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6227 "failed to convert both arguments to Unicode - " |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6228 "interpreting them as being unequal" : |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6229 "Unicode unequal comparison " |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6230 "failed to convert both arguments to Unicode - " |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6231 "interpreting them as being unequal" |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6232 ) < 0) |
|
39487
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6233 return NULL; |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6234 result = (op == Py_NE); |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6235 return PyBool_FromLong(result); |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6236 } |
|
635b09b1f542
Slightly revised version of patch #1538956:
Marc-André Lemburg <mal@egenix.com>
parents:
39463
diff
changeset
|
6237 |
|
11997
38310eb0659e
Add sq_contains implementation.
Guido van Rossum <guido@python.org>
parents:
11968
diff
changeset
|
6238 int PyUnicode_Contains(PyObject *container, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6239 PyObject *element) |
|
11997
38310eb0659e
Add sq_contains implementation.
Guido van Rossum <guido@python.org>
parents:
11968
diff
changeset
|
6240 { |
|
38424
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
6241 PyObject *str, *sub; |
|
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
6242 int result; |
|
11997
38310eb0659e
Add sq_contains implementation.
Guido van Rossum <guido@python.org>
parents:
11968
diff
changeset
|
6243 |
|
38310eb0659e
Add sq_contains implementation.
Guido van Rossum <guido@python.org>
parents:
11968
diff
changeset
|
6244 /* Coerce the two arguments */ |
|
38424
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
6245 sub = PyUnicode_FromObject(element); |
|
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
6246 if (!sub) { |
|
38243
0ba711a496e6
needforspeed: fixed unicode "in" operator to use same implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38241
diff
changeset
|
6247 return -1; |
|
0ba711a496e6
needforspeed: fixed unicode "in" operator to use same implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38241
diff
changeset
|
6248 } |
|
0ba711a496e6
needforspeed: fixed unicode "in" operator to use same implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38241
diff
changeset
|
6249 |
|
38424
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
6250 str = PyUnicode_FromObject(container); |
|
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
6251 if (!str) { |
|
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
6252 Py_DECREF(sub); |
|
38243
0ba711a496e6
needforspeed: fixed unicode "in" operator to use same implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38241
diff
changeset
|
6253 return -1; |
|
0ba711a496e6
needforspeed: fixed unicode "in" operator to use same implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38241
diff
changeset
|
6254 } |
|
11997
38310eb0659e
Add sq_contains implementation.
Guido van Rossum <guido@python.org>
parents:
11968
diff
changeset
|
6255 |
|
38424
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
6256 result = stringlib_contains_obj(str, sub); |
|
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
6257 |
|
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
6258 Py_DECREF(str); |
|
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
6259 Py_DECREF(sub); |
|
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
6260 |
|
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
6261 return result; |
|
11997
38310eb0659e
Add sq_contains implementation.
Guido van Rossum <guido@python.org>
parents:
11968
diff
changeset
|
6262 } |
|
38310eb0659e
Add sq_contains implementation.
Guido van Rossum <guido@python.org>
parents:
11968
diff
changeset
|
6263 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6264 /* 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
|
6265 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6266 PyObject *PyUnicode_Concat(PyObject *left, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6267 PyObject *right) |
|
11968
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 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
|
6270 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6271 /* 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
|
6272 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
|
6273 if (u == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6274 goto onError; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6275 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
|
6276 if (v == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6277 goto onError; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6278 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6279 /* Shortcuts */ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6280 if (v == unicode_empty) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6281 Py_DECREF(v); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6282 return (PyObject *)u; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6283 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6284 if (u == unicode_empty) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6285 Py_DECREF(u); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6286 return (PyObject *)v; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6287 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6288 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6289 /* 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
|
6290 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
|
6291 if (w == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6292 goto onError; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6293 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
|
6294 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
|
6295 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6296 Py_DECREF(u); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6297 Py_DECREF(v); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6298 return (PyObject *)w; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6299 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6300 onError: |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6301 Py_XDECREF(u); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6302 Py_XDECREF(v); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6303 return NULL; |
|
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 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
6306 PyDoc_STRVAR(count__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6307 "S.count(sub[, start[, end]]) -> int\n\ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6308 \n\ |
|
38236
7e16fcce34a1
docstring tweaks: count counts non-overlapping substrings, not
Fredrik Lundh <fredrik@pythonware.com>
parents:
38182
diff
changeset
|
6309 Return the number of non-overlapping occurrences of substring sub in\n\ |
|
7e16fcce34a1
docstring tweaks: count counts non-overlapping substrings, not
Fredrik Lundh <fredrik@pythonware.com>
parents:
38182
diff
changeset
|
6310 Unicode string 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
|
6311 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
|
6312 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6313 static PyObject * |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6314 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
|
6315 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6316 PyUnicodeObject *substring; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
6317 Py_ssize_t start = 0; |
|
37662
0678ce9fb6b2
Change more ints to Py_ssize_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
37661
diff
changeset
|
6318 Py_ssize_t end = PY_SSIZE_T_MAX; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6319 PyObject *result; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6320 |
| 12629 | 6321 if (!PyArg_ParseTuple(args, "O|O&O&:count", &substring, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6322 _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
|
6323 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6324 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6325 substring = (PyUnicodeObject *)PyUnicode_FromObject( |
|
38400
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
6326 (PyObject *)substring); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6327 if (substring == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6328 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
|
6329 |
|
58288
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
6330 ADJUST_INDICES(start, end, self->length); |
|
38400
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
6331 result = PyInt_FromSsize_t( |
|
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
6332 stringlib_count(self->str + start, end - start, |
|
58288
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
6333 substring->str, substring->length, |
|
66f1d4a4c799
Issue #7622: Improve the split(), rsplit(), splitlines() and replace()
Antoine Pitrou <solipsis@pitrou.net>
parents:
57729
diff
changeset
|
6334 PY_SSIZE_T_MAX) |
|
38400
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
6335 ); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6336 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6337 Py_DECREF(substring); |
|
38400
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
6338 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6339 return result; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6340 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6341 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
6342 PyDoc_STRVAR(encode__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6343 "S.encode([encoding[,errors]]) -> string or unicode\n\ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6344 \n\ |
|
32551
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6345 Encodes S using the codec registered for encoding. encoding defaults\n\ |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6346 to the default encoding. errors may be given to set a different error\n\ |
|
12645
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
6347 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
|
6348 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
|
6349 '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
|
6350 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
|
6351 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6352 static PyObject * |
|
56093
f64c0eb8cc62
add keyword arguments support to str/unicode encode and decode #6300
Benjamin Peterson <benjamin@python.org>
parents:
56033
diff
changeset
|
6353 unicode_encode(PyUnicodeObject *self, PyObject *args, PyObject *kwargs) |
|
f64c0eb8cc62
add keyword arguments support to str/unicode encode and decode #6300
Benjamin Peterson <benjamin@python.org>
parents:
56033
diff
changeset
|
6354 { |
|
f64c0eb8cc62
add keyword arguments support to str/unicode encode and decode #6300
Benjamin Peterson <benjamin@python.org>
parents:
56033
diff
changeset
|
6355 static char *kwlist[] = {"encoding", "errors", 0}; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6356 char *encoding = NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6357 char *errors = NULL; |
|
32551
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6358 PyObject *v; |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6359 |
|
56093
f64c0eb8cc62
add keyword arguments support to str/unicode encode and decode #6300
Benjamin Peterson <benjamin@python.org>
parents:
56033
diff
changeset
|
6360 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|ss:encode", |
|
f64c0eb8cc62
add keyword arguments support to str/unicode encode and decode #6300
Benjamin Peterson <benjamin@python.org>
parents:
56033
diff
changeset
|
6361 kwlist, &encoding, &errors)) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6362 return NULL; |
|
32551
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6363 v = PyUnicode_AsEncodedObject((PyObject *)self, encoding, errors); |
|
32552
3706a3704aea
.encode()/.decode() patch part 2.
Marc-André Lemburg <mal@egenix.com>
parents:
32551
diff
changeset
|
6364 if (v == NULL) |
|
3706a3704aea
.encode()/.decode() patch part 2.
Marc-André Lemburg <mal@egenix.com>
parents:
32551
diff
changeset
|
6365 goto onError; |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
6366 if (!PyString_Check(v) && !PyUnicode_Check(v)) { |
|
32551
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6367 PyErr_Format(PyExc_TypeError, |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6368 "encoder did not return a string/unicode object " |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6369 "(type=%.400s)", |
|
44350
26384b8180c7
#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available.
Christian Heimes <christian@cheimes.de>
parents:
43932
diff
changeset
|
6370 Py_TYPE(v)->tp_name); |
|
32551
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6371 Py_DECREF(v); |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6372 return NULL; |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6373 } |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6374 return v; |
|
32552
3706a3704aea
.encode()/.decode() patch part 2.
Marc-André Lemburg <mal@egenix.com>
parents:
32551
diff
changeset
|
6375 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6376 onError: |
|
32552
3706a3704aea
.encode()/.decode() patch part 2.
Marc-André Lemburg <mal@egenix.com>
parents:
32551
diff
changeset
|
6377 return NULL; |
|
32551
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6378 } |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6379 |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6380 PyDoc_STRVAR(decode__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6381 "S.decode([encoding[,errors]]) -> string or unicode\n\ |
|
32551
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6382 \n\ |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6383 Decodes S using the codec registered for encoding. encoding defaults\n\ |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6384 to the default encoding. errors may be given to set a different error\n\ |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6385 handling scheme. Default is 'strict' meaning that encoding errors raise\n\ |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6386 a UnicodeDecodeError. Other possible values are 'ignore' and 'replace'\n\ |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6387 as well as any other name registerd with codecs.register_error that is\n\ |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6388 able to handle UnicodeDecodeErrors."); |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6389 |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6390 static PyObject * |
|
56093
f64c0eb8cc62
add keyword arguments support to str/unicode encode and decode #6300
Benjamin Peterson <benjamin@python.org>
parents:
56033
diff
changeset
|
6391 unicode_decode(PyUnicodeObject *self, PyObject *args, PyObject *kwargs) |
|
f64c0eb8cc62
add keyword arguments support to str/unicode encode and decode #6300
Benjamin Peterson <benjamin@python.org>
parents:
56033
diff
changeset
|
6392 { |
|
f64c0eb8cc62
add keyword arguments support to str/unicode encode and decode #6300
Benjamin Peterson <benjamin@python.org>
parents:
56033
diff
changeset
|
6393 static char *kwlist[] = {"encoding", "errors", 0}; |
|
32551
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6394 char *encoding = NULL; |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6395 char *errors = NULL; |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6396 PyObject *v; |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6397 |
|
56093
f64c0eb8cc62
add keyword arguments support to str/unicode encode and decode #6300
Benjamin Peterson <benjamin@python.org>
parents:
56033
diff
changeset
|
6398 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|ss:decode", |
|
f64c0eb8cc62
add keyword arguments support to str/unicode encode and decode #6300
Benjamin Peterson <benjamin@python.org>
parents:
56033
diff
changeset
|
6399 kwlist, &encoding, &errors)) |
|
32551
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6400 return NULL; |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6401 v = PyUnicode_AsDecodedObject((PyObject *)self, encoding, errors); |
|
32552
3706a3704aea
.encode()/.decode() patch part 2.
Marc-André Lemburg <mal@egenix.com>
parents:
32551
diff
changeset
|
6402 if (v == NULL) |
|
3706a3704aea
.encode()/.decode() patch part 2.
Marc-André Lemburg <mal@egenix.com>
parents:
32551
diff
changeset
|
6403 goto onError; |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
6404 if (!PyString_Check(v) && !PyUnicode_Check(v)) { |
|
32551
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6405 PyErr_Format(PyExc_TypeError, |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6406 "decoder did not return a string/unicode object " |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6407 "(type=%.400s)", |
|
44350
26384b8180c7
#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available.
Christian Heimes <christian@cheimes.de>
parents:
43932
diff
changeset
|
6408 Py_TYPE(v)->tp_name); |
|
32551
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6409 Py_DECREF(v); |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6410 return NULL; |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6411 } |
|
f46d49e2e0f0
Allow string and unicode return types from .encode()/.decode()
Marc-André Lemburg <mal@egenix.com>
parents:
32363
diff
changeset
|
6412 return v; |
|
32552
3706a3704aea
.encode()/.decode() patch part 2.
Marc-André Lemburg <mal@egenix.com>
parents:
32551
diff
changeset
|
6413 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6414 onError: |
|
32552
3706a3704aea
.encode()/.decode() patch part 2.
Marc-André Lemburg <mal@egenix.com>
parents:
32551
diff
changeset
|
6415 return NULL; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6416 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6417 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
6418 PyDoc_STRVAR(expandtabs__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6419 "S.expandtabs([tabsize]) -> unicode\n\ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6420 \n\ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6421 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
|
6422 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
|
6423 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6424 static PyObject* |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6425 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
|
6426 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6427 Py_UNICODE *e; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6428 Py_UNICODE *p; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6429 Py_UNICODE *q; |
|
45731
162c6952ea34
Fix the overflows in expandtabs(). "This time for sure!"
Guido van Rossum <guido@python.org>
parents:
45500
diff
changeset
|
6430 Py_UNICODE *qe; |
|
162c6952ea34
Fix the overflows in expandtabs(). "This time for sure!"
Guido van Rossum <guido@python.org>
parents:
45500
diff
changeset
|
6431 Py_ssize_t i, j, incr; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6432 PyUnicodeObject *u; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6433 int tabsize = 8; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6434 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6435 if (!PyArg_ParseTuple(args, "|i:expandtabs", &tabsize)) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6436 return NULL; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6437 |
|
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
|
6438 /* First pass: determine size of output string */ |
|
45731
162c6952ea34
Fix the overflows in expandtabs(). "This time for sure!"
Guido van Rossum <guido@python.org>
parents:
45500
diff
changeset
|
6439 i = 0; /* chars up to and including most recent \n or \r */ |
|
162c6952ea34
Fix the overflows in expandtabs(). "This time for sure!"
Guido van Rossum <guido@python.org>
parents:
45500
diff
changeset
|
6440 j = 0; /* chars since most recent \n or \r (use in tab calculations) */ |
|
162c6952ea34
Fix the overflows in expandtabs(). "This time for sure!"
Guido van Rossum <guido@python.org>
parents:
45500
diff
changeset
|
6441 e = self->str + self->length; /* end of input */ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6442 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
|
6443 if (*p == '\t') { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6444 if (tabsize > 0) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6445 incr = tabsize - (j % tabsize); /* cannot overflow */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6446 if (j > PY_SSIZE_T_MAX - incr) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6447 goto overflow1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6448 j += incr; |
|
45731
162c6952ea34
Fix the overflows in expandtabs(). "This time for sure!"
Guido van Rossum <guido@python.org>
parents:
45500
diff
changeset
|
6449 } |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6450 } |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6451 else { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6452 if (j > PY_SSIZE_T_MAX - 1) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6453 goto overflow1; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6454 j++; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6455 if (*p == '\n' || *p == '\r') { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6456 if (i > PY_SSIZE_T_MAX - j) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6457 goto overflow1; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6458 i += j; |
|
45731
162c6952ea34
Fix the overflows in expandtabs(). "This time for sure!"
Guido van Rossum <guido@python.org>
parents:
45500
diff
changeset
|
6459 j = 0; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6460 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6461 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6462 |
|
45731
162c6952ea34
Fix the overflows in expandtabs(). "This time for sure!"
Guido van Rossum <guido@python.org>
parents:
45500
diff
changeset
|
6463 if (i > PY_SSIZE_T_MAX - j) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6464 goto overflow1; |
|
42004
e62b606eff0b
Prevent expandtabs() on string and unicode objects from causing a segfault when
Neal Norwitz <nnorwitz@gmail.com>
parents:
40908
diff
changeset
|
6465 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6466 /* 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
|
6467 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
|
6468 if (!u) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6469 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6470 |
|
45731
162c6952ea34
Fix the overflows in expandtabs(). "This time for sure!"
Guido van Rossum <guido@python.org>
parents:
45500
diff
changeset
|
6471 j = 0; /* same as in first pass */ |
|
162c6952ea34
Fix the overflows in expandtabs(). "This time for sure!"
Guido van Rossum <guido@python.org>
parents:
45500
diff
changeset
|
6472 q = u->str; /* next output char */ |
|
162c6952ea34
Fix the overflows in expandtabs(). "This time for sure!"
Guido van Rossum <guido@python.org>
parents:
45500
diff
changeset
|
6473 qe = u->str + u->length; /* end of output */ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6474 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6475 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
|
6476 if (*p == '\t') { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6477 if (tabsize > 0) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6478 i = tabsize - (j % tabsize); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6479 j += i; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6480 while (i--) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6481 if (q >= qe) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6482 goto overflow2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6483 *q++ = ' '; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6484 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6485 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6486 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6487 else { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6488 if (q >= qe) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6489 goto overflow2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6490 *q++ = *p; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6491 j++; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6492 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
|
6493 j = 0; |
|
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 return (PyObject*) u; |
|
45731
162c6952ea34
Fix the overflows in expandtabs(). "This time for sure!"
Guido van Rossum <guido@python.org>
parents:
45500
diff
changeset
|
6497 |
|
162c6952ea34
Fix the overflows in expandtabs(). "This time for sure!"
Guido van Rossum <guido@python.org>
parents:
45500
diff
changeset
|
6498 overflow2: |
|
162c6952ea34
Fix the overflows in expandtabs(). "This time for sure!"
Guido van Rossum <guido@python.org>
parents:
45500
diff
changeset
|
6499 Py_DECREF(u); |
|
162c6952ea34
Fix the overflows in expandtabs(). "This time for sure!"
Guido van Rossum <guido@python.org>
parents:
45500
diff
changeset
|
6500 overflow1: |
|
162c6952ea34
Fix the overflows in expandtabs(). "This time for sure!"
Guido van Rossum <guido@python.org>
parents:
45500
diff
changeset
|
6501 PyErr_SetString(PyExc_OverflowError, "new string is too long"); |
|
162c6952ea34
Fix the overflows in expandtabs(). "This time for sure!"
Guido van Rossum <guido@python.org>
parents:
45500
diff
changeset
|
6502 return NULL; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6503 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6504 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
6505 PyDoc_STRVAR(find__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6506 "S.find(sub [,start [,end]]) -> int\n\ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6507 \n\ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6508 Return the lowest index in S where substring sub is found,\n\ |
|
42402
251033a1c2e3
Bug #1763149: use proper slice syntax in docstring.
Georg Brandl <georg@python.org>
parents:
42333
diff
changeset
|
6509 such that sub is contained within s[start:end]. Optional\n\ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6510 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
|
6511 \n\ |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
6512 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
|
6513 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6514 static PyObject * |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6515 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
|
6516 { |
|
38424
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
6517 PyObject *substring; |
|
43886
25a5f6a30292
Now in find, rfind, index, and rindex, you can use None as defaults,
Facundo Batista <facundobatista@gmail.com>
parents:
43710
diff
changeset
|
6518 Py_ssize_t start; |
|
25a5f6a30292
Now in find, rfind, index, and rindex, you can use None as defaults,
Facundo Batista <facundobatista@gmail.com>
parents:
43710
diff
changeset
|
6519 Py_ssize_t end; |
|
38424
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
6520 Py_ssize_t result; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6521 |
|
43886
25a5f6a30292
Now in find, rfind, index, and rindex, you can use None as defaults,
Facundo Batista <facundobatista@gmail.com>
parents:
43710
diff
changeset
|
6522 if (!_ParseTupleFinds(args, &substring, &start, &end)) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6523 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6524 |
|
38441
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
6525 result = stringlib_find_slice( |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
6526 PyUnicode_AS_UNICODE(self), PyUnicode_GET_SIZE(self), |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
6527 PyUnicode_AS_UNICODE(substring), PyUnicode_GET_SIZE(substring), |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
6528 start, end |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
6529 ); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6530 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6531 Py_DECREF(substring); |
|
38424
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
6532 |
|
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
6533 return PyInt_FromSsize_t(result); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6534 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6535 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6536 static PyObject * |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
6537 unicode_getitem(PyUnicodeObject *self, Py_ssize_t index) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6538 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6539 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
|
6540 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
|
6541 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6542 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6543 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6544 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
|
6545 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6546 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6547 static long |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6548 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
|
6549 { |
|
13522
acc4638f37d5
- changed hash calculation for unicode strings. the new
Fredrik Lundh <fredrik@pythonware.com>
parents:
13411
diff
changeset
|
6550 /* 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
|
6551 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
|
6552 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
|
6553 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
|
6554 dictionary keys. */ |
|
acc4638f37d5
- changed hash calculation for unicode strings. the new
Fredrik Lundh <fredrik@pythonware.com>
parents:
13411
diff
changeset
|
6555 |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
6556 register Py_ssize_t len; |
|
13522
acc4638f37d5
- changed hash calculation for unicode strings. the new
Fredrik Lundh <fredrik@pythonware.com>
parents:
13411
diff
changeset
|
6557 register Py_UNICODE *p; |
|
acc4638f37d5
- changed hash calculation for unicode strings. the new
Fredrik Lundh <fredrik@pythonware.com>
parents:
13411
diff
changeset
|
6558 register long x; |
|
acc4638f37d5
- changed hash calculation for unicode strings. the new
Fredrik Lundh <fredrik@pythonware.com>
parents:
13411
diff
changeset
|
6559 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6560 if (self->hash != -1) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6561 return self->hash; |
|
13522
acc4638f37d5
- changed hash calculation for unicode strings. the new
Fredrik Lundh <fredrik@pythonware.com>
parents:
13411
diff
changeset
|
6562 len = PyUnicode_GET_SIZE(self); |
|
acc4638f37d5
- changed hash calculation for unicode strings. the new
Fredrik Lundh <fredrik@pythonware.com>
parents:
13411
diff
changeset
|
6563 p = PyUnicode_AS_UNICODE(self); |
|
acc4638f37d5
- changed hash calculation for unicode strings. the new
Fredrik Lundh <fredrik@pythonware.com>
parents:
13411
diff
changeset
|
6564 x = *p << 7; |
|
acc4638f37d5
- changed hash calculation for unicode strings. the new
Fredrik Lundh <fredrik@pythonware.com>
parents:
13411
diff
changeset
|
6565 while (--len >= 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6566 x = (1000003*x) ^ *p++; |
|
13522
acc4638f37d5
- changed hash calculation for unicode strings. the new
Fredrik Lundh <fredrik@pythonware.com>
parents:
13411
diff
changeset
|
6567 x ^= PyUnicode_GET_SIZE(self); |
|
acc4638f37d5
- changed hash calculation for unicode strings. the new
Fredrik Lundh <fredrik@pythonware.com>
parents:
13411
diff
changeset
|
6568 if (x == -1) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6569 x = -2; |
|
13522
acc4638f37d5
- changed hash calculation for unicode strings. the new
Fredrik Lundh <fredrik@pythonware.com>
parents:
13411
diff
changeset
|
6570 self->hash = x; |
|
acc4638f37d5
- changed hash calculation for unicode strings. the new
Fredrik Lundh <fredrik@pythonware.com>
parents:
13411
diff
changeset
|
6571 return x; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6572 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6573 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
6574 PyDoc_STRVAR(index__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6575 "S.index(sub [,start [,end]]) -> int\n\ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6576 \n\ |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
6577 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
|
6578 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6579 static PyObject * |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6580 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
|
6581 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
6582 Py_ssize_t result; |
|
38424
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
6583 PyObject *substring; |
|
43886
25a5f6a30292
Now in find, rfind, index, and rindex, you can use None as defaults,
Facundo Batista <facundobatista@gmail.com>
parents:
43710
diff
changeset
|
6584 Py_ssize_t start; |
|
25a5f6a30292
Now in find, rfind, index, and rindex, you can use None as defaults,
Facundo Batista <facundobatista@gmail.com>
parents:
43710
diff
changeset
|
6585 Py_ssize_t end; |
|
25a5f6a30292
Now in find, rfind, index, and rindex, you can use None as defaults,
Facundo Batista <facundobatista@gmail.com>
parents:
43710
diff
changeset
|
6586 |
|
25a5f6a30292
Now in find, rfind, index, and rindex, you can use None as defaults,
Facundo Batista <facundobatista@gmail.com>
parents:
43710
diff
changeset
|
6587 if (!_ParseTupleFinds(args, &substring, &start, &end)) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6588 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6589 |
|
38441
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
6590 result = stringlib_find_slice( |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
6591 PyUnicode_AS_UNICODE(self), PyUnicode_GET_SIZE(self), |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
6592 PyUnicode_AS_UNICODE(substring), PyUnicode_GET_SIZE(substring), |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
6593 start, end |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
6594 ); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6595 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6596 Py_DECREF(substring); |
|
38424
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
6597 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6598 if (result < 0) { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6599 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
|
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 } |
|
38424
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
6602 |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
6603 return PyInt_FromSsize_t(result); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6604 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6605 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
6606 PyDoc_STRVAR(islower__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6607 "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
|
6608 \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
|
6609 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
|
6610 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
|
6611 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6612 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
|
6613 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
|
6614 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6615 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
|
6616 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
|
6617 int cased; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6618 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6619 /* 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
|
6620 if (PyUnicode_GET_SIZE(self) == 1) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6621 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
|
6622 |
|
12924
2d0b99778edf
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12909
diff
changeset
|
6623 /* Special case for empty strings */ |
|
36203
44cfca6136c6
Stop maintaining the buildno file.
Martin v. Löwis <martin@v.loewis.de>
parents:
36056
diff
changeset
|
6624 if (PyUnicode_GET_SIZE(self) == 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6625 return PyBool_FromLong(0); |
|
12924
2d0b99778edf
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12909
diff
changeset
|
6626 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6627 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
|
6628 cased = 0; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6629 for (; p < e; p++) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6630 register const Py_UNICODE ch = *p; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6631 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6632 if (Py_UNICODE_ISUPPER(ch) || Py_UNICODE_ISTITLE(ch)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6633 return PyBool_FromLong(0); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6634 else if (!cased && Py_UNICODE_ISLOWER(ch)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6635 cased = 1; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6636 } |
|
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
|
6637 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
|
6638 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6639 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
6640 PyDoc_STRVAR(isupper__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6641 "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
|
6642 \n\ |
|
30707
9e21e56bf5f3
Patch #825679: Clarify semantics of .isfoo on empty strings.
Martin v. Löwis <martin@v.loewis.de>
parents:
30653
diff
changeset
|
6643 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
|
6644 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
|
6645 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6646 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
|
6647 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
|
6648 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6649 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
|
6650 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
|
6651 int cased; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6652 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6653 /* 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
|
6654 if (PyUnicode_GET_SIZE(self) == 1) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6655 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
|
6656 |
|
12924
2d0b99778edf
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12909
diff
changeset
|
6657 /* Special case for empty strings */ |
|
36203
44cfca6136c6
Stop maintaining the buildno file.
Martin v. Löwis <martin@v.loewis.de>
parents:
36056
diff
changeset
|
6658 if (PyUnicode_GET_SIZE(self) == 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6659 return PyBool_FromLong(0); |
|
12924
2d0b99778edf
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12909
diff
changeset
|
6660 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6661 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
|
6662 cased = 0; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6663 for (; p < e; p++) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6664 register const Py_UNICODE ch = *p; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6665 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6666 if (Py_UNICODE_ISLOWER(ch) || Py_UNICODE_ISTITLE(ch)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6667 return PyBool_FromLong(0); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6668 else if (!cased && Py_UNICODE_ISUPPER(ch)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6669 cased = 1; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6670 } |
|
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
|
6671 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
|
6672 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6673 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
6674 PyDoc_STRVAR(istitle__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6675 "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
|
6676 \n\ |
|
30707
9e21e56bf5f3
Patch #825679: Clarify semantics of .isfoo on empty strings.
Martin v. Löwis <martin@v.loewis.de>
parents:
30653
diff
changeset
|
6677 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
|
6678 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
|
6679 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
|
6680 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
|
6681 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6682 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
|
6683 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
|
6684 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6685 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
|
6686 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
|
6687 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
|
6688 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6689 /* 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
|
6690 if (PyUnicode_GET_SIZE(self) == 1) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6691 return PyBool_FromLong((Py_UNICODE_ISTITLE(*p) != 0) || |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6692 (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
|
6693 |
|
12924
2d0b99778edf
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12909
diff
changeset
|
6694 /* Special case for empty strings */ |
|
36203
44cfca6136c6
Stop maintaining the buildno file.
Martin v. Löwis <martin@v.loewis.de>
parents:
36056
diff
changeset
|
6695 if (PyUnicode_GET_SIZE(self) == 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6696 return PyBool_FromLong(0); |
|
12924
2d0b99778edf
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12909
diff
changeset
|
6697 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6698 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
|
6699 cased = 0; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6700 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
|
6701 for (; p < e; p++) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6702 register const Py_UNICODE ch = *p; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6703 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6704 if (Py_UNICODE_ISUPPER(ch) || Py_UNICODE_ISTITLE(ch)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6705 if (previous_is_cased) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6706 return PyBool_FromLong(0); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6707 previous_is_cased = 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6708 cased = 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6709 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6710 else if (Py_UNICODE_ISLOWER(ch)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6711 if (!previous_is_cased) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6712 return PyBool_FromLong(0); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6713 previous_is_cased = 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6714 cased = 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6715 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6716 else |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6717 previous_is_cased = 0; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6718 } |
|
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
|
6719 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
|
6720 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6721 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
6722 PyDoc_STRVAR(isspace__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6723 "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
|
6724 \n\ |
|
30707
9e21e56bf5f3
Patch #825679: Clarify semantics of .isfoo on empty strings.
Martin v. Löwis <martin@v.loewis.de>
parents:
30653
diff
changeset
|
6725 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
|
6726 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
|
6727 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6728 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
|
6729 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
|
6730 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6731 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
|
6732 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
|
6733 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6734 /* 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
|
6735 if (PyUnicode_GET_SIZE(self) == 1 && |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6736 Py_UNICODE_ISSPACE(*p)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6737 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
|
6738 |
|
12924
2d0b99778edf
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12909
diff
changeset
|
6739 /* Special case for empty strings */ |
|
36203
44cfca6136c6
Stop maintaining the buildno file.
Martin v. Löwis <martin@v.loewis.de>
parents:
36056
diff
changeset
|
6740 if (PyUnicode_GET_SIZE(self) == 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6741 return PyBool_FromLong(0); |
|
12924
2d0b99778edf
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12909
diff
changeset
|
6742 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6743 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
|
6744 for (; p < e; p++) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6745 if (!Py_UNICODE_ISSPACE(*p)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6746 return PyBool_FromLong(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
|
6747 } |
|
aa8d59823add
Add the 'bool' type and its values 'False' and 'True', as described in
Guido van Rossum <guido@python.org>
parents:
22521
diff
changeset
|
6748 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
|
6749 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6750 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
6751 PyDoc_STRVAR(isalpha__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6752 "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
|
6753 \n\ |
|
30707
9e21e56bf5f3
Patch #825679: Clarify semantics of .isfoo on empty strings.
Martin v. Löwis <martin@v.loewis.de>
parents:
30653
diff
changeset
|
6754 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
|
6755 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
|
6756 |
|
9a1b961e0c3a
Added new .isalpha() and .isalnum() methods which provide interfaces
Marc-André Lemburg <mal@egenix.com>
parents:
13337
diff
changeset
|
6757 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
|
6758 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
|
6759 { |
|
9a1b961e0c3a
Added new .isalpha() and .isalnum() methods which provide interfaces
Marc-André Lemburg <mal@egenix.com>
parents:
13337
diff
changeset
|
6760 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
|
6761 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
|
6762 |
|
9a1b961e0c3a
Added new .isalpha() and .isalnum() methods which provide interfaces
Marc-André Lemburg <mal@egenix.com>
parents:
13337
diff
changeset
|
6763 /* 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
|
6764 if (PyUnicode_GET_SIZE(self) == 1 && |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6765 Py_UNICODE_ISALPHA(*p)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6766 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
|
6767 |
|
9a1b961e0c3a
Added new .isalpha() and .isalnum() methods which provide interfaces
Marc-André Lemburg <mal@egenix.com>
parents:
13337
diff
changeset
|
6768 /* Special case for empty strings */ |
|
36203
44cfca6136c6
Stop maintaining the buildno file.
Martin v. Löwis <martin@v.loewis.de>
parents:
36056
diff
changeset
|
6769 if (PyUnicode_GET_SIZE(self) == 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6770 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
|
6771 |
|
9a1b961e0c3a
Added new .isalpha() and .isalnum() methods which provide interfaces
Marc-André Lemburg <mal@egenix.com>
parents:
13337
diff
changeset
|
6772 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
|
6773 for (; p < e; p++) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6774 if (!Py_UNICODE_ISALPHA(*p)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6775 return PyBool_FromLong(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
|
6776 } |
|
aa8d59823add
Add the 'bool' type and its values 'False' and 'True', as described in
Guido van Rossum <guido@python.org>
parents:
22521
diff
changeset
|
6777 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
|
6778 } |
|
9a1b961e0c3a
Added new .isalpha() and .isalnum() methods which provide interfaces
Marc-André Lemburg <mal@egenix.com>
parents:
13337
diff
changeset
|
6779 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
6780 PyDoc_STRVAR(isalnum__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6781 "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
|
6782 \n\ |
|
30707
9e21e56bf5f3
Patch #825679: Clarify semantics of .isfoo on empty strings.
Martin v. Löwis <martin@v.loewis.de>
parents:
30653
diff
changeset
|
6783 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
|
6784 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
|
6785 |
|
9a1b961e0c3a
Added new .isalpha() and .isalnum() methods which provide interfaces
Marc-André Lemburg <mal@egenix.com>
parents:
13337
diff
changeset
|
6786 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
|
6787 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
|
6788 { |
|
9a1b961e0c3a
Added new .isalpha() and .isalnum() methods which provide interfaces
Marc-André Lemburg <mal@egenix.com>
parents:
13337
diff
changeset
|
6789 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
|
6790 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
|
6791 |
|
9a1b961e0c3a
Added new .isalpha() and .isalnum() methods which provide interfaces
Marc-André Lemburg <mal@egenix.com>
parents:
13337
diff
changeset
|
6792 /* 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
|
6793 if (PyUnicode_GET_SIZE(self) == 1 && |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6794 Py_UNICODE_ISALNUM(*p)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6795 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
|
6796 |
|
9a1b961e0c3a
Added new .isalpha() and .isalnum() methods which provide interfaces
Marc-André Lemburg <mal@egenix.com>
parents:
13337
diff
changeset
|
6797 /* Special case for empty strings */ |
|
36203
44cfca6136c6
Stop maintaining the buildno file.
Martin v. Löwis <martin@v.loewis.de>
parents:
36056
diff
changeset
|
6798 if (PyUnicode_GET_SIZE(self) == 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6799 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
|
6800 |
|
9a1b961e0c3a
Added new .isalpha() and .isalnum() methods which provide interfaces
Marc-André Lemburg <mal@egenix.com>
parents:
13337
diff
changeset
|
6801 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
|
6802 for (; p < e; p++) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6803 if (!Py_UNICODE_ISALNUM(*p)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6804 return PyBool_FromLong(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
|
6805 } |
|
aa8d59823add
Add the 'bool' type and its values 'False' and 'True', as described in
Guido van Rossum <guido@python.org>
parents:
22521
diff
changeset
|
6806 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
|
6807 } |
|
9a1b961e0c3a
Added new .isalpha() and .isalnum() methods which provide interfaces
Marc-André Lemburg <mal@egenix.com>
parents:
13337
diff
changeset
|
6808 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
6809 PyDoc_STRVAR(isdecimal__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6810 "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
|
6811 \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
|
6812 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
|
6813 False otherwise."); |
|
11968
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 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
|
6816 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
|
6817 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6818 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
|
6819 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
|
6820 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6821 /* 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
|
6822 if (PyUnicode_GET_SIZE(self) == 1 && |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6823 Py_UNICODE_ISDECIMAL(*p)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6824 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
|
6825 |
|
12924
2d0b99778edf
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12909
diff
changeset
|
6826 /* Special case for empty strings */ |
|
36203
44cfca6136c6
Stop maintaining the buildno file.
Martin v. Löwis <martin@v.loewis.de>
parents:
36056
diff
changeset
|
6827 if (PyUnicode_GET_SIZE(self) == 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6828 return PyBool_FromLong(0); |
|
12924
2d0b99778edf
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12909
diff
changeset
|
6829 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6830 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
|
6831 for (; p < e; p++) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6832 if (!Py_UNICODE_ISDECIMAL(*p)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6833 return PyBool_FromLong(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
|
6834 } |
|
aa8d59823add
Add the 'bool' type and its values 'False' and 'True', as described in
Guido van Rossum <guido@python.org>
parents:
22521
diff
changeset
|
6835 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
|
6836 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6837 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
6838 PyDoc_STRVAR(isdigit__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6839 "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
|
6840 \n\ |
|
30707
9e21e56bf5f3
Patch #825679: Clarify semantics of .isfoo on empty strings.
Martin v. Löwis <martin@v.loewis.de>
parents:
30653
diff
changeset
|
6841 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
|
6842 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
|
6843 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6844 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
|
6845 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
|
6846 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6847 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
|
6848 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
|
6849 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6850 /* 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
|
6851 if (PyUnicode_GET_SIZE(self) == 1 && |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6852 Py_UNICODE_ISDIGIT(*p)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6853 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
|
6854 |
|
12924
2d0b99778edf
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12909
diff
changeset
|
6855 /* Special case for empty strings */ |
|
36203
44cfca6136c6
Stop maintaining the buildno file.
Martin v. Löwis <martin@v.loewis.de>
parents:
36056
diff
changeset
|
6856 if (PyUnicode_GET_SIZE(self) == 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6857 return PyBool_FromLong(0); |
|
12924
2d0b99778edf
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12909
diff
changeset
|
6858 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6859 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
|
6860 for (; p < e; p++) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6861 if (!Py_UNICODE_ISDIGIT(*p)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6862 return PyBool_FromLong(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
|
6863 } |
|
aa8d59823add
Add the 'bool' type and its values 'False' and 'True', as described in
Guido van Rossum <guido@python.org>
parents:
22521
diff
changeset
|
6864 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
|
6865 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6866 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
6867 PyDoc_STRVAR(isnumeric__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6868 "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
|
6869 \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
|
6870 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
|
6871 False otherwise."); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6872 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6873 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
|
6874 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
|
6875 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6876 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
|
6877 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
|
6878 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6879 /* 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
|
6880 if (PyUnicode_GET_SIZE(self) == 1 && |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6881 Py_UNICODE_ISNUMERIC(*p)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6882 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
|
6883 |
|
12924
2d0b99778edf
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12909
diff
changeset
|
6884 /* Special case for empty strings */ |
|
36203
44cfca6136c6
Stop maintaining the buildno file.
Martin v. Löwis <martin@v.loewis.de>
parents:
36056
diff
changeset
|
6885 if (PyUnicode_GET_SIZE(self) == 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6886 return PyBool_FromLong(0); |
|
12924
2d0b99778edf
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12909
diff
changeset
|
6887 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6888 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
|
6889 for (; p < e; p++) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6890 if (!Py_UNICODE_ISNUMERIC(*p)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6891 return PyBool_FromLong(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
|
6892 } |
|
aa8d59823add
Add the 'bool' type and its values 'False' and 'True', as described in
Guido van Rossum <guido@python.org>
parents:
22521
diff
changeset
|
6893 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
|
6894 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6895 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
6896 PyDoc_STRVAR(join__doc__, |
|
56526
d24298df2a66
#7116: str.join() takes an iterable.
Georg Brandl <georg@python.org>
parents:
56093
diff
changeset
|
6897 "S.join(iterable) -> unicode\n\ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6898 \n\ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6899 Return a string which is the concatenation of the strings in the\n\ |
|
56526
d24298df2a66
#7116: str.join() takes an iterable.
Georg Brandl <georg@python.org>
parents:
56093
diff
changeset
|
6900 iterable. 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
|
6901 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6902 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
|
6903 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
|
6904 { |
|
19301
b9701538f827
Patch #427190: Implement and use METH_NOARGS and METH_O.
Martin v. Löwis <martin@v.loewis.de>
parents:
19121
diff
changeset
|
6905 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
|
6906 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6907 |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
6908 static Py_ssize_t |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6909 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
|
6910 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6911 return self->length; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6912 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6913 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
6914 PyDoc_STRVAR(ljust__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6915 "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
|
6916 \n\ |
|
49431
2e794757bdc8
Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
49386
diff
changeset
|
6917 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
|
6918 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
|
6919 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6920 static PyObject * |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6921 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
|
6922 { |
|
37662
0678ce9fb6b2
Change more ints to Py_ssize_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
37661
diff
changeset
|
6923 Py_ssize_t width; |
|
31021
21a10c3600b5
Add optional fillchar argument to ljust(), rjust(), and center() string methods.
Raymond Hettinger <python@rcn.com>
parents:
30765
diff
changeset
|
6924 Py_UNICODE fillchar = ' '; |
|
21a10c3600b5
Add optional fillchar argument to ljust(), rjust(), and center() string methods.
Raymond Hettinger <python@rcn.com>
parents:
30765
diff
changeset
|
6925 |
|
37662
0678ce9fb6b2
Change more ints to Py_ssize_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
37661
diff
changeset
|
6926 if (!PyArg_ParseTuple(args, "n|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
|
6927 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6928 |
|
19885
72e6eb653312
More on bug 460020: disable many optimizations of unicode subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
19849
diff
changeset
|
6929 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
|
6930 Py_INCREF(self); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6931 return (PyObject*) self; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6932 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6933 |
|
31021
21a10c3600b5
Add optional fillchar argument to ljust(), rjust(), and center() string methods.
Raymond Hettinger <python@rcn.com>
parents:
30765
diff
changeset
|
6934 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
|
6935 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6936 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
6937 PyDoc_STRVAR(lower__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6938 "S.lower() -> unicode\n\ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6939 \n\ |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
6940 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
|
6941 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6942 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
|
6943 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
|
6944 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6945 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
|
6946 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6947 |
|
23225
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
6948 #define LEFTSTRIP 0 |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
6949 #define RIGHTSTRIP 1 |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
6950 #define BOTHSTRIP 2 |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
6951 |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
6952 /* Arrays indexed by above */ |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
6953 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
|
6954 |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
6955 #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
|
6956 |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
6957 /* 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
|
6958 PyObject * |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
6959 _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
|
6960 { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6961 Py_UNICODE *s = PyUnicode_AS_UNICODE(self); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6962 Py_ssize_t len = PyUnicode_GET_SIZE(self); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6963 Py_UNICODE *sep = PyUnicode_AS_UNICODE(sepobj); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6964 Py_ssize_t seplen = PyUnicode_GET_SIZE(sepobj); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6965 Py_ssize_t i, j; |
|
23225
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
6966 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6967 BLOOM_MASK sepmask = make_bloom_mask(sep, seplen); |
|
38257
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
6968 |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6969 i = 0; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6970 if (striptype != RIGHTSTRIP) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6971 while (i < len && BLOOM_MEMBER(sepmask, s[i], sep, seplen)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6972 i++; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6973 } |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6974 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6975 |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6976 j = len; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6977 if (striptype != LEFTSTRIP) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6978 do { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6979 j--; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6980 } while (j >= i && BLOOM_MEMBER(sepmask, s[j], sep, seplen)); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6981 j++; |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6982 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6983 |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6984 if (i == 0 && j == len && PyUnicode_CheckExact(self)) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6985 Py_INCREF(self); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6986 return (PyObject*)self; |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6987 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6988 else |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
6989 return PyUnicode_FromUnicode(s+i, j-i); |
|
23225
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
6990 } |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
6991 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6992 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
6993 static PyObject * |
|
23225
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
6994 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
|
6995 { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6996 Py_UNICODE *s = PyUnicode_AS_UNICODE(self); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6997 Py_ssize_t len = PyUnicode_GET_SIZE(self), i, j; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6998 |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
6999 i = 0; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7000 if (striptype != RIGHTSTRIP) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7001 while (i < len && Py_UNICODE_ISSPACE(s[i])) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7002 i++; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7003 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7004 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7005 |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7006 j = len; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7007 if (striptype != LEFTSTRIP) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7008 do { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7009 j--; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7010 } while (j >= i && Py_UNICODE_ISSPACE(s[j])); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7011 j++; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7012 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7013 |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7014 if (i == 0 && j == len && PyUnicode_CheckExact(self)) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7015 Py_INCREF(self); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7016 return (PyObject*)self; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7017 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7018 else |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7019 return PyUnicode_FromUnicode(s+i, j-i); |
|
23225
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7020 } |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7021 |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7022 |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7023 static PyObject * |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7024 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
|
7025 { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7026 PyObject *sep = NULL; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7027 |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7028 if (!PyArg_ParseTuple(args, (char *)stripformat[striptype], &sep)) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7029 return NULL; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7030 |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7031 if (sep != NULL && sep != Py_None) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7032 if (PyUnicode_Check(sep)) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7033 return _PyUnicode_XStrip(self, striptype, sep); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7034 else if (PyString_Check(sep)) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7035 PyObject *res; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7036 sep = PyUnicode_FromObject(sep); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7037 if (sep==NULL) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7038 return NULL; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7039 res = _PyUnicode_XStrip(self, striptype, sep); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7040 Py_DECREF(sep); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7041 return res; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7042 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7043 else { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7044 PyErr_Format(PyExc_TypeError, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7045 "%s arg must be None, unicode or str", |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7046 STRIPNAME(striptype)); |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7047 return NULL; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7048 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7049 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7050 |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7051 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
|
7052 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7053 |
|
23225
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7054 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
7055 PyDoc_STRVAR(strip__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7056 "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
|
7057 \n\ |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7058 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
|
7059 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
|
7060 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
|
7061 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
|
7062 |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7063 static PyObject * |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7064 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
|
7065 { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7066 if (PyTuple_GET_SIZE(args) == 0) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7067 return do_strip(self, BOTHSTRIP); /* Common case */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7068 else |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7069 return do_argstrip(self, BOTHSTRIP, args); |
|
23225
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7070 } |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7071 |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7072 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
7073 PyDoc_STRVAR(lstrip__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7074 "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
|
7075 \n\ |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7076 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
|
7077 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
|
7078 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
|
7079 |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7080 static PyObject * |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7081 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
|
7082 { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7083 if (PyTuple_GET_SIZE(args) == 0) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7084 return do_strip(self, LEFTSTRIP); /* Common case */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7085 else |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7086 return do_argstrip(self, LEFTSTRIP, args); |
|
23225
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7087 } |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7088 |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7089 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
7090 PyDoc_STRVAR(rstrip__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7091 "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
|
7092 \n\ |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7093 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
|
7094 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
|
7095 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
|
7096 |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7097 static PyObject * |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7098 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
|
7099 { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7100 if (PyTuple_GET_SIZE(args) == 0) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7101 return do_strip(self, RIGHTSTRIP); /* Common case */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7102 else |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7103 return do_argstrip(self, RIGHTSTRIP, args); |
|
23225
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7104 } |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7105 |
|
e639e34ef901
Apply patch diff.txt from SF feature request
Walter Dörwald <walter@livinglogic.de>
parents:
23205
diff
changeset
|
7106 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7107 static PyObject* |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
7108 unicode_repeat(PyUnicodeObject *str, Py_ssize_t len) |
|
11968
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 PyUnicodeObject *u; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7111 Py_UNICODE *p; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
7112 Py_ssize_t nchars; |
|
14492
7728b0ea9344
Fix for bug 113934. string*n and unicode*n did no overflow checking at
Tim Peters <tim.peters@gmail.com>
parents:
14388
diff
changeset
|
7113 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
|
7114 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7115 if (len < 0) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7116 len = 0; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7117 |
|
19885
72e6eb653312
More on bug 460020: disable many optimizations of unicode subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
19849
diff
changeset
|
7118 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
|
7119 /* 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
|
7120 Py_INCREF(str); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7121 return (PyObject*) str; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7122 } |
|
14492
7728b0ea9344
Fix for bug 113934. string*n and unicode*n did no overflow checking at
Tim Peters <tim.peters@gmail.com>
parents:
14388
diff
changeset
|
7123 |
|
7728b0ea9344
Fix for bug 113934. string*n and unicode*n did no overflow checking at
Tim Peters <tim.peters@gmail.com>
parents:
14388
diff
changeset
|
7124 /* ensure # of chars needed doesn't overflow int and # of bytes |
|
7728b0ea9344
Fix for bug 113934. string*n and unicode*n did no overflow checking at
Tim Peters <tim.peters@gmail.com>
parents:
14388
diff
changeset
|
7125 * needed doesn't overflow size_t |
|
7728b0ea9344
Fix for bug 113934. string*n and unicode*n did no overflow checking at
Tim Peters <tim.peters@gmail.com>
parents:
14388
diff
changeset
|
7126 */ |
|
7728b0ea9344
Fix for bug 113934. string*n and unicode*n did no overflow checking at
Tim Peters <tim.peters@gmail.com>
parents:
14388
diff
changeset
|
7127 nchars = len * str->length; |
|
7728b0ea9344
Fix for bug 113934. string*n and unicode*n did no overflow checking at
Tim Peters <tim.peters@gmail.com>
parents:
14388
diff
changeset
|
7128 if (len && nchars / len != str->length) { |
|
7728b0ea9344
Fix for bug 113934. string*n and unicode*n did no overflow checking at
Tim Peters <tim.peters@gmail.com>
parents:
14388
diff
changeset
|
7129 PyErr_SetString(PyExc_OverflowError, |
|
7728b0ea9344
Fix for bug 113934. string*n and unicode*n did no overflow checking at
Tim Peters <tim.peters@gmail.com>
parents:
14388
diff
changeset
|
7130 "repeated string is too long"); |
|
7728b0ea9344
Fix for bug 113934. string*n and unicode*n did no overflow checking at
Tim Peters <tim.peters@gmail.com>
parents:
14388
diff
changeset
|
7131 return NULL; |
|
7728b0ea9344
Fix for bug 113934. string*n and unicode*n did no overflow checking at
Tim Peters <tim.peters@gmail.com>
parents:
14388
diff
changeset
|
7132 } |
|
7728b0ea9344
Fix for bug 113934. string*n and unicode*n did no overflow checking at
Tim Peters <tim.peters@gmail.com>
parents:
14388
diff
changeset
|
7133 nbytes = (nchars + 1) * sizeof(Py_UNICODE); |
|
7728b0ea9344
Fix for bug 113934. string*n and unicode*n did no overflow checking at
Tim Peters <tim.peters@gmail.com>
parents:
14388
diff
changeset
|
7134 if (nbytes / sizeof(Py_UNICODE) != (size_t)(nchars + 1)) { |
|
7728b0ea9344
Fix for bug 113934. string*n and unicode*n did no overflow checking at
Tim Peters <tim.peters@gmail.com>
parents:
14388
diff
changeset
|
7135 PyErr_SetString(PyExc_OverflowError, |
|
7728b0ea9344
Fix for bug 113934. string*n and unicode*n did no overflow checking at
Tim Peters <tim.peters@gmail.com>
parents:
14388
diff
changeset
|
7136 "repeated string is too long"); |
|
7728b0ea9344
Fix for bug 113934. string*n and unicode*n did no overflow checking at
Tim Peters <tim.peters@gmail.com>
parents:
14388
diff
changeset
|
7137 return NULL; |
|
7728b0ea9344
Fix for bug 113934. string*n and unicode*n did no overflow checking at
Tim Peters <tim.peters@gmail.com>
parents:
14388
diff
changeset
|
7138 } |
|
7728b0ea9344
Fix for bug 113934. string*n and unicode*n did no overflow checking at
Tim Peters <tim.peters@gmail.com>
parents:
14388
diff
changeset
|
7139 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
|
7140 if (!u) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7141 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7142 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7143 p = u->str; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7144 |
|
38238
feb00df91922
needforspeed: speed up unicode repeat, unicode string copy
Fredrik Lundh <fredrik@pythonware.com>
parents:
38236
diff
changeset
|
7145 if (str->length == 1 && len > 0) { |
|
feb00df91922
needforspeed: speed up unicode repeat, unicode string copy
Fredrik Lundh <fredrik@pythonware.com>
parents:
38236
diff
changeset
|
7146 Py_UNICODE_FILL(p, str->str[0], len); |
|
38239
604af867c65f
needforspeed: use memcpy for "long" strings; use a better algorithm
Fredrik Lundh <fredrik@pythonware.com>
parents:
38238
diff
changeset
|
7147 } else { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7148 Py_ssize_t done = 0; /* number of characters copied this far */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7149 if (done < nchars) { |
|
38238
feb00df91922
needforspeed: speed up unicode repeat, unicode string copy
Fredrik Lundh <fredrik@pythonware.com>
parents:
38236
diff
changeset
|
7150 Py_UNICODE_COPY(p, str->str, str->length); |
|
38239
604af867c65f
needforspeed: use memcpy for "long" strings; use a better algorithm
Fredrik Lundh <fredrik@pythonware.com>
parents:
38238
diff
changeset
|
7151 done = str->length; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7152 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7153 while (done < nchars) { |
|
46062
09adff3d6691
Try to fix a bunch of compiler warnings on Win64.
Neal Norwitz <nnorwitz@gmail.com>
parents:
46059
diff
changeset
|
7154 Py_ssize_t n = (done <= nchars-done) ? done : nchars-done; |
|
38239
604af867c65f
needforspeed: use memcpy for "long" strings; use a better algorithm
Fredrik Lundh <fredrik@pythonware.com>
parents:
38238
diff
changeset
|
7155 Py_UNICODE_COPY(p+done, p, n); |
|
604af867c65f
needforspeed: use memcpy for "long" strings; use a better algorithm
Fredrik Lundh <fredrik@pythonware.com>
parents:
38238
diff
changeset
|
7156 done += n; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7157 } |
|
38239
604af867c65f
needforspeed: use memcpy for "long" strings; use a better algorithm
Fredrik Lundh <fredrik@pythonware.com>
parents:
38238
diff
changeset
|
7158 } |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7159 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7160 return (PyObject*) u; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7161 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7162 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7163 PyObject *PyUnicode_Replace(PyObject *obj, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7164 PyObject *subobj, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7165 PyObject *replobj, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7166 Py_ssize_t maxcount) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7167 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7168 PyObject *self; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7169 PyObject *str1; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7170 PyObject *str2; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7171 PyObject *result; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7172 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7173 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
|
7174 if (self == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7175 return NULL; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7176 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
|
7177 if (str1 == NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7178 Py_DECREF(self); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7179 return NULL; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7180 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7181 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
|
7182 if (str2 == NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7183 Py_DECREF(self); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7184 Py_DECREF(str1); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7185 return NULL; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7186 } |
|
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
|
7187 result = replace((PyUnicodeObject *)self, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7188 (PyUnicodeObject *)str1, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7189 (PyUnicodeObject *)str2, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7190 maxcount); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7191 Py_DECREF(self); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7192 Py_DECREF(str1); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7193 Py_DECREF(str2); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7194 return result; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7195 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7196 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
7197 PyDoc_STRVAR(replace__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7198 "S.replace (old, new[, count]) -> unicode\n\ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7199 \n\ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7200 Return a copy of S with all occurrences of substring\n\ |
|
47388
d6639cd9575f
#2999: fix name of third parameter in unicode.replace()'s docstring.
Georg Brandl <georg@python.org>
parents:
47294
diff
changeset
|
7201 old replaced by new. If the optional argument count is\n\ |
|
d6639cd9575f
#2999: fix name of third parameter in unicode.replace()'s docstring.
Georg Brandl <georg@python.org>
parents:
47294
diff
changeset
|
7202 given, only the first count 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
|
7203 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7204 static PyObject* |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7205 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
|
7206 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7207 PyUnicodeObject *str1; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7208 PyUnicodeObject *str2; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
7209 Py_ssize_t maxcount = -1; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7210 PyObject *result; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7211 |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
7212 if (!PyArg_ParseTuple(args, "OO|n:replace", &str1, &str2, &maxcount)) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7213 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7214 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
|
7215 if (str1 == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7216 return NULL; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7217 str2 = (PyUnicodeObject *)PyUnicode_FromObject((PyObject *)str2); |
|
27774
bfc524379307
Fix two refcounting bugs
Walter Dörwald <walter@livinglogic.de>
parents:
27555
diff
changeset
|
7218 if (str2 == NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7219 Py_DECREF(str1); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7220 return NULL; |
|
27774
bfc524379307
Fix two refcounting bugs
Walter Dörwald <walter@livinglogic.de>
parents:
27555
diff
changeset
|
7221 } |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7222 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7223 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
|
7224 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7225 Py_DECREF(str1); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7226 Py_DECREF(str2); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7227 return result; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7228 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7229 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7230 static |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7231 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
|
7232 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7233 return unicodeescape_string(PyUnicode_AS_UNICODE(unicode), |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7234 PyUnicode_GET_SIZE(unicode), |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7235 1); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7236 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7237 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
7238 PyDoc_STRVAR(rfind__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7239 "S.rfind(sub [,start [,end]]) -> int\n\ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7240 \n\ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7241 Return the highest index in S where substring sub is found,\n\ |
|
42402
251033a1c2e3
Bug #1763149: use proper slice syntax in docstring.
Georg Brandl <georg@python.org>
parents:
42333
diff
changeset
|
7242 such that sub is contained within s[start:end]. Optional\n\ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7243 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
|
7244 \n\ |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
7245 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
|
7246 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7247 static PyObject * |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7248 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
|
7249 { |
|
38424
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
7250 PyObject *substring; |
|
43886
25a5f6a30292
Now in find, rfind, index, and rindex, you can use None as defaults,
Facundo Batista <facundobatista@gmail.com>
parents:
43710
diff
changeset
|
7251 Py_ssize_t start; |
|
25a5f6a30292
Now in find, rfind, index, and rindex, you can use None as defaults,
Facundo Batista <facundobatista@gmail.com>
parents:
43710
diff
changeset
|
7252 Py_ssize_t end; |
|
38424
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
7253 Py_ssize_t result; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7254 |
|
43886
25a5f6a30292
Now in find, rfind, index, and rindex, you can use None as defaults,
Facundo Batista <facundobatista@gmail.com>
parents:
43710
diff
changeset
|
7255 if (!_ParseTupleFinds(args, &substring, &start, &end)) |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7256 return NULL; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7257 |
|
38441
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
7258 result = stringlib_rfind_slice( |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
7259 PyUnicode_AS_UNICODE(self), PyUnicode_GET_SIZE(self), |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
7260 PyUnicode_AS_UNICODE(substring), PyUnicode_GET_SIZE(substring), |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
7261 start, end |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
7262 ); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7263 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7264 Py_DECREF(substring); |
|
38424
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
7265 |
|
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
7266 return PyInt_FromSsize_t(result); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7267 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7268 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
7269 PyDoc_STRVAR(rindex__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7270 "S.rindex(sub [,start [,end]]) -> int\n\ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7271 \n\ |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
7272 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
|
7273 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7274 static PyObject * |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7275 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
|
7276 { |
|
38424
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
7277 PyObject *substring; |
|
43886
25a5f6a30292
Now in find, rfind, index, and rindex, you can use None as defaults,
Facundo Batista <facundobatista@gmail.com>
parents:
43710
diff
changeset
|
7278 Py_ssize_t start; |
|
25a5f6a30292
Now in find, rfind, index, and rindex, you can use None as defaults,
Facundo Batista <facundobatista@gmail.com>
parents:
43710
diff
changeset
|
7279 Py_ssize_t end; |
|
38424
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
7280 Py_ssize_t result; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7281 |
|
43886
25a5f6a30292
Now in find, rfind, index, and rindex, you can use None as defaults,
Facundo Batista <facundobatista@gmail.com>
parents:
43710
diff
changeset
|
7282 if (!_ParseTupleFinds(args, &substring, &start, &end)) |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7283 return NULL; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7284 |
|
38441
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
7285 result = stringlib_rfind_slice( |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
7286 PyUnicode_AS_UNICODE(self), PyUnicode_GET_SIZE(self), |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
7287 PyUnicode_AS_UNICODE(substring), PyUnicode_GET_SIZE(substring), |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
7288 start, end |
|
72327f8f4a79
needforspeed: stringlib refactoring: changed find_obj to find_slice,
Fredrik Lundh <fredrik@pythonware.com>
parents:
38440
diff
changeset
|
7289 ); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7290 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7291 Py_DECREF(substring); |
|
38424
3d81faf47af7
needforspeed: more stringlib refactoring
Fredrik Lundh <fredrik@pythonware.com>
parents:
38422
diff
changeset
|
7292 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7293 if (result < 0) { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7294 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
|
7295 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7296 } |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
7297 return PyInt_FromSsize_t(result); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7298 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7299 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
7300 PyDoc_STRVAR(rjust__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7301 "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
|
7302 \n\ |
|
49431
2e794757bdc8
Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
49386
diff
changeset
|
7303 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
|
7304 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
|
7305 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7306 static PyObject * |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7307 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
|
7308 { |
|
37662
0678ce9fb6b2
Change more ints to Py_ssize_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
37661
diff
changeset
|
7309 Py_ssize_t width; |
|
31021
21a10c3600b5
Add optional fillchar argument to ljust(), rjust(), and center() string methods.
Raymond Hettinger <python@rcn.com>
parents:
30765
diff
changeset
|
7310 Py_UNICODE fillchar = ' '; |
|
21a10c3600b5
Add optional fillchar argument to ljust(), rjust(), and center() string methods.
Raymond Hettinger <python@rcn.com>
parents:
30765
diff
changeset
|
7311 |
|
37662
0678ce9fb6b2
Change more ints to Py_ssize_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
37661
diff
changeset
|
7312 if (!PyArg_ParseTuple(args, "n|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
|
7313 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7314 |
|
19885
72e6eb653312
More on bug 460020: disable many optimizations of unicode subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
19849
diff
changeset
|
7315 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
|
7316 Py_INCREF(self); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7317 return (PyObject*) self; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7318 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7319 |
|
31021
21a10c3600b5
Add optional fillchar argument to ljust(), rjust(), and center() string methods.
Raymond Hettinger <python@rcn.com>
parents:
30765
diff
changeset
|
7320 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
|
7321 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7322 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7323 static PyObject* |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
7324 unicode_slice(PyUnicodeObject *self, Py_ssize_t start, Py_ssize_t end) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7325 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7326 /* standard clamping */ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7327 if (start < 0) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7328 start = 0; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7329 if (end < 0) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7330 end = 0; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7331 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
|
7332 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
|
7333 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
|
7334 /* 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
|
7335 Py_INCREF(self); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7336 return (PyObject*) self; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7337 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7338 if (start > end) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7339 start = end; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7340 /* copy slice */ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7341 return (PyObject*) PyUnicode_FromUnicode(self->str + start, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7342 end - start); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7343 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7344 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7345 PyObject *PyUnicode_Split(PyObject *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7346 PyObject *sep, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7347 Py_ssize_t maxsplit) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7348 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7349 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
|
7350 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7351 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
|
7352 if (s == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7353 return NULL; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7354 if (sep != NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7355 sep = PyUnicode_FromObject(sep); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7356 if (sep == NULL) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7357 Py_DECREF(s); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7358 return NULL; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7359 } |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7360 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7361 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7362 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
|
7363 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7364 Py_DECREF(s); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7365 Py_XDECREF(sep); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7366 return result; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7367 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7368 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
7369 PyDoc_STRVAR(split__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7370 "S.split([sep [,maxsplit]]) -> 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
|
7371 \n\ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7372 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
|
7373 delimiter string. If maxsplit is given, at most maxsplit\n\ |
|
46871
877783333eae
#2809: elaborate str.split docstring a bit.
Georg Brandl <georg@python.org>
parents:
46391
diff
changeset
|
7374 splits are done. If sep is not specified or is None, any\n\ |
|
46908
ed2c1888e143
#2809 followup: even better split docstring.
Georg Brandl <georg@python.org>
parents:
46871
diff
changeset
|
7375 whitespace string is a separator and empty strings are\n\ |
|
ed2c1888e143
#2809 followup: even better split docstring.
Georg Brandl <georg@python.org>
parents:
46871
diff
changeset
|
7376 removed from the result."); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7377 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7378 static PyObject* |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7379 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
|
7380 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7381 PyObject *substring = Py_None; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
7382 Py_ssize_t maxcount = -1; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
7383 |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
7384 if (!PyArg_ParseTuple(args, "|On:split", &substring, &maxcount)) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7385 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7386 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7387 if (substring == Py_None) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7388 return split(self, NULL, maxcount); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7389 else if (PyUnicode_Check(substring)) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7390 return split(self, (PyUnicodeObject *)substring, maxcount); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7391 else |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7392 return PyUnicode_Split((PyObject *)self, substring, maxcount); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7393 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7394 |
|
38335
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
7395 PyObject * |
|
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
7396 PyUnicode_Partition(PyObject *str_in, PyObject *sep_in) |
|
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
7397 { |
|
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
7398 PyObject* str_obj; |
|
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
7399 PyObject* sep_obj; |
|
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
7400 PyObject* out; |
|
38383
05744917b7c3
needforspeed: stringlib refactoring (in progress)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38381
diff
changeset
|
7401 |
|
38335
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
7402 str_obj = PyUnicode_FromObject(str_in); |
|
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
7403 if (!str_obj) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7404 return NULL; |
|
38335
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
7405 sep_obj = PyUnicode_FromObject(sep_in); |
|
38383
05744917b7c3
needforspeed: stringlib refactoring (in progress)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38381
diff
changeset
|
7406 if (!sep_obj) { |
|
05744917b7c3
needforspeed: stringlib refactoring (in progress)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38381
diff
changeset
|
7407 Py_DECREF(str_obj); |
|
05744917b7c3
needforspeed: stringlib refactoring (in progress)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38381
diff
changeset
|
7408 return NULL; |
|
05744917b7c3
needforspeed: stringlib refactoring (in progress)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38381
diff
changeset
|
7409 } |
|
05744917b7c3
needforspeed: stringlib refactoring (in progress)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38381
diff
changeset
|
7410 |
|
38400
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
7411 out = stringlib_partition( |
|
38383
05744917b7c3
needforspeed: stringlib refactoring (in progress)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38381
diff
changeset
|
7412 str_obj, PyUnicode_AS_UNICODE(str_obj), PyUnicode_GET_SIZE(str_obj), |
|
05744917b7c3
needforspeed: stringlib refactoring (in progress)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38381
diff
changeset
|
7413 sep_obj, PyUnicode_AS_UNICODE(sep_obj), PyUnicode_GET_SIZE(sep_obj) |
|
05744917b7c3
needforspeed: stringlib refactoring (in progress)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38381
diff
changeset
|
7414 ); |
|
05744917b7c3
needforspeed: stringlib refactoring (in progress)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38381
diff
changeset
|
7415 |
|
05744917b7c3
needforspeed: stringlib refactoring (in progress)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38381
diff
changeset
|
7416 Py_DECREF(sep_obj); |
|
05744917b7c3
needforspeed: stringlib refactoring (in progress)
Fredrik Lundh <fredrik@pythonware.com>
parents:
38381
diff
changeset
|
7417 Py_DECREF(str_obj); |
|
38335
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
7418 |
|
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
7419 return out; |
|
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
7420 } |
|
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
7421 |
|
38390
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7422 |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7423 PyObject * |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7424 PyUnicode_RPartition(PyObject *str_in, PyObject *sep_in) |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7425 { |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7426 PyObject* str_obj; |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7427 PyObject* sep_obj; |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7428 PyObject* out; |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7429 |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7430 str_obj = PyUnicode_FromObject(str_in); |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7431 if (!str_obj) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7432 return NULL; |
|
38390
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7433 sep_obj = PyUnicode_FromObject(sep_in); |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7434 if (!sep_obj) { |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7435 Py_DECREF(str_obj); |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7436 return NULL; |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7437 } |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7438 |
|
38400
33c328896f52
needforspeed: stringlib refactoring, continued. added count and
Fredrik Lundh <fredrik@pythonware.com>
parents:
38391
diff
changeset
|
7439 out = stringlib_rpartition( |
|
38390
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7440 str_obj, PyUnicode_AS_UNICODE(str_obj), PyUnicode_GET_SIZE(str_obj), |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7441 sep_obj, PyUnicode_AS_UNICODE(sep_obj), PyUnicode_GET_SIZE(sep_obj) |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7442 ); |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7443 |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7444 Py_DECREF(sep_obj); |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7445 Py_DECREF(str_obj); |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7446 |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7447 return out; |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7448 } |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7449 |
|
38335
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
7450 PyDoc_STRVAR(partition__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7451 "S.partition(sep) -> (head, sep, tail)\n\ |
|
38335
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
7452 \n\ |
|
49431
2e794757bdc8
Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
49386
diff
changeset
|
7453 Search for the separator sep in S, and return the part before it,\n\ |
|
38335
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
7454 the separator itself, and the part after it. If the separator is not\n\ |
|
49431
2e794757bdc8
Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
49386
diff
changeset
|
7455 found, return S and two empty strings."); |
|
38335
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
7456 |
|
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
7457 static PyObject* |
|
38338
958f91684209
needforspeed: use METH_O for argument handling, which made partition some
Fredrik Lundh <fredrik@pythonware.com>
parents:
38335
diff
changeset
|
7458 unicode_partition(PyUnicodeObject *self, PyObject *separator) |
|
958f91684209
needforspeed: use METH_O for argument handling, which made partition some
Fredrik Lundh <fredrik@pythonware.com>
parents:
38335
diff
changeset
|
7459 { |
|
38335
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
7460 return PyUnicode_Partition((PyObject *)self, separator); |
|
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
7461 } |
|
f9332ad4287a
needforspeed: partition implementation, part two.
Fredrik Lundh <fredrik@pythonware.com>
parents:
38304
diff
changeset
|
7462 |
|
38390
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7463 PyDoc_STRVAR(rpartition__doc__, |
|
58487
5e8930f370d5
#7775: fixed docstring for rpartition
Ezio Melotti <ezio.melotti@gmail.com>
parents:
58297
diff
changeset
|
7464 "S.rpartition(sep) -> (head, sep, tail)\n\ |
|
38390
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7465 \n\ |
|
49431
2e794757bdc8
Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
49386
diff
changeset
|
7466 Search for the separator sep in S, starting at the end of S, and return\n\ |
|
38390
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7467 the part before it, the separator itself, and the part after it. If the\n\ |
|
49431
2e794757bdc8
Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
49386
diff
changeset
|
7468 separator is not found, return two empty strings and S."); |
|
38390
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7469 |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7470 static PyObject* |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7471 unicode_rpartition(PyUnicodeObject *self, PyObject *separator) |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7472 { |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7473 return PyUnicode_RPartition((PyObject *)self, separator); |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7474 } |
|
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7475 |
|
31199
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7476 PyObject *PyUnicode_RSplit(PyObject *s, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7477 PyObject *sep, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7478 Py_ssize_t maxsplit) |
|
31199
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7479 { |
|
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7480 PyObject *result; |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7481 |
|
31199
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7482 s = PyUnicode_FromObject(s); |
|
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7483 if (s == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7484 return NULL; |
|
31199
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7485 if (sep != NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7486 sep = PyUnicode_FromObject(sep); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7487 if (sep == NULL) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7488 Py_DECREF(s); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7489 return NULL; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7490 } |
|
31199
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7491 } |
|
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7492 |
|
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7493 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
|
7494 |
|
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7495 Py_DECREF(s); |
|
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7496 Py_XDECREF(sep); |
|
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7497 return result; |
|
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7498 } |
|
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7499 |
|
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7500 PyDoc_STRVAR(rsplit__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7501 "S.rsplit([sep [,maxsplit]]) -> list of strings\n\ |
|
31199
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7502 \n\ |
|
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7503 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
|
7504 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
|
7505 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
|
7506 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
|
7507 is a separator."); |
|
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7508 |
|
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7509 static PyObject* |
|
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7510 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
|
7511 { |
|
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7512 PyObject *substring = Py_None; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
7513 Py_ssize_t maxcount = -1; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
7514 |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
7515 if (!PyArg_ParseTuple(args, "|On:rsplit", &substring, &maxcount)) |
|
31199
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7516 return NULL; |
|
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7517 |
|
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7518 if (substring == Py_None) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7519 return rsplit(self, NULL, maxcount); |
|
31199
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7520 else if (PyUnicode_Check(substring)) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7521 return rsplit(self, (PyUnicodeObject *)substring, maxcount); |
|
31199
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7522 else |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7523 return PyUnicode_RSplit((PyObject *)self, substring, maxcount); |
|
31199
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7524 } |
|
504943c89193
Add rsplit method for str and unicode builtin types.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31042
diff
changeset
|
7525 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
7526 PyDoc_STRVAR(splitlines__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7527 "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
|
7528 \n\ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7529 Return a list of the lines in S, breaking at line boundaries.\n\ |
| 12369 | 7530 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
|
7531 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
|
7532 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7533 static PyObject* |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7534 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
|
7535 { |
| 12369 | 7536 int keepends = 0; |
| 7537 | |
| 7538 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
|
7539 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7540 |
| 12369 | 7541 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
|
7542 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7543 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7544 static |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7545 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
|
7546 { |
|
12645
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
7547 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
|
7548 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7549 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
7550 PyDoc_STRVAR(swapcase__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7551 "S.swapcase() -> unicode\n\ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7552 \n\ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7553 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
|
7554 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
|
7555 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7556 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
|
7557 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
|
7558 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7559 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
|
7560 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7561 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
7562 PyDoc_STRVAR(translate__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7563 "S.translate(table) -> unicode\n\ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7564 \n\ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7565 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
|
7566 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
|
7567 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
|
7568 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
|
7569 are deleted."); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7570 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7571 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
|
7572 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
|
7573 { |
|
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
|
7574 return PyUnicode_TranslateCharmap(self->str, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7575 self->length, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7576 table, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7577 "ignore"); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7578 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7579 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
7580 PyDoc_STRVAR(upper__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7581 "S.upper() -> unicode\n\ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7582 \n\ |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
7583 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
|
7584 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7585 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
|
7586 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
|
7587 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7588 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
|
7589 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7590 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
7591 PyDoc_STRVAR(zfill__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7592 "S.zfill(width) -> unicode\n\ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7593 \n\ |
|
49115
6f08278bf8b1
Fix varname in docstring. #3822.
Georg Brandl <georg@python.org>
parents:
48117
diff
changeset
|
7594 Pad a numeric string S with zeros on the left, to fill a field\n\ |
|
6f08278bf8b1
Fix varname in docstring. #3822.
Georg Brandl <georg@python.org>
parents:
48117
diff
changeset
|
7595 of the specified width. The string S 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
|
7596 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7597 static PyObject * |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7598 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
|
7599 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
7600 Py_ssize_t fill; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7601 PyUnicodeObject *u; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7602 |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
7603 Py_ssize_t width; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
7604 if (!PyArg_ParseTuple(args, "n:zfill", &width)) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7605 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7606 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7607 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
|
7608 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
|
7609 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
|
7610 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
|
7611 } |
|
19ea00feda33
Return the orginal string only if it's a real str or unicode
Walter Dörwald <walter@livinglogic.de>
parents:
23045
diff
changeset
|
7612 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
|
7613 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
|
7614 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
|
7615 PyUnicode_GET_SIZE(self) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7616 ); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7617 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7618 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7619 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
|
7620 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7621 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
|
7622 |
|
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
|
7623 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
|
7624 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
|
7625 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7626 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
|
7627 /* 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
|
7628 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
|
7629 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
|
7630 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7631 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7632 return (PyObject*) u; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7633 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7634 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7635 #if 0 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7636 static PyObject* |
|
45191
920a7633ae08
Unified naming convention for free lists and their limits. All free lists
Christian Heimes <christian@cheimes.de>
parents:
45053
diff
changeset
|
7637 free_listsize(PyUnicodeObject *self) |
|
920a7633ae08
Unified naming convention for free lists and their limits. All free lists
Christian Heimes <christian@cheimes.de>
parents:
45053
diff
changeset
|
7638 { |
|
920a7633ae08
Unified naming convention for free lists and their limits. All free lists
Christian Heimes <christian@cheimes.de>
parents:
45053
diff
changeset
|
7639 return PyInt_FromLong(numfree); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7640 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7641 #endif |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7642 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
7643 PyDoc_STRVAR(startswith__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7644 "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
|
7645 \n\ |
|
28559
aff080f2efb4
Reformat a few docstrings that caused line wraps in help() output.
Guido van Rossum <guido@python.org>
parents:
28494
diff
changeset
|
7646 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
|
7647 With optional start, test S beginning at that position.\n\ |
|
38697
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7648 With optional end, stop comparing S at that position.\n\ |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7649 prefix can also be a tuple of strings to try."); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7650 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7651 static PyObject * |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7652 unicode_startswith(PyUnicodeObject *self, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7653 PyObject *args) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7654 { |
|
38697
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7655 PyObject *subobj; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7656 PyUnicodeObject *substring; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
7657 Py_ssize_t start = 0; |
|
37662
0678ce9fb6b2
Change more ints to Py_ssize_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
37661
diff
changeset
|
7658 Py_ssize_t end = PY_SSIZE_T_MAX; |
|
38697
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7659 int result; |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7660 |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7661 if (!PyArg_ParseTuple(args, "O|O&O&:startswith", &subobj, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7662 _PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7663 return NULL; |
|
38697
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7664 if (PyTuple_Check(subobj)) { |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7665 Py_ssize_t i; |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7666 for (i = 0; i < PyTuple_GET_SIZE(subobj); i++) { |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7667 substring = (PyUnicodeObject *)PyUnicode_FromObject( |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7668 PyTuple_GET_ITEM(subobj, i)); |
|
38697
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7669 if (substring == NULL) |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7670 return NULL; |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7671 result = tailmatch(self, substring, start, end, -1); |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7672 Py_DECREF(substring); |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7673 if (result) { |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7674 Py_RETURN_TRUE; |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7675 } |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7676 } |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7677 /* nothing matched */ |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7678 Py_RETURN_FALSE; |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7679 } |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7680 substring = (PyUnicodeObject *)PyUnicode_FromObject(subobj); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7681 if (substring == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7682 return NULL; |
|
38697
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7683 result = 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
|
7684 Py_DECREF(substring); |
|
38697
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7685 return PyBool_FromLong(result); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7686 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7687 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7688 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
7689 PyDoc_STRVAR(endswith__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7690 "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
|
7691 \n\ |
|
28559
aff080f2efb4
Reformat a few docstrings that caused line wraps in help() output.
Guido van Rossum <guido@python.org>
parents:
28494
diff
changeset
|
7692 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
|
7693 With optional start, test S beginning at that position.\n\ |
|
38697
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7694 With optional end, stop comparing S at that position.\n\ |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7695 suffix can also be a tuple of strings to try."); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7696 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7697 static PyObject * |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7698 unicode_endswith(PyUnicodeObject *self, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7699 PyObject *args) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7700 { |
|
38697
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7701 PyObject *subobj; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7702 PyUnicodeObject *substring; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
7703 Py_ssize_t start = 0; |
|
37662
0678ce9fb6b2
Change more ints to Py_ssize_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
37661
diff
changeset
|
7704 Py_ssize_t end = PY_SSIZE_T_MAX; |
|
38697
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7705 int result; |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7706 |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7707 if (!PyArg_ParseTuple(args, "O|O&O&:endswith", &subobj, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7708 _PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end)) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7709 return NULL; |
|
38697
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7710 if (PyTuple_Check(subobj)) { |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7711 Py_ssize_t i; |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7712 for (i = 0; i < PyTuple_GET_SIZE(subobj); i++) { |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7713 substring = (PyUnicodeObject *)PyUnicode_FromObject( |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7714 PyTuple_GET_ITEM(subobj, i)); |
|
38697
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7715 if (substring == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7716 return NULL; |
|
38697
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7717 result = tailmatch(self, substring, start, end, +1); |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7718 Py_DECREF(substring); |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7719 if (result) { |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7720 Py_RETURN_TRUE; |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7721 } |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7722 } |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7723 Py_RETURN_FALSE; |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7724 } |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7725 substring = (PyUnicodeObject *)PyUnicode_FromObject(subobj); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7726 if (substring == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7727 return NULL; |
|
38697
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7728 |
|
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7729 result = 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
|
7730 Py_DECREF(substring); |
|
38697
1cafbcd7f55c
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
Georg Brandl <georg@python.org>
parents:
38587
diff
changeset
|
7731 return PyBool_FromLong(result); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7732 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7733 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7734 |
|
45381
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45341
diff
changeset
|
7735 /* Implements do_string_format, which is unicode because of stringlib */ |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45341
diff
changeset
|
7736 #include "stringlib/string_format.h" |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45341
diff
changeset
|
7737 |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45341
diff
changeset
|
7738 PyDoc_STRVAR(format__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7739 "S.format(*args, **kwargs) -> unicode\n\ |
|
45381
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45341
diff
changeset
|
7740 \n\ |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45341
diff
changeset
|
7741 "); |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45341
diff
changeset
|
7742 |
|
47392
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7743 static PyObject * |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7744 unicode__format__(PyObject *self, PyObject *args) |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7745 { |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7746 PyObject *format_spec; |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7747 PyObject *result = NULL; |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7748 PyObject *tmp = NULL; |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7749 |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7750 /* If 2.x, convert format_spec to the same type as value */ |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7751 /* This is to allow things like u''.format('') */ |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7752 if (!PyArg_ParseTuple(args, "O:__format__", &format_spec)) |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7753 goto done; |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7754 if (!(PyBytes_Check(format_spec) || PyUnicode_Check(format_spec))) { |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7755 PyErr_Format(PyExc_TypeError, "__format__ arg must be str " |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7756 "or unicode, not %s", Py_TYPE(format_spec)->tp_name); |
|
47392
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7757 goto done; |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7758 } |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7759 tmp = PyObject_Unicode(format_spec); |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7760 if (tmp == NULL) |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7761 goto done; |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7762 format_spec = tmp; |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7763 |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7764 result = _PyUnicode_FormatAdvanced(self, |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7765 PyUnicode_AS_UNICODE(format_spec), |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7766 PyUnicode_GET_SIZE(format_spec)); |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7767 done: |
|
47392
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7768 Py_XDECREF(tmp); |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7769 return result; |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7770 } |
|
47ef9a806ce9
Refactor and clean up str.format() code (and helpers) in advance of optimizations.
Eric Smith <eric@trueblade.com>
parents:
47388
diff
changeset
|
7771 |
|
45381
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45341
diff
changeset
|
7772 PyDoc_STRVAR(p_format__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7773 "S.__format__(format_spec) -> unicode\n\ |
|
45381
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45341
diff
changeset
|
7774 \n\ |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45341
diff
changeset
|
7775 "); |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45341
diff
changeset
|
7776 |
|
47543
296ab1038b7f
Issue 3048: Fixed sys.getsizeof for unicode objects.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47527
diff
changeset
|
7777 static PyObject * |
|
296ab1038b7f
Issue 3048: Fixed sys.getsizeof for unicode objects.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47527
diff
changeset
|
7778 unicode__sizeof__(PyUnicodeObject *v) |
|
296ab1038b7f
Issue 3048: Fixed sys.getsizeof for unicode objects.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47527
diff
changeset
|
7779 { |
|
47922
7cfc28ac0715
Added additional __sizeof__ implementations and addressed comments made in
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47543
diff
changeset
|
7780 return PyInt_FromSsize_t(sizeof(PyUnicodeObject) + |
|
7cfc28ac0715
Added additional __sizeof__ implementations and addressed comments made in
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47543
diff
changeset
|
7781 sizeof(Py_UNICODE) * (v->length + 1)); |
|
47543
296ab1038b7f
Issue 3048: Fixed sys.getsizeof for unicode objects.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47527
diff
changeset
|
7782 } |
|
296ab1038b7f
Issue 3048: Fixed sys.getsizeof for unicode objects.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47527
diff
changeset
|
7783 |
|
296ab1038b7f
Issue 3048: Fixed sys.getsizeof for unicode objects.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47527
diff
changeset
|
7784 PyDoc_STRVAR(sizeof__doc__, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7785 "S.__sizeof__() -> size of S in memory, in bytes\n\ |
|
47543
296ab1038b7f
Issue 3048: Fixed sys.getsizeof for unicode objects.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47527
diff
changeset
|
7786 \n\ |
|
296ab1038b7f
Issue 3048: Fixed sys.getsizeof for unicode objects.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47527
diff
changeset
|
7787 "); |
|
27521
17bfd5dbc0f1
Implement appropriate __getnewargs__ for all immutable subclassable builtin
Guido van Rossum <guido@python.org>
parents:
27175
diff
changeset
|
7788 |
|
17bfd5dbc0f1
Implement appropriate __getnewargs__ for all immutable subclassable builtin
Guido van Rossum <guido@python.org>
parents:
27175
diff
changeset
|
7789 static PyObject * |
|
17bfd5dbc0f1
Implement appropriate __getnewargs__ for all immutable subclassable builtin
Guido van Rossum <guido@python.org>
parents:
27175
diff
changeset
|
7790 unicode_getnewargs(PyUnicodeObject *v) |
|
17bfd5dbc0f1
Implement appropriate __getnewargs__ for all immutable subclassable builtin
Guido van Rossum <guido@python.org>
parents:
27175
diff
changeset
|
7791 { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7792 return Py_BuildValue("(u#)", v->str, v->length); |
|
27521
17bfd5dbc0f1
Implement appropriate __getnewargs__ for all immutable subclassable builtin
Guido van Rossum <guido@python.org>
parents:
27175
diff
changeset
|
7793 } |
|
17bfd5dbc0f1
Implement appropriate __getnewargs__ for all immutable subclassable builtin
Guido van Rossum <guido@python.org>
parents:
27175
diff
changeset
|
7794 |
|
17bfd5dbc0f1
Implement appropriate __getnewargs__ for all immutable subclassable builtin
Guido van Rossum <guido@python.org>
parents:
27175
diff
changeset
|
7795 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7796 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
|
7797 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7798 /* 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
|
7799 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
|
7800 |
|
56093
f64c0eb8cc62
add keyword arguments support to str/unicode encode and decode #6300
Benjamin Peterson <benjamin@python.org>
parents:
56033
diff
changeset
|
7801 {"encode", (PyCFunction) unicode_encode, METH_VARARGS | METH_KEYWORDS, encode__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
|
7802 {"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
|
7803 {"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
|
7804 {"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
|
7805 {"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
|
7806 {"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
|
7807 {"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
|
7808 {"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
|
7809 {"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
|
7810 {"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
|
7811 {"find", (PyCFunction) unicode_find, METH_VARARGS, find__doc__}, |
|
38338
958f91684209
needforspeed: use METH_O for argument handling, which made partition some
Fredrik Lundh <fredrik@pythonware.com>
parents:
38335
diff
changeset
|
7812 {"partition", (PyCFunction) unicode_partition, METH_O, partition__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
|
7813 {"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
|
7814 {"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
|
7815 {"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
|
7816 {"lstrip", (PyCFunction) unicode_lstrip, METH_VARARGS, lstrip__doc__}, |
|
56093
f64c0eb8cc62
add keyword arguments support to str/unicode encode and decode #6300
Benjamin Peterson <benjamin@python.org>
parents:
56033
diff
changeset
|
7817 {"decode", (PyCFunction) unicode_decode, METH_VARARGS | METH_KEYWORDS, decode__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
|
7818 /* {"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
|
7819 {"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
|
7820 {"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
|
7821 {"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
|
7822 {"rstrip", (PyCFunction) unicode_rstrip, METH_VARARGS, rstrip__doc__}, |
|
38390
76807902a2f5
needforspeed: added rpartition implementation
Fredrik Lundh <fredrik@pythonware.com>
parents:
38383
diff
changeset
|
7823 {"rpartition", (PyCFunction) unicode_rpartition, METH_O, rpartition__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
|
7824 {"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
|
7825 {"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
|
7826 {"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
|
7827 {"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
|
7828 {"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
|
7829 {"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
|
7830 {"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
|
7831 {"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
|
7832 {"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
|
7833 {"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
|
7834 {"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
|
7835 {"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
|
7836 {"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
|
7837 {"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
|
7838 {"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
|
7839 {"isalnum", (PyCFunction) unicode_isalnum, METH_NOARGS, isalnum__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
|
7840 {"zfill", (PyCFunction) unicode_zfill, METH_VARARGS, zfill__doc__}, |
|
45381
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45341
diff
changeset
|
7841 {"format", (PyCFunction) do_string_format, METH_VARARGS | METH_KEYWORDS, format__doc__}, |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45341
diff
changeset
|
7842 {"__format__", (PyCFunction) unicode__format__, METH_VARARGS, p_format__doc__}, |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45341
diff
changeset
|
7843 {"_formatter_field_name_split", (PyCFunction) formatter_field_name_split, METH_NOARGS}, |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45341
diff
changeset
|
7844 {"_formatter_parser", (PyCFunction) formatter_parser, METH_NOARGS}, |
|
47543
296ab1038b7f
Issue 3048: Fixed sys.getsizeof for unicode objects.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47527
diff
changeset
|
7845 {"__sizeof__", (PyCFunction) unicode__sizeof__, METH_NOARGS, sizeof__doc__}, |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7846 #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
|
7847 {"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
|
7848 #endif |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7849 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7850 #if 0 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7851 /* This one is just used for debugging the implementation. */ |
|
45191
920a7633ae08
Unified naming convention for free lists and their limits. All free lists
Christian Heimes <christian@cheimes.de>
parents:
45053
diff
changeset
|
7852 {"freelistsize", (PyCFunction) free_listsize, METH_NOARGS}, |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7853 #endif |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7854 |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7855 {"__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
|
7856 {NULL, NULL} |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7857 }; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7858 |
|
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
|
7859 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
|
7860 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
|
7861 { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7862 if (!PyUnicode_Check(v)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7863 Py_INCREF(Py_NotImplemented); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7864 return Py_NotImplemented; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7865 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7866 return PyUnicode_Format(v, w); |
|
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
|
7867 } |
|
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
|
7868 |
|
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
|
7869 static PyNumberMethods unicode_as_number = { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7870 0, /*nb_add*/ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7871 0, /*nb_subtract*/ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7872 0, /*nb_multiply*/ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7873 0, /*nb_divide*/ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7874 unicode_mod, /*nb_remainder*/ |
|
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
|
7875 }; |
|
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
|
7876 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7877 static PySequenceMethods unicode_as_sequence = { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7878 (lenfunc) unicode_length, /* sq_length */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7879 PyUnicode_Concat, /* sq_concat */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7880 (ssizeargfunc) unicode_repeat, /* sq_repeat */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7881 (ssizeargfunc) unicode_getitem, /* sq_item */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7882 (ssizessizeargfunc) unicode_slice, /* sq_slice */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7883 0, /* sq_ass_item */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7884 0, /* sq_ass_slice */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7885 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
|
7886 }; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7887 |
|
23778
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7888 static PyObject* |
|
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7889 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
|
7890 { |
|
39491
2312e178b34d
Correct an accidentally removed previous patch.
Marc-André Lemburg <mal@egenix.com>
parents:
39487
diff
changeset
|
7891 if (PyIndex_Check(item)) { |
|
2312e178b34d
Correct an accidentally removed previous patch.
Marc-André Lemburg <mal@egenix.com>
parents:
39487
diff
changeset
|
7892 Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError); |
|
23778
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7893 if (i == -1 && PyErr_Occurred()) |
|
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7894 return NULL; |
|
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7895 if (i < 0) |
|
36203
44cfca6136c6
Stop maintaining the buildno file.
Martin v. Löwis <martin@v.loewis.de>
parents:
36056
diff
changeset
|
7896 i += PyUnicode_GET_SIZE(self); |
|
23778
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7897 return unicode_getitem(self, i); |
|
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7898 } else if (PySlice_Check(item)) { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
7899 Py_ssize_t start, stop, step, slicelength, cur, i; |
|
23778
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7900 Py_UNICODE* source_buf; |
|
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7901 Py_UNICODE* result_buf; |
|
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7902 PyObject* result; |
|
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7903 |
|
36203
44cfca6136c6
Stop maintaining the buildno file.
Martin v. Löwis <martin@v.loewis.de>
parents:
36056
diff
changeset
|
7904 if (PySlice_GetIndicesEx((PySliceObject*)item, PyUnicode_GET_SIZE(self), |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7905 &start, &stop, &step, &slicelength) < 0) { |
|
23778
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7906 return NULL; |
|
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7907 } |
|
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7908 |
|
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7909 if (slicelength <= 0) { |
|
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7910 return PyUnicode_FromUnicode(NULL, 0); |
|
42951
9620134010a5
Improve extended slicing support in builtin types and classes. Specifically:
Thomas Wouters <thomas@python.org>
parents:
42652
diff
changeset
|
7911 } else if (start == 0 && step == 1 && slicelength == self->length && |
|
9620134010a5
Improve extended slicing support in builtin types and classes. Specifically:
Thomas Wouters <thomas@python.org>
parents:
42652
diff
changeset
|
7912 PyUnicode_CheckExact(self)) { |
|
9620134010a5
Improve extended slicing support in builtin types and classes. Specifically:
Thomas Wouters <thomas@python.org>
parents:
42652
diff
changeset
|
7913 Py_INCREF(self); |
|
9620134010a5
Improve extended slicing support in builtin types and classes. Specifically:
Thomas Wouters <thomas@python.org>
parents:
42652
diff
changeset
|
7914 return (PyObject *)self; |
|
9620134010a5
Improve extended slicing support in builtin types and classes. Specifically:
Thomas Wouters <thomas@python.org>
parents:
42652
diff
changeset
|
7915 } else if (step == 1) { |
|
9620134010a5
Improve extended slicing support in builtin types and classes. Specifically:
Thomas Wouters <thomas@python.org>
parents:
42652
diff
changeset
|
7916 return PyUnicode_FromUnicode(self->str + start, slicelength); |
|
23778
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7917 } else { |
|
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7918 source_buf = PyUnicode_AS_UNICODE((PyObject*)self); |
|
45804
d33cadb595f6
Issue 2321: reduce memory usage (increase the memory that is returned
Neal Norwitz <nnorwitz@gmail.com>
parents:
45731
diff
changeset
|
7919 result_buf = (Py_UNICODE *)PyObject_MALLOC(slicelength* |
|
d33cadb595f6
Issue 2321: reduce memory usage (increase the memory that is returned
Neal Norwitz <nnorwitz@gmail.com>
parents:
45731
diff
changeset
|
7920 sizeof(Py_UNICODE)); |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7921 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7922 if (result_buf == NULL) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7923 return PyErr_NoMemory(); |
|
23778
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7924 |
|
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7925 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
|
7926 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
|
7927 } |
|
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
|
7928 |
|
23778
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7929 result = PyUnicode_FromUnicode(result_buf, slicelength); |
|
45804
d33cadb595f6
Issue 2321: reduce memory usage (increase the memory that is returned
Neal Norwitz <nnorwitz@gmail.com>
parents:
45731
diff
changeset
|
7930 PyObject_FREE(result_buf); |
|
23778
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7931 return result; |
|
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7932 } |
|
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7933 } else { |
|
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7934 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
|
7935 return NULL; |
|
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7936 } |
|
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7937 } |
|
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7938 |
|
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7939 static PyMappingMethods unicode_as_mapping = { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7940 (lenfunc)unicode_length, /* mp_length */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7941 (binaryfunc)unicode_subscript, /* mp_subscript */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
7942 (objobjargproc)0, /* mp_ass_subscript */ |
|
23778
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7943 }; |
|
245224d1b8c9
This is my nearly two year old patch
Michael W. Hudson <mwh@python.net>
parents:
23562
diff
changeset
|
7944 |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
7945 static Py_ssize_t |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7946 unicode_buffer_getreadbuf(PyUnicodeObject *self, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7947 Py_ssize_t index, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7948 const void **ptr) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7949 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7950 if (index != 0) { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7951 PyErr_SetString(PyExc_SystemError, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7952 "accessing non-existent unicode segment"); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7953 return -1; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7954 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7955 *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
|
7956 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
|
7957 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7958 |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
7959 static Py_ssize_t |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
7960 unicode_buffer_getwritebuf(PyUnicodeObject *self, Py_ssize_t index, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7961 const void **ptr) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7962 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7963 PyErr_SetString(PyExc_TypeError, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7964 "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
|
7965 return -1; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7966 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7967 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7968 static int |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7969 unicode_buffer_getsegcount(PyUnicodeObject *self, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7970 Py_ssize_t *lenp) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7971 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7972 if (lenp) |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7973 *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
|
7974 return 1; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7975 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7976 |
|
36519
d6d415df0df0
Use Py_ssize_t for counts and sizes.
Martin v. Löwis <martin@v.loewis.de>
parents:
36510
diff
changeset
|
7977 static Py_ssize_t |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7978 unicode_buffer_getcharbuf(PyUnicodeObject *self, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7979 Py_ssize_t index, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7980 const void **ptr) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7981 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7982 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
|
7983 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7984 if (index != 0) { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7985 PyErr_SetString(PyExc_SystemError, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7986 "accessing non-existent unicode segment"); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7987 return -1; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7988 } |
|
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
|
7989 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
|
7990 if (str == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
7991 return -1; |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
7992 *ptr = (void *) PyString_AS_STRING(str); |
|
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
7993 return PyString_GET_SIZE(str); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7994 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7995 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7996 /* 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
|
7997 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
7998 static PyObject * |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
7999 getnextarg(PyObject *args, Py_ssize_t arglen, Py_ssize_t *p_argidx) |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
8000 { |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
8001 Py_ssize_t argidx = *p_argidx; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8002 if (argidx < arglen) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8003 (*p_argidx)++; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8004 if (arglen < 0) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8005 return args; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8006 else |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8007 return PyTuple_GetItem(args, argidx); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8008 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8009 PyErr_SetString(PyExc_TypeError, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8010 "not enough arguments for format string"); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8011 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8012 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8013 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8014 #define F_LJUST (1<<0) |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8015 #define F_SIGN (1<<1) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8016 #define F_BLANK (1<<2) |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8017 #define F_ALT (1<<3) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8018 #define F_ZERO (1<<4) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8019 |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
8020 static Py_ssize_t |
|
36261
303dea847639
- Patch #1400181, fix unicode string formatting to not use the locale.
Neal Norwitz <nnorwitz@gmail.com>
parents:
36236
diff
changeset
|
8021 strtounicode(Py_UNICODE *buffer, const char *charbuffer) |
|
303dea847639
- Patch #1400181, fix unicode string formatting to not use the locale.
Neal Norwitz <nnorwitz@gmail.com>
parents:
36236
diff
changeset
|
8022 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
8023 register Py_ssize_t i; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
8024 Py_ssize_t len = strlen(charbuffer); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8025 for (i = len - 1; i >= 0; i--) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8026 buffer[i] = (Py_UNICODE) charbuffer[i]; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8027 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8028 return len; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8029 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8030 |
|
36261
303dea847639
- Patch #1400181, fix unicode string formatting to not use the locale.
Neal Norwitz <nnorwitz@gmail.com>
parents:
36236
diff
changeset
|
8031 static int |
|
303dea847639
- Patch #1400181, fix unicode string formatting to not use the locale.
Neal Norwitz <nnorwitz@gmail.com>
parents:
36236
diff
changeset
|
8032 longtounicode(Py_UNICODE *buffer, size_t len, const char *format, long x) |
|
303dea847639
- Patch #1400181, fix unicode string formatting to not use the locale.
Neal Norwitz <nnorwitz@gmail.com>
parents:
36236
diff
changeset
|
8033 { |
|
36508
7322dccba224
doubletounicode(), longtounicode():
Tim Peters <tim.peters@gmail.com>
parents:
36506
diff
changeset
|
8034 Py_ssize_t result; |
|
7322dccba224
doubletounicode(), longtounicode():
Tim Peters <tim.peters@gmail.com>
parents:
36506
diff
changeset
|
8035 |
|
36261
303dea847639
- Patch #1400181, fix unicode string formatting to not use the locale.
Neal Norwitz <nnorwitz@gmail.com>
parents:
36236
diff
changeset
|
8036 PyOS_snprintf((char *)buffer, len, format, x); |
|
36508
7322dccba224
doubletounicode(), longtounicode():
Tim Peters <tim.peters@gmail.com>
parents:
36506
diff
changeset
|
8037 result = strtounicode(buffer, (char *)buffer); |
|
7322dccba224
doubletounicode(), longtounicode():
Tim Peters <tim.peters@gmail.com>
parents:
36506
diff
changeset
|
8038 return Py_SAFE_DOWNCAST(result, Py_ssize_t, int); |
|
36261
303dea847639
- Patch #1400181, fix unicode string formatting to not use the locale.
Neal Norwitz <nnorwitz@gmail.com>
parents:
36236
diff
changeset
|
8039 } |
|
303dea847639
- Patch #1400181, fix unicode string formatting to not use the locale.
Neal Norwitz <nnorwitz@gmail.com>
parents:
36236
diff
changeset
|
8040 |
|
24736
ff05eef3a6d1
Implement stage B0 of PEP 237: add warnings for operations that
Guido van Rossum <guido@python.org>
parents:
24703
diff
changeset
|
8041 /* 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
|
8042 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
|
8043 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
|
8044 |
|
57412
808f9c0d4ac4
Remove restriction on precision when formatting floats. This is the
Mark Dickinson <dickinsm@gmail.com>
parents:
56758
diff
changeset
|
8045 /* Returns a new reference to a PyUnicode object, or NULL on failure. */ |
|
808f9c0d4ac4
Remove restriction on precision when formatting floats. This is the
Mark Dickinson <dickinsm@gmail.com>
parents:
56758
diff
changeset
|
8046 |
|
808f9c0d4ac4
Remove restriction on precision when formatting floats. This is the
Mark Dickinson <dickinsm@gmail.com>
parents:
56758
diff
changeset
|
8047 static PyObject * |
|
808f9c0d4ac4
Remove restriction on precision when formatting floats. This is the
Mark Dickinson <dickinsm@gmail.com>
parents:
56758
diff
changeset
|
8048 formatfloat(PyObject *v, int flags, int prec, int type) |
|
808f9c0d4ac4
Remove restriction on precision when formatting floats. This is the
Mark Dickinson <dickinsm@gmail.com>
parents:
56758
diff
changeset
|
8049 { |
|
808f9c0d4ac4
Remove restriction on precision when formatting floats. This is the
Mark Dickinson <dickinsm@gmail.com>
parents:
56758
diff
changeset
|
8050 char *p; |
|
808f9c0d4ac4
Remove restriction on precision when formatting floats. This is the
Mark Dickinson <dickinsm@gmail.com>
parents:
56758
diff
changeset
|
8051 PyObject *result; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8052 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
|
8053 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8054 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
|
8055 if (x == -1.0 && PyErr_Occurred()) |
|
57412
808f9c0d4ac4
Remove restriction on precision when formatting floats. This is the
Mark Dickinson <dickinsm@gmail.com>
parents:
56758
diff
changeset
|
8056 return NULL; |
|
808f9c0d4ac4
Remove restriction on precision when formatting floats. This is the
Mark Dickinson <dickinsm@gmail.com>
parents:
56758
diff
changeset
|
8057 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8058 if (prec < 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8059 prec = 6; |
|
52410
f05b6d9adbe6
Issue #532631: Apply floatformat changes to unicodeobject.c
Mark Dickinson <dickinsm@gmail.com>
parents:
52404
diff
changeset
|
8060 |
|
57412
808f9c0d4ac4
Remove restriction on precision when formatting floats. This is the
Mark Dickinson <dickinsm@gmail.com>
parents:
56758
diff
changeset
|
8061 p = PyOS_double_to_string(x, type, prec, |
|
808f9c0d4ac4
Remove restriction on precision when formatting floats. This is the
Mark Dickinson <dickinsm@gmail.com>
parents:
56758
diff
changeset
|
8062 (flags & F_ALT) ? Py_DTSF_ALT : 0, NULL); |
|
808f9c0d4ac4
Remove restriction on precision when formatting floats. This is the
Mark Dickinson <dickinsm@gmail.com>
parents:
56758
diff
changeset
|
8063 if (p == NULL) |
|
808f9c0d4ac4
Remove restriction on precision when formatting floats. This is the
Mark Dickinson <dickinsm@gmail.com>
parents:
56758
diff
changeset
|
8064 return NULL; |
|
808f9c0d4ac4
Remove restriction on precision when formatting floats. This is the
Mark Dickinson <dickinsm@gmail.com>
parents:
56758
diff
changeset
|
8065 result = PyUnicode_FromStringAndSize(p, strlen(p)); |
|
808f9c0d4ac4
Remove restriction on precision when formatting floats. This is the
Mark Dickinson <dickinsm@gmail.com>
parents:
56758
diff
changeset
|
8066 PyMem_Free(p); |
|
808f9c0d4ac4
Remove restriction on precision when formatting floats. This is the
Mark Dickinson <dickinsm@gmail.com>
parents:
56758
diff
changeset
|
8067 return result; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8068 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8069 |
|
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
|
8070 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
|
8071 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
|
8072 { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8073 char *buf; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8074 int i, len; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8075 PyObject *str; /* temporary string object. */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8076 PyUnicodeObject *result; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8077 |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8078 str = _PyString_FormatLong(val, flags, prec, type, &buf, &len); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8079 if (!str) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8080 return NULL; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8081 result = _PyUnicode_New(len); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8082 if (!result) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8083 Py_DECREF(str); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8084 return NULL; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8085 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8086 for (i = 0; i < len; i++) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8087 result->str[i] = buf[i]; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8088 result->str[len] = 0; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8089 Py_DECREF(str); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8090 return (PyObject*)result; |
|
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
|
8091 } |
|
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
|
8092 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8093 static int |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8094 formatint(Py_UNICODE *buf, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8095 size_t buflen, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8096 int flags, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8097 int prec, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8098 int type, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8099 PyObject *v) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8100 { |
|
13196
18920eaa1226
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
13110
diff
changeset
|
8101 /* 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
|
8102 * 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
|
8103 * + 1 + 1 |
|
5b24a6ae2dc4
%#x/%#X format conversion cleanup (see patch #450267):
Andrew MacIntyre <andymac@bullseye.apana.org.au>
parents:
22053
diff
changeset
|
8104 * = 24 |
|
5b24a6ae2dc4
%#x/%#X format conversion cleanup (see patch #450267):
Andrew MacIntyre <andymac@bullseye.apana.org.au>
parents:
22053
diff
changeset
|
8105 */ |
|
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
|
8106 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
|
8107 char *sign; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8108 long x; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8109 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8110 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
|
8111 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
|
8112 return -1; |
|
31042
9c846c3df6f3
- Removed FutureWarnings related to hex/oct literals and conversions
Guido van Rossum <guido@python.org>
parents:
31021
diff
changeset
|
8113 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
|
8114 type = 'd'; |
|
9c846c3df6f3
- Removed FutureWarnings related to hex/oct literals and conversions
Guido van Rossum <guido@python.org>
parents:
31021
diff
changeset
|
8115 } |
|
9c846c3df6f3
- Removed FutureWarnings related to hex/oct literals and conversions
Guido van Rossum <guido@python.org>
parents:
31021
diff
changeset
|
8116 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
|
8117 sign = "-"; |
|
9c846c3df6f3
- Removed FutureWarnings related to hex/oct literals and conversions
Guido van Rossum <guido@python.org>
parents:
31021
diff
changeset
|
8118 else |
|
9c846c3df6f3
- Removed FutureWarnings related to hex/oct literals and conversions
Guido van Rossum <guido@python.org>
parents:
31021
diff
changeset
|
8119 sign = ""; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8120 if (prec < 0) |
|
22087
5b24a6ae2dc4
%#x/%#X format conversion cleanup (see patch #450267):
Andrew MacIntyre <andymac@bullseye.apana.org.au>
parents:
22053
diff
changeset
|
8121 prec = 1; |
|
5b24a6ae2dc4
%#x/%#X format conversion cleanup (see patch #450267):
Andrew MacIntyre <andymac@bullseye.apana.org.au>
parents:
22053
diff
changeset
|
8122 |
|
31042
9c846c3df6f3
- Removed FutureWarnings related to hex/oct literals and conversions
Guido van Rossum <guido@python.org>
parents:
31021
diff
changeset
|
8123 /* 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
|
8124 * 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
|
8125 */ |
|
31042
9c846c3df6f3
- Removed FutureWarnings related to hex/oct literals and conversions
Guido van Rossum <guido@python.org>
parents:
31021
diff
changeset
|
8126 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
|
8127 PyErr_SetString(PyExc_OverflowError, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8128 "formatted integer is too long (precision too large?)"); |
|
22087
5b24a6ae2dc4
%#x/%#X format conversion cleanup (see patch #450267):
Andrew MacIntyre <andymac@bullseye.apana.org.au>
parents:
22053
diff
changeset
|
8129 return -1; |
|
5b24a6ae2dc4
%#x/%#X format conversion cleanup (see patch #450267):
Andrew MacIntyre <andymac@bullseye.apana.org.au>
parents:
22053
diff
changeset
|
8130 } |
|
5b24a6ae2dc4
%#x/%#X format conversion cleanup (see patch #450267):
Andrew MacIntyre <andymac@bullseye.apana.org.au>
parents:
22053
diff
changeset
|
8131 |
|
5b24a6ae2dc4
%#x/%#X format conversion cleanup (see patch #450267):
Andrew MacIntyre <andymac@bullseye.apana.org.au>
parents:
22053
diff
changeset
|
8132 if ((flags & F_ALT) && |
|
5b24a6ae2dc4
%#x/%#X format conversion cleanup (see patch #450267):
Andrew MacIntyre <andymac@bullseye.apana.org.au>
parents:
22053
diff
changeset
|
8133 (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
|
8134 /* 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
|
8135 * 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
|
8136 * - 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
|
8137 * 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
|
8138 * %#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
|
8139 * hex() function |
|
5b24a6ae2dc4
%#x/%#X format conversion cleanup (see patch #450267):
Andrew MacIntyre <andymac@bullseye.apana.org.au>
parents:
22053
diff
changeset
|
8140 * - 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
|
8141 * 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
|
8142 * (Metrowerks, Compaq Tru64) |
|
5b24a6ae2dc4
%#x/%#X format conversion cleanup (see patch #450267):
Andrew MacIntyre <andymac@bullseye.apana.org.au>
parents:
22053
diff
changeset
|
8143 * - 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
|
8144 * 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
|
8145 * 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
|
8146 * |
|
22087
5b24a6ae2dc4
%#x/%#X format conversion cleanup (see patch #450267):
Andrew MacIntyre <andymac@bullseye.apana.org.au>
parents:
22053
diff
changeset
|
8147 * 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
|
8148 * 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
|
8149 * of %#x/%#X. |
|
5b24a6ae2dc4
%#x/%#X format conversion cleanup (see patch #450267):
Andrew MacIntyre <andymac@bullseye.apana.org.au>
parents:
22053
diff
changeset
|
8150 * |
|
5b24a6ae2dc4
%#x/%#X format conversion cleanup (see patch #450267):
Andrew MacIntyre <andymac@bullseye.apana.org.au>
parents:
22053
diff
changeset
|
8151 * 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
|
8152 * 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
|
8153 */ |
|
31042
9c846c3df6f3
- Removed FutureWarnings related to hex/oct literals and conversions
Guido van Rossum <guido@python.org>
parents:
31021
diff
changeset
|
8154 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
|
8155 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
|
8156 } |
|
5b24a6ae2dc4
%#x/%#X format conversion cleanup (see patch #450267):
Andrew MacIntyre <andymac@bullseye.apana.org.au>
parents:
22053
diff
changeset
|
8157 else { |
|
31042
9c846c3df6f3
- Removed FutureWarnings related to hex/oct literals and conversions
Guido van Rossum <guido@python.org>
parents:
31021
diff
changeset
|
8158 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
|
8159 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
|
8160 prec, type); |
|
5b24a6ae2dc4
%#x/%#X format conversion cleanup (see patch #450267):
Andrew MacIntyre <andymac@bullseye.apana.org.au>
parents:
22053
diff
changeset
|
8161 } |
|
31042
9c846c3df6f3
- Removed FutureWarnings related to hex/oct literals and conversions
Guido van Rossum <guido@python.org>
parents:
31021
diff
changeset
|
8162 if (sign[0]) |
|
36261
303dea847639
- Patch #1400181, fix unicode string formatting to not use the locale.
Neal Norwitz <nnorwitz@gmail.com>
parents:
36236
diff
changeset
|
8163 return longtounicode(buf, buflen, fmt, -x); |
|
31042
9c846c3df6f3
- Removed FutureWarnings related to hex/oct literals and conversions
Guido van Rossum <guido@python.org>
parents:
31021
diff
changeset
|
8164 else |
|
36261
303dea847639
- Patch #1400181, fix unicode string formatting to not use the locale.
Neal Norwitz <nnorwitz@gmail.com>
parents:
36236
diff
changeset
|
8165 return longtounicode(buf, buflen, fmt, x); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8166 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8167 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8168 static int |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8169 formatchar(Py_UNICODE *buf, |
|
13196
18920eaa1226
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
13110
diff
changeset
|
8170 size_t buflen, |
|
18920eaa1226
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
13110
diff
changeset
|
8171 PyObject *v) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8172 { |
|
13196
18920eaa1226
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
13110
diff
changeset
|
8173 /* 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
|
8174 if (PyUnicode_Check(v)) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8175 if (PyUnicode_GET_SIZE(v) != 1) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8176 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8177 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
|
8178 } |
|
9df91f91e5cc
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12876
diff
changeset
|
8179 |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
8180 else if (PyString_Check(v)) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8181 if (PyString_GET_SIZE(v) != 1) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8182 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8183 buf[0] = (Py_UNICODE)PyString_AS_STRING(v)[0]; |
|
12899
9df91f91e5cc
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12876
diff
changeset
|
8184 } |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8185 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8186 else { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8187 /* Integer input truncated to a character */ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8188 long x; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8189 x = PyInt_AsLong(v); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8190 if (x == -1 && PyErr_Occurred()) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8191 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
|
8192 #ifdef Py_UNICODE_WIDE |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8193 if (x < 0 || x > 0x10ffff) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8194 PyErr_SetString(PyExc_OverflowError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8195 "%c arg not in range(0x110000) " |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8196 "(wide Python build)"); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8197 return -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8198 } |
|
24737
eaa87632b1e8
Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level.
Marc-André Lemburg <mal@egenix.com>
parents:
24736
diff
changeset
|
8199 #else |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8200 if (x < 0 || x > 0xffff) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8201 PyErr_SetString(PyExc_OverflowError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8202 "%c arg not in range(0x10000) " |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8203 "(narrow Python build)"); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8204 return -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8205 } |
|
24737
eaa87632b1e8
Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level.
Marc-André Lemburg <mal@egenix.com>
parents:
24736
diff
changeset
|
8206 #endif |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8207 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
|
8208 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8209 buf[1] = '\0'; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8210 return 1; |
|
12899
9df91f91e5cc
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12876
diff
changeset
|
8211 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8212 onError: |
|
12899
9df91f91e5cc
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12876
diff
changeset
|
8213 PyErr_SetString(PyExc_TypeError, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8214 "%c requires int or char"); |
|
12899
9df91f91e5cc
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12876
diff
changeset
|
8215 return -1; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8216 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8217 |
|
13196
18920eaa1226
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
13110
diff
changeset
|
8218 /* 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
|
8219 |
|
57412
808f9c0d4ac4
Remove restriction on precision when formatting floats. This is the
Mark Dickinson <dickinsm@gmail.com>
parents:
56758
diff
changeset
|
8220 FORMATBUFLEN is the length of the buffer in which the ints & |
|
13196
18920eaa1226
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
13110
diff
changeset
|
8221 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
|
8222 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
|
8223 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
|
8224 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
|
8225 */ |
|
18920eaa1226
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
13110
diff
changeset
|
8226 #define FORMATBUFLEN (size_t)120 |
|
18920eaa1226
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
13110
diff
changeset
|
8227 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8228 PyObject *PyUnicode_Format(PyObject *format, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8229 PyObject *args) |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8230 { |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8231 Py_UNICODE *fmt, *res; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
8232 Py_ssize_t fmtcnt, rescnt, reslen, arglen, argidx; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8233 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
|
8234 PyUnicodeObject *result = NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8235 PyObject *dict = NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8236 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
|
8237 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8238 if (format == NULL || args == NULL) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8239 PyErr_BadInternalCall(); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8240 return NULL; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8241 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8242 uformat = PyUnicode_FromObject(format); |
|
12645
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
8243 if (uformat == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8244 return NULL; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8245 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
|
8246 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
|
8247 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8248 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
|
8249 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
|
8250 if (result == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8251 goto onError; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8252 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
|
8253 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8254 if (PyTuple_Check(args)) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8255 arglen = PyTuple_Size(args); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8256 argidx = 0; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8257 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8258 else { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8259 arglen = -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8260 argidx = -2; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8261 } |
|
44350
26384b8180c7
#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available.
Christian Heimes <christian@cheimes.de>
parents:
43932
diff
changeset
|
8262 if (Py_TYPE(args)->tp_as_mapping && !PyTuple_Check(args) && |
|
26164
63a08639dae2
Fix SF # 635969, No error "not all arguments converted"
Neal Norwitz <nnorwitz@gmail.com>
parents:
25895
diff
changeset
|
8263 !PyObject_TypeCheck(args, &PyBaseString_Type)) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8264 dict = args; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8265 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8266 while (--fmtcnt >= 0) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8267 if (*fmt != '%') { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8268 if (--rescnt < 0) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8269 rescnt = fmtcnt + 100; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8270 reslen += rescnt; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8271 if (_PyUnicode_Resize(&result, reslen) < 0) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8272 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8273 res = PyUnicode_AS_UNICODE(result) + reslen - rescnt; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8274 --rescnt; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8275 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8276 *res++ = *fmt++; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8277 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8278 else { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8279 /* Got a format specifier */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8280 int flags = 0; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8281 Py_ssize_t width = -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8282 int prec = -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8283 Py_UNICODE c = '\0'; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8284 Py_UNICODE fill; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8285 int isnumok; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8286 PyObject *v = NULL; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8287 PyObject *temp = NULL; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8288 Py_UNICODE *pbuf; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8289 Py_UNICODE sign; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8290 Py_ssize_t len; |
|
57412
808f9c0d4ac4
Remove restriction on precision when formatting floats. This is the
Mark Dickinson <dickinsm@gmail.com>
parents:
56758
diff
changeset
|
8291 Py_UNICODE formatbuf[FORMATBUFLEN]; /* For format{int,char}() */ |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8292 |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8293 fmt++; |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8294 if (*fmt == '(') { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8295 Py_UNICODE *keystart; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8296 Py_ssize_t keylen; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8297 PyObject *key; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8298 int pcount = 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8299 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8300 if (dict == NULL) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8301 PyErr_SetString(PyExc_TypeError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8302 "format requires a mapping"); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8303 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8304 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8305 ++fmt; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8306 --fmtcnt; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8307 keystart = fmt; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8308 /* Skip over balanced parentheses */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8309 while (pcount > 0 && --fmtcnt >= 0) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8310 if (*fmt == ')') |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8311 --pcount; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8312 else if (*fmt == '(') |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8313 ++pcount; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8314 fmt++; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8315 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8316 keylen = fmt - keystart - 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8317 if (fmtcnt < 0 || pcount > 0) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8318 PyErr_SetString(PyExc_ValueError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8319 "incomplete format key"); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8320 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8321 } |
|
21028
3dfbbf42bf16
Fix for bug #438164: %-formatting using Unicode objects.
Marc-André Lemburg <mal@egenix.com>
parents:
20563
diff
changeset
|
8322 #if 0 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8323 /* keys are converted to strings using UTF-8 and |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8324 then looked up since Python uses strings to hold |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8325 variables names etc. in its namespaces and we |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8326 wouldn't want to break common idioms. */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8327 key = PyUnicode_EncodeUTF8(keystart, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8328 keylen, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8329 NULL); |
|
21028
3dfbbf42bf16
Fix for bug #438164: %-formatting using Unicode objects.
Marc-André Lemburg <mal@egenix.com>
parents:
20563
diff
changeset
|
8330 #else |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8331 key = PyUnicode_FromUnicode(keystart, keylen); |
|
21028
3dfbbf42bf16
Fix for bug #438164: %-formatting using Unicode objects.
Marc-André Lemburg <mal@egenix.com>
parents:
20563
diff
changeset
|
8332 #endif |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8333 if (key == NULL) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8334 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8335 if (args_owned) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8336 Py_DECREF(args); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8337 args_owned = 0; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8338 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8339 args = PyObject_GetItem(dict, key); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8340 Py_DECREF(key); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8341 if (args == NULL) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8342 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8343 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8344 args_owned = 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8345 arglen = -1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8346 argidx = -2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8347 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8348 while (--fmtcnt >= 0) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8349 switch (c = *fmt++) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8350 case '-': flags |= F_LJUST; continue; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8351 case '+': flags |= F_SIGN; continue; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8352 case ' ': flags |= F_BLANK; continue; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8353 case '#': flags |= F_ALT; continue; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8354 case '0': flags |= F_ZERO; continue; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8355 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8356 break; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8357 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8358 if (c == '*') { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8359 v = getnextarg(args, arglen, &argidx); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8360 if (v == NULL) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8361 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8362 if (!PyInt_Check(v)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8363 PyErr_SetString(PyExc_TypeError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8364 "* wants int"); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8365 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8366 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8367 width = PyInt_AsLong(v); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8368 if (width < 0) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8369 flags |= F_LJUST; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8370 width = -width; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8371 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8372 if (--fmtcnt >= 0) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8373 c = *fmt++; |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8374 } |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8375 else if (c >= '0' && c <= '9') { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8376 width = c - '0'; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8377 while (--fmtcnt >= 0) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8378 c = *fmt++; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8379 if (c < '0' || c > '9') |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8380 break; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8381 if ((width*10) / 10 != width) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8382 PyErr_SetString(PyExc_ValueError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8383 "width too big"); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8384 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8385 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8386 width = width*10 + (c - '0'); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8387 } |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8388 } |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8389 if (c == '.') { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8390 prec = 0; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8391 if (--fmtcnt >= 0) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8392 c = *fmt++; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8393 if (c == '*') { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8394 v = getnextarg(args, arglen, &argidx); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8395 if (v == NULL) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8396 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8397 if (!PyInt_Check(v)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8398 PyErr_SetString(PyExc_TypeError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8399 "* wants int"); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8400 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8401 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8402 prec = PyInt_AsLong(v); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8403 if (prec < 0) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8404 prec = 0; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8405 if (--fmtcnt >= 0) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8406 c = *fmt++; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8407 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8408 else if (c >= '0' && c <= '9') { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8409 prec = c - '0'; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8410 while (--fmtcnt >= 0) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8411 c = Py_CHARMASK(*fmt++); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8412 if (c < '0' || c > '9') |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8413 break; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8414 if ((prec*10) / 10 != prec) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8415 PyErr_SetString(PyExc_ValueError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8416 "prec too big"); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8417 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8418 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8419 prec = prec*10 + (c - '0'); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8420 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8421 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8422 } /* prec */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8423 if (fmtcnt >= 0) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8424 if (c == 'h' || c == 'l' || c == 'L') { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8425 if (--fmtcnt >= 0) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8426 c = *fmt++; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8427 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8428 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8429 if (fmtcnt < 0) { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8430 PyErr_SetString(PyExc_ValueError, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8431 "incomplete format"); |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8432 goto onError; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8433 } |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8434 if (c != '%') { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8435 v = getnextarg(args, arglen, &argidx); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8436 if (v == NULL) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8437 goto onError; |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8438 } |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8439 sign = 0; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8440 fill = ' '; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8441 switch (c) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8442 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8443 case '%': |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8444 pbuf = formatbuf; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8445 /* presume that buffer length is at least 1 */ |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8446 pbuf[0] = '%'; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8447 len = 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8448 break; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8449 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8450 case 's': |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8451 case 'r': |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8452 if (PyUnicode_Check(v) && c == 's') { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8453 temp = v; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8454 Py_INCREF(temp); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8455 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8456 else { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8457 PyObject *unicode; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8458 if (c == 's') |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8459 temp = PyObject_Unicode(v); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8460 else |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8461 temp = PyObject_Repr(v); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8462 if (temp == NULL) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8463 goto onError; |
|
32801
16de4f90ef44
Let u'%s' % obj try obj.__unicode__() first and fallback to obj.__str__().
Marc-André Lemburg <mal@egenix.com>
parents:
32695
diff
changeset
|
8464 if (PyUnicode_Check(temp)) |
|
16de4f90ef44
Let u'%s' % obj try obj.__unicode__() first and fallback to obj.__str__().
Marc-André Lemburg <mal@egenix.com>
parents:
32695
diff
changeset
|
8465 /* nothing to do */; |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47392
diff
changeset
|
8466 else if (PyString_Check(temp)) { |
|
32801
16de4f90ef44
Let u'%s' % obj try obj.__unicode__() first and fallback to obj.__str__().
Marc-André Lemburg <mal@egenix.com>
parents:
32695
diff
changeset
|
8467 /* convert to string to Unicode */ |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8468 unicode = PyUnicode_Decode(PyString_AS_STRING(temp), |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8469 PyString_GET_SIZE(temp), |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8470 NULL, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8471 "strict"); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8472 Py_DECREF(temp); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8473 temp = unicode; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8474 if (temp == NULL) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8475 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8476 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8477 else { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8478 Py_DECREF(temp); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8479 PyErr_SetString(PyExc_TypeError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8480 "%s argument has non-string str()"); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8481 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8482 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8483 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8484 pbuf = PyUnicode_AS_UNICODE(temp); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8485 len = PyUnicode_GET_SIZE(temp); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8486 if (prec >= 0 && len > prec) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8487 len = prec; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8488 break; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8489 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8490 case 'i': |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8491 case 'd': |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8492 case 'u': |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8493 case 'o': |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8494 case 'x': |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8495 case 'X': |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8496 if (c == 'i') |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8497 c = 'd'; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8498 isnumok = 0; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8499 if (PyNumber_Check(v)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8500 PyObject *iobj=NULL; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8501 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8502 if (PyInt_Check(v) || (PyLong_Check(v))) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8503 iobj = v; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8504 Py_INCREF(iobj); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8505 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8506 else { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8507 iobj = PyNumber_Int(v); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8508 if (iobj==NULL) iobj = PyNumber_Long(v); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8509 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8510 if (iobj!=NULL) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8511 if (PyInt_Check(iobj)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8512 isnumok = 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8513 pbuf = formatbuf; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8514 len = formatint(pbuf, sizeof(formatbuf)/sizeof(Py_UNICODE), |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8515 flags, prec, c, iobj); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8516 Py_DECREF(iobj); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8517 if (len < 0) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8518 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8519 sign = 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8520 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8521 else if (PyLong_Check(iobj)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8522 isnumok = 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8523 temp = formatlong(iobj, flags, prec, c); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8524 Py_DECREF(iobj); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8525 if (!temp) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8526 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8527 pbuf = PyUnicode_AS_UNICODE(temp); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8528 len = PyUnicode_GET_SIZE(temp); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8529 sign = 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8530 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8531 else { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8532 Py_DECREF(iobj); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8533 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8534 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8535 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8536 if (!isnumok) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8537 PyErr_Format(PyExc_TypeError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8538 "%%%c format: a number is required, " |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8539 "not %.200s", (char)c, Py_TYPE(v)->tp_name); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8540 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8541 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8542 if (flags & F_ZERO) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8543 fill = '0'; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8544 break; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8545 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8546 case 'e': |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8547 case 'E': |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8548 case 'f': |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8549 case 'F': |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8550 case 'g': |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8551 case 'G': |
|
57412
808f9c0d4ac4
Remove restriction on precision when formatting floats. This is the
Mark Dickinson <dickinsm@gmail.com>
parents:
56758
diff
changeset
|
8552 temp = formatfloat(v, flags, prec, c); |
|
808f9c0d4ac4
Remove restriction on precision when formatting floats. This is the
Mark Dickinson <dickinsm@gmail.com>
parents:
56758
diff
changeset
|
8553 if (temp == NULL) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8554 goto onError; |
|
57412
808f9c0d4ac4
Remove restriction on precision when formatting floats. This is the
Mark Dickinson <dickinsm@gmail.com>
parents:
56758
diff
changeset
|
8555 pbuf = PyUnicode_AS_UNICODE(temp); |
|
808f9c0d4ac4
Remove restriction on precision when formatting floats. This is the
Mark Dickinson <dickinsm@gmail.com>
parents:
56758
diff
changeset
|
8556 len = PyUnicode_GET_SIZE(temp); |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8557 sign = 1; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8558 if (flags & F_ZERO) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8559 fill = '0'; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8560 break; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8561 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8562 case 'c': |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8563 pbuf = formatbuf; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8564 len = formatchar(pbuf, sizeof(formatbuf)/sizeof(Py_UNICODE), v); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8565 if (len < 0) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8566 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8567 break; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8568 |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8569 default: |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8570 PyErr_Format(PyExc_ValueError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8571 "unsupported format character '%c' (0x%x) " |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8572 "at index %zd", |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8573 (31<=c && c<=126) ? (char)c : '?', |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8574 (int)c, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8575 (Py_ssize_t)(fmt - 1 - |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8576 PyUnicode_AS_UNICODE(uformat))); |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8577 goto onError; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8578 } |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8579 if (sign) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8580 if (*pbuf == '-' || *pbuf == '+') { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8581 sign = *pbuf++; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8582 len--; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8583 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8584 else if (flags & F_SIGN) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8585 sign = '+'; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8586 else if (flags & F_BLANK) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8587 sign = ' '; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8588 else |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8589 sign = 0; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8590 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8591 if (width < len) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8592 width = len; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8593 if (rescnt - (sign != 0) < width) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8594 reslen -= rescnt; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8595 rescnt = width + fmtcnt + 100; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8596 reslen += rescnt; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8597 if (reslen < 0) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8598 Py_XDECREF(temp); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8599 PyErr_NoMemory(); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8600 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8601 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8602 if (_PyUnicode_Resize(&result, reslen) < 0) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8603 Py_XDECREF(temp); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8604 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8605 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8606 res = PyUnicode_AS_UNICODE(result) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8607 + reslen - rescnt; |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8608 } |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8609 if (sign) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8610 if (fill != ' ') |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8611 *res++ = sign; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8612 rescnt--; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8613 if (width > len) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8614 width--; |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8615 } |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8616 if ((flags & F_ALT) && (c == 'x' || c == 'X')) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8617 assert(pbuf[0] == '0'); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8618 assert(pbuf[1] == c); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8619 if (fill != ' ') { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8620 *res++ = *pbuf++; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8621 *res++ = *pbuf++; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8622 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8623 rescnt -= 2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8624 width -= 2; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8625 if (width < 0) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8626 width = 0; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8627 len -= 2; |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8628 } |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8629 if (width > len && !(flags & F_LJUST)) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8630 do { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8631 --rescnt; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8632 *res++ = fill; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8633 } while (--width > len); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8634 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8635 if (fill == ' ') { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8636 if (sign) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8637 *res++ = sign; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8638 if ((flags & F_ALT) && (c == 'x' || c == 'X')) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8639 assert(pbuf[0] == '0'); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8640 assert(pbuf[1] == c); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8641 *res++ = *pbuf++; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8642 *res++ = *pbuf++; |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8643 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8644 } |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8645 Py_UNICODE_COPY(res, pbuf, len); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8646 res += len; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8647 rescnt -= len; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8648 while (--width >= len) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8649 --rescnt; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8650 *res++ = ' '; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8651 } |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8652 if (dict && (argidx < arglen) && c != '%') { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8653 PyErr_SetString(PyExc_TypeError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8654 "not all arguments converted during string formatting"); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8655 Py_XDECREF(temp); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8656 goto onError; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8657 } |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8658 Py_XDECREF(temp); |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8659 } /* '%' */ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8660 } /* until end */ |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8661 if (argidx < arglen && !dict) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8662 PyErr_SetString(PyExc_TypeError, |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8663 "not all arguments converted during string formatting"); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8664 goto onError; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8665 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8666 |
|
36945
0f19a6fc9756
- Reindent a confusingly indented piece of code (no intended code changes
Thomas Wouters <thomas@python.org>
parents:
36924
diff
changeset
|
8667 if (_PyUnicode_Resize(&result, reslen - rescnt) < 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8668 goto onError; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8669 if (args_owned) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8670 Py_DECREF(args); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8671 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8672 Py_DECREF(uformat); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8673 return (PyObject *)result; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8674 |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8675 onError: |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8676 Py_XDECREF(result); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8677 Py_DECREF(uformat); |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8678 if (args_owned) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8679 Py_DECREF(args); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8680 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8681 return NULL; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8682 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8683 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8684 static PyBufferProcs unicode_as_buffer = { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
8685 (readbufferproc) unicode_buffer_getreadbuf, |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
8686 (writebufferproc) unicode_buffer_getwritebuf, |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
8687 (segcountproc) unicode_buffer_getsegcount, |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36261
diff
changeset
|
8688 (charbufferproc) unicode_buffer_getcharbuf, |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8689 }; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8690 |
|
24280
1598a1e473e2
staticforward bites the dust.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
24071
diff
changeset
|
8691 static PyObject * |
|
19593
a80b4b006eb7
Make unicode subclassable.
Guido van Rossum <guido@python.org>
parents:
19301
diff
changeset
|
8692 unicode_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds); |
|
a80b4b006eb7
Make unicode subclassable.
Guido van Rossum <guido@python.org>
parents:
19301
diff
changeset
|
8693 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18887
diff
changeset
|
8694 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18887
diff
changeset
|
8695 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
|
8696 { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8697 PyObject *x = NULL; |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8698 static char *kwlist[] = {"string", "encoding", "errors", 0}; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8699 char *encoding = NULL; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8700 char *errors = NULL; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8701 |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8702 if (type != &PyUnicode_Type) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8703 return unicode_subtype_new(type, args, kwds); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8704 if (!PyArg_ParseTupleAndKeywords(args, kwds, "|Oss:unicode", |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8705 kwlist, &x, &encoding, &errors)) |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8706 return NULL; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8707 if (x == NULL) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8708 return (PyObject *)_PyUnicode_New(0); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8709 if (encoding == NULL && errors == NULL) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8710 return PyObject_Unicode(x); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8711 else |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8712 return PyUnicode_FromEncodedObject(x, encoding, errors); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18887
diff
changeset
|
8713 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18887
diff
changeset
|
8714 |
|
19593
a80b4b006eb7
Make unicode subclassable.
Guido van Rossum <guido@python.org>
parents:
19301
diff
changeset
|
8715 static PyObject * |
|
a80b4b006eb7
Make unicode subclassable.
Guido van Rossum <guido@python.org>
parents:
19301
diff
changeset
|
8716 unicode_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds) |
|
a80b4b006eb7
Make unicode subclassable.
Guido van Rossum <guido@python.org>
parents:
19301
diff
changeset
|
8717 { |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8718 PyUnicodeObject *tmp, *pnew; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8719 Py_ssize_t n; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8720 |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8721 assert(PyType_IsSubtype(type, &PyUnicode_Type)); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8722 tmp = (PyUnicodeObject *)unicode_new(&PyUnicode_Type, args, kwds); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8723 if (tmp == NULL) |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8724 return NULL; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8725 assert(PyUnicode_Check(tmp)); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8726 pnew = (PyUnicodeObject *) type->tp_alloc(type, n = tmp->length); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8727 if (pnew == NULL) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8728 Py_DECREF(tmp); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8729 return NULL; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8730 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8731 pnew->str = (Py_UNICODE*) PyObject_MALLOC(sizeof(Py_UNICODE) * (n+1)); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8732 if (pnew->str == NULL) { |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8733 _Py_ForgetReference((PyObject *)pnew); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8734 PyObject_Del(pnew); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8735 Py_DECREF(tmp); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8736 return PyErr_NoMemory(); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8737 } |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8738 Py_UNICODE_COPY(pnew->str, tmp->str, n+1); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8739 pnew->length = n; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8740 pnew->hash = tmp->hash; |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8741 Py_DECREF(tmp); |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8742 return (PyObject *)pnew; |
|
19593
a80b4b006eb7
Make unicode subclassable.
Guido van Rossum <guido@python.org>
parents:
19301
diff
changeset
|
8743 } |
|
a80b4b006eb7
Make unicode subclassable.
Guido van Rossum <guido@python.org>
parents:
19301
diff
changeset
|
8744 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23778
diff
changeset
|
8745 PyDoc_STRVAR(unicode_doc, |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8746 "unicode(string [, encoding[, errors]]) -> object\n\ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18887
diff
changeset
|
8747 \n\ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18887
diff
changeset
|
8748 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
|
8749 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
|
8750 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
|
8751 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8752 PyTypeObject PyUnicode_Type = { |
|
42333
6620a510e9a9
PEP 3123: Provide forward compatibility with Python 3.0, while keeping
Martin v. Löwis <martin@v.loewis.de>
parents:
42216
diff
changeset
|
8753 PyVarObject_HEAD_INIT(&PyType_Type, 0) |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8754 "unicode", /* tp_name */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8755 sizeof(PyUnicodeObject), /* tp_size */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8756 0, /* tp_itemsize */ |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8757 /* Slots */ |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8758 (destructor)unicode_dealloc, /* tp_dealloc */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8759 0, /* tp_print */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8760 0, /* tp_getattr */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8761 0, /* tp_setattr */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8762 0, /* tp_compare */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8763 unicode_repr, /* tp_repr */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8764 &unicode_as_number, /* tp_as_number */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8765 &unicode_as_sequence, /* tp_as_sequence */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8766 &unicode_as_mapping, /* tp_as_mapping */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8767 (hashfunc) unicode_hash, /* tp_hash*/ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8768 0, /* tp_call*/ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8769 (reprfunc) unicode_str, /* tp_str */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8770 PyObject_GenericGetAttr, /* tp_getattro */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8771 0, /* tp_setattro */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8772 &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
|
8773 Py_TPFLAGS_DEFAULT | Py_TPFLAGS_CHECKTYPES | |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8774 Py_TPFLAGS_BASETYPE | Py_TPFLAGS_UNICODE_SUBCLASS, /* tp_flags */ |
|
51204
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8775 unicode_doc, /* tp_doc */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8776 0, /* tp_traverse */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8777 0, /* tp_clear */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8778 PyUnicode_RichCompare, /* tp_richcompare */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8779 0, /* tp_weaklistoffset */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8780 0, /* tp_iter */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8781 0, /* tp_iternext */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8782 unicode_methods, /* tp_methods */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8783 0, /* tp_members */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8784 0, /* tp_getset */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8785 &PyBaseString_Type, /* tp_base */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8786 0, /* tp_dict */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8787 0, /* tp_descr_get */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8788 0, /* tp_descr_set */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8789 0, /* tp_dictoffset */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8790 0, /* tp_init */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8791 0, /* tp_alloc */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8792 unicode_new, /* tp_new */ |
|
dcfd436567ce
expand tabs in unicodeobject.c
Benjamin Peterson <benjamin@python.org>
parents:
50305
diff
changeset
|
8793 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
|
8794 }; |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8795 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8796 /* 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
|
8797 |
|
13660
a1ce07218781
Miscelaneous ANSIfications. I'm assuming here 'main' should take (int,
Thomas Wouters <thomas@python.org>
parents:
13635
diff
changeset
|
8798 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
|
8799 { |
|
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
|
8800 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
|
8801 |
|
38257
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
8802 /* XXX - move this array to unicodectype.c ? */ |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
8803 Py_UNICODE linebreak[] = { |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
8804 0x000A, /* LINE FEED */ |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
8805 0x000D, /* CARRIAGE RETURN */ |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
8806 0x001C, /* FILE SEPARATOR */ |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
8807 0x001D, /* GROUP SEPARATOR */ |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
8808 0x001E, /* RECORD SEPARATOR */ |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
8809 0x0085, /* NEXT LINE */ |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
8810 0x2028, /* LINE SEPARATOR */ |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
8811 0x2029, /* PARAGRAPH SEPARATOR */ |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
8812 }; |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
8813 |
|
12645
c4eb70d24a87
M.-A. Lemburg <mal@lemburg.com>:
Fred Drake <fdrake@acm.org>
parents:
12629
diff
changeset
|
8814 /* Init the implementation */ |
|
45191
920a7633ae08
Unified naming convention for free lists and their limits. All free lists
Christian Heimes <christian@cheimes.de>
parents:
45053
diff
changeset
|
8815 free_list = NULL; |
|
920a7633ae08
Unified naming convention for free lists and their limits. All free lists
Christian Heimes <christian@cheimes.de>
parents:
45053
diff
changeset
|
8816 numfree = 0; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8817 unicode_empty = _PyUnicode_New(0); |
|
39129
f2031f15d99d
Handle allocation failures gracefully. Found with failmalloc.
Neal Norwitz <nnorwitz@gmail.com>
parents:
38817
diff
changeset
|
8818 if (!unicode_empty) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8819 return; |
|
39129
f2031f15d99d
Handle allocation failures gracefully. Found with failmalloc.
Neal Norwitz <nnorwitz@gmail.com>
parents:
38817
diff
changeset
|
8820 |
|
12876
243593f11fcf
Marc-Andre Lemburg <mal@lemburg.com>:
Marc-André Lemburg <mal@egenix.com>
parents:
12646
diff
changeset
|
8821 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
|
8822 for (i = 0; i < 256; i++) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8823 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
|
8824 if (PyType_Ready(&PyUnicode_Type) < 0) |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8825 Py_FatalError("Can't initialize 'unicode'"); |
|
38257
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
8826 |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
8827 /* initialize the linebreak bloom filter */ |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
8828 bloom_linebreak = make_bloom_mask( |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
8829 linebreak, sizeof(linebreak) / sizeof(linebreak[0]) |
|
af46c7ed05eb
needforspeed: use append+reverse for rsplit, use "bloom filters" to
Fredrik Lundh <fredrik@pythonware.com>
parents:
38243
diff
changeset
|
8830 ); |
|
38786
9c52efcaff65
Initialize the type object so pychecker can't crash the interpreter.
Neal Norwitz <nnorwitz@gmail.com>
parents:
38709
diff
changeset
|
8831 |
|
9c52efcaff65
Initialize the type object so pychecker can't crash the interpreter.
Neal Norwitz <nnorwitz@gmail.com>
parents:
38709
diff
changeset
|
8832 PyType_Ready(&EncodingMapType); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8833 } |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8834 |
|
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8835 /* 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
|
8836 |
|
45341
65ae68c7aca3
Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation.
Christian Heimes <christian@cheimes.de>
parents:
45191
diff
changeset
|
8837 int |
|
65ae68c7aca3
Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation.
Christian Heimes <christian@cheimes.de>
parents:
45191
diff
changeset
|
8838 PyUnicode_ClearFreeList(void) |
|
65ae68c7aca3
Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation.
Christian Heimes <christian@cheimes.de>
parents:
45191
diff
changeset
|
8839 { |
|
65ae68c7aca3
Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation.
Christian Heimes <christian@cheimes.de>
parents:
45191
diff
changeset
|
8840 int freelist_size = numfree; |
|
65ae68c7aca3
Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation.
Christian Heimes <christian@cheimes.de>
parents:
45191
diff
changeset
|
8841 PyUnicodeObject *u; |
|
65ae68c7aca3
Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation.
Christian Heimes <christian@cheimes.de>
parents:
45191
diff
changeset
|
8842 |
|
65ae68c7aca3
Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation.
Christian Heimes <christian@cheimes.de>
parents:
45191
diff
changeset
|
8843 for (u = free_list; u != NULL;) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8844 PyUnicodeObject *v = u; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8845 u = *(PyUnicodeObject **)u; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8846 if (v->str) |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8847 PyObject_DEL(v->str); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8848 Py_XDECREF(v->defenc); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8849 PyObject_Del(v); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8850 numfree--; |
|
45341
65ae68c7aca3
Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation.
Christian Heimes <christian@cheimes.de>
parents:
45191
diff
changeset
|
8851 } |
|
65ae68c7aca3
Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation.
Christian Heimes <christian@cheimes.de>
parents:
45191
diff
changeset
|
8852 free_list = NULL; |
|
65ae68c7aca3
Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation.
Christian Heimes <christian@cheimes.de>
parents:
45191
diff
changeset
|
8853 assert(numfree == 0); |
|
65ae68c7aca3
Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation.
Christian Heimes <christian@cheimes.de>
parents:
45191
diff
changeset
|
8854 return freelist_size; |
|
65ae68c7aca3
Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation.
Christian Heimes <christian@cheimes.de>
parents:
45191
diff
changeset
|
8855 } |
|
65ae68c7aca3
Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation.
Christian Heimes <christian@cheimes.de>
parents:
45191
diff
changeset
|
8856 |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8857 void |
|
13660
a1ce07218781
Miscelaneous ANSIfications. I'm assuming here 'main' should take (int,
Thomas Wouters <thomas@python.org>
parents:
13635
diff
changeset
|
8858 _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
|
8859 { |
|
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
|
8860 int i; |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8861 |
|
14998
c16bdf555c79
In _PyUnicode_Fini(), decref unicode_empty before tearng down the free
Guido van Rossum <guido@python.org>
parents:
14869
diff
changeset
|
8862 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
|
8863 unicode_empty = NULL; |
|
15001
a349b89bf10e
_PyUnicode_Fini(): Initialize the local freelist walking variable `u'
Barry Warsaw <barry@python.org>
parents:
14998
diff
changeset
|
8864 |
|
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
|
8865 for (i = 0; i < 256; i++) { |
|
51213
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8866 if (unicode_latin1[i]) { |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8867 Py_DECREF(unicode_latin1[i]); |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8868 unicode_latin1[i] = NULL; |
|
cd5db43dbb65
fix indentation; looks like all I managed to do the first time is make things uglier
Benjamin Peterson <benjamin@python.org>
parents:
51212
diff
changeset
|
8869 } |
|
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
|
8870 } |
|
45341
65ae68c7aca3
Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation.
Christian Heimes <christian@cheimes.de>
parents:
45191
diff
changeset
|
8871 (void)PyUnicode_ClearFreeList(); |
|
11968
13bc68faeb65
Unicode implementation by Marc-Andre Lemburg based on original code by
Guido van Rossum <guido@python.org>
parents:
diff
changeset
|
8872 } |
|
29164
4d9017ef7b5f
Consider \U-escapes in raw-unicode-escape. Fixes #444514.
Martin v. Löwis <martin@v.loewis.de>
parents:
28575
diff
changeset
|
8873 |
|
37655
2f3f2e32dfd9
spread the extern "C" { } magic pixie dust around. Python itself builds now
Anthony Baxter <anthonybaxter@gmail.com>
parents:
37596
diff
changeset
|
8874 #ifdef __cplusplus |
|
2f3f2e32dfd9
spread the extern "C" { } magic pixie dust around. Python itself builds now
Anthony Baxter <anthonybaxter@gmail.com>
parents:
37596
diff
changeset
|
8875 } |
|
2f3f2e32dfd9
spread the extern "C" { } magic pixie dust around. Python itself builds now
Anthony Baxter <anthonybaxter@gmail.com>
parents:
37596
diff
changeset
|
8876 #endif |