annotate Objects/stringlib/unicodedefs.h @ 64166:d0e9febfa00a 3.1

Merged revisions 84172 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84172 | martin.v.loewis | 2010-08-18 18:12:23 +0200 (Mi, 18 Aug 2010) | 2 lines Restore GIL in nis_cat in case of error. ........
author Martin v. Löwis <martin@v.loewis.de>
date Thu, 19 Aug 2010 09:03:03 +0000
parents 28096ed73153
children f37f6b9b224b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
42817
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
1 #ifndef STRINGLIB_UNICODEDEFS_H
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
2 #define STRINGLIB_UNICODEDEFS_H
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
3
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
4 /* this is sort of a hack. there's at least one place (formatting
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
5 floats) where some stringlib code takes a different path if it's
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
6 compiled as unicode. */
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
7 #define STRINGLIB_IS_UNICODE 1
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
8
45382
7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string
Eric Smith <eric@trueblade.com>
parents: 43866
diff changeset
9 #define STRINGLIB_OBJECT PyUnicodeObject
42817
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
10 #define STRINGLIB_CHAR Py_UNICODE
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
11 #define STRINGLIB_TYPE_NAME "unicode"
43172
d842457e4b0e Changed to use 'U' argument to PyArg_ParseTuple, instead of manually checking for unicode objects.
Eric Smith <eric@trueblade.com>
parents: 42946
diff changeset
12 #define STRINGLIB_PARSE_CODE "U"
42817
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
13 #define STRINGLIB_EMPTY unicode_empty
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
14 #define STRINGLIB_ISDECIMAL Py_UNICODE_ISDECIMAL
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
15 #define STRINGLIB_TODECIMAL Py_UNICODE_TODECIMAL
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
16 #define STRINGLIB_TOUPPER Py_UNICODE_TOUPPER
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
17 #define STRINGLIB_TOLOWER Py_UNICODE_TOLOWER
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
18 #define STRINGLIB_FILL Py_UNICODE_FILL
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
19 #define STRINGLIB_STR PyUnicode_AS_UNICODE
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
20 #define STRINGLIB_LEN PyUnicode_GET_SIZE
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
21 #define STRINGLIB_NEW PyUnicode_FromUnicode
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
22 #define STRINGLIB_RESIZE PyUnicode_Resize
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
23 #define STRINGLIB_CHECK PyUnicode_Check
46909
ef4ec968fdb6 Merged revisions 63078 via svnmerge from
Eric Smith <eric@trueblade.com>
parents: 45382
diff changeset
24 #define STRINGLIB_GROUPING _PyUnicode_InsertThousandsGrouping
52773
28096ed73153 Added ',' thousands grouping to int.__format__. See PEP 378.
Eric Smith <eric@trueblade.com>
parents: 47611
diff changeset
25 #define STRINGLIB_GROUPING_LOCALE _PyUnicode_InsertThousandsGroupingLocale
45382
7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string
Eric Smith <eric@trueblade.com>
parents: 43866
diff changeset
26
7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string
Eric Smith <eric@trueblade.com>
parents: 43866
diff changeset
27 #if PY_VERSION_HEX < 0x03000000
7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string
Eric Smith <eric@trueblade.com>
parents: 43866
diff changeset
28 #define STRINGLIB_TOSTR PyObject_Unicode
47611
da47e7e135ae #2630: Implement PEP 3138.
Georg Brandl <georg@python.org>
parents: 46909
diff changeset
29 #define STRINGLIB_TOASCII PyObject_Repr
45382
7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string
Eric Smith <eric@trueblade.com>
parents: 43866
diff changeset
30 #else
43866
8ed0280c2ab6 Replace PyObject_Unicode with PyObject_Str everywhere, and remove the
Thomas Heller <theller@ctypes.org>
parents: 43576
diff changeset
31 #define STRINGLIB_TOSTR PyObject_Str
47611
da47e7e135ae #2630: Implement PEP 3138.
Georg Brandl <georg@python.org>
parents: 46909
diff changeset
32 #define STRINGLIB_TOASCII PyObject_ASCII
45382
7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string
Eric Smith <eric@trueblade.com>
parents: 43866
diff changeset
33 #endif
42817
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
34
43576
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon
Gregory P. Smith <greg@mad-scientist.com>
parents: 43172
diff changeset
35 #define STRINGLIB_WANT_CONTAINS_OBJ 1
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon
Gregory P. Smith <greg@mad-scientist.com>
parents: 43172
diff changeset
36
42946
9a13e8fb1a3b Changed STRINGLIB_CMP from an inline function to a macro in order to avoid a 'defined but not used' warning.
Eric Smith <eric@trueblade.com>
parents: 42817
diff changeset
37 /* STRINGLIB_CMP was defined as:
9a13e8fb1a3b Changed STRINGLIB_CMP from an inline function to a macro in order to avoid a 'defined but not used' warning.
Eric Smith <eric@trueblade.com>
parents: 42817
diff changeset
38
42817
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
39 Py_LOCAL_INLINE(int)
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
40 STRINGLIB_CMP(const Py_UNICODE* str, const Py_UNICODE* other, Py_ssize_t len)
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
41 {
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
42 if (str[0] != other[0])
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
43 return 1;
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
44 return memcmp((void*) str, (void*) other, len * sizeof(Py_UNICODE));
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
45 }
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
46
42946
9a13e8fb1a3b Changed STRINGLIB_CMP from an inline function to a macro in order to avoid a 'defined but not used' warning.
Eric Smith <eric@trueblade.com>
parents: 42817
diff changeset
47 but unfortunately that gives a error if the function isn't used in a file that
9a13e8fb1a3b Changed STRINGLIB_CMP from an inline function to a macro in order to avoid a 'defined but not used' warning.
Eric Smith <eric@trueblade.com>
parents: 42817
diff changeset
48 includes this file. So, reluctantly convert it to a macro instead. */
9a13e8fb1a3b Changed STRINGLIB_CMP from an inline function to a macro in order to avoid a 'defined but not used' warning.
Eric Smith <eric@trueblade.com>
parents: 42817
diff changeset
49
9a13e8fb1a3b Changed STRINGLIB_CMP from an inline function to a macro in order to avoid a 'defined but not used' warning.
Eric Smith <eric@trueblade.com>
parents: 42817
diff changeset
50 #define STRINGLIB_CMP(str, other, len) \
9a13e8fb1a3b Changed STRINGLIB_CMP from an inline function to a macro in order to avoid a 'defined but not used' warning.
Eric Smith <eric@trueblade.com>
parents: 42817
diff changeset
51 (((str)[0] != (other)[0]) ? \
9a13e8fb1a3b Changed STRINGLIB_CMP from an inline function to a macro in order to avoid a 'defined but not used' warning.
Eric Smith <eric@trueblade.com>
parents: 42817
diff changeset
52 1 : \
9a13e8fb1a3b Changed STRINGLIB_CMP from an inline function to a macro in order to avoid a 'defined but not used' warning.
Eric Smith <eric@trueblade.com>
parents: 42817
diff changeset
53 memcmp((void*) (str), (void*) (other), (len) * sizeof(Py_UNICODE)))
9a13e8fb1a3b Changed STRINGLIB_CMP from an inline function to a macro in order to avoid a 'defined but not used' warning.
Eric Smith <eric@trueblade.com>
parents: 42817
diff changeset
54
9a13e8fb1a3b Changed STRINGLIB_CMP from an inline function to a macro in order to avoid a 'defined but not used' warning.
Eric Smith <eric@trueblade.com>
parents: 42817
diff changeset
55
42817
5355337709e1 Implementation of PEP 3101, Advanced String Formatting.
Eric Smith <eric@trueblade.com>
parents:
diff changeset
56 #endif /* !STRINGLIB_UNICODEDEFS_H */