| 
									
										
										
										
											2007-08-25 02:26:07 +00:00
										 |  |  | #ifndef STRINGLIB_UNICODEDEFS_H
 | 
					
						
							|  |  |  | #define STRINGLIB_UNICODEDEFS_H
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* this is sort of a hack.  there's at least one place (formatting
 | 
					
						
							|  |  |  |    floats) where some stringlib code takes a different path if it's | 
					
						
							|  |  |  |    compiled as unicode. */ | 
					
						
							|  |  |  | #define STRINGLIB_IS_UNICODE     1
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-02-17 19:48:00 +00:00
										 |  |  | #define STRINGLIB_OBJECT         PyUnicodeObject
 | 
					
						
							| 
									
										
										
										
											2007-08-25 02:26:07 +00:00
										 |  |  | #define STRINGLIB_CHAR           Py_UNICODE
 | 
					
						
							|  |  |  | #define STRINGLIB_TYPE_NAME      "unicode"
 | 
					
						
							| 
									
										
										
										
											2007-09-01 10:56:01 +00:00
										 |  |  | #define STRINGLIB_PARSE_CODE     "U"
 | 
					
						
							| 
									
										
										
										
											2007-08-25 02:26:07 +00:00
										 |  |  | #define STRINGLIB_EMPTY          unicode_empty
 | 
					
						
							|  |  |  | #define STRINGLIB_ISDECIMAL      Py_UNICODE_ISDECIMAL
 | 
					
						
							|  |  |  | #define STRINGLIB_TODECIMAL      Py_UNICODE_TODECIMAL
 | 
					
						
							|  |  |  | #define STRINGLIB_TOUPPER        Py_UNICODE_TOUPPER
 | 
					
						
							|  |  |  | #define STRINGLIB_TOLOWER        Py_UNICODE_TOLOWER
 | 
					
						
							|  |  |  | #define STRINGLIB_FILL           Py_UNICODE_FILL
 | 
					
						
							|  |  |  | #define STRINGLIB_STR            PyUnicode_AS_UNICODE
 | 
					
						
							|  |  |  | #define STRINGLIB_LEN            PyUnicode_GET_SIZE
 | 
					
						
							|  |  |  | #define STRINGLIB_NEW            PyUnicode_FromUnicode
 | 
					
						
							|  |  |  | #define STRINGLIB_RESIZE         PyUnicode_Resize
 | 
					
						
							|  |  |  | #define STRINGLIB_CHECK          PyUnicode_Check
 | 
					
						
							| 
									
										
										
											
												Merged revisions 63078 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
When forward porting this, I added _PyUnicode_InsertThousandsGrouping.
........
  r63078 | eric.smith | 2008-05-11 15:52:48 -0400 (Sun, 11 May 2008) | 14 lines
  Addresses issue 2802: 'n' formatting for integers.
  Adds 'n' as a format specifier for integers, to mirror the same
  specifier which is already available for floats.  'n' is the same as
  'd', but inserts the current locale-specific thousands grouping.
  I added this as a stringlib function, but it's only used by str type,
  not unicode.  This is because of an implementation detail in
  unicode.format(), which does its own str->unicode conversion.  But the
  unicode version will be needed in 3.0, and it may be needed by other
  code eventually in 2.6 (maybe decimal?), so I left it as a stringlib
  implementation.  As long as the unicode version isn't instantiated,
  there's no overhead for this.
........
											
										 
											2008-05-11 21:00:57 +00:00
										 |  |  | #define STRINGLIB_GROUPING       _PyUnicode_InsertThousandsGrouping
 | 
					
						
							| 
									
										
										
										
											2009-04-03 14:45:06 +00:00
										 |  |  | #define STRINGLIB_GROUPING_LOCALE _PyUnicode_InsertThousandsGroupingLocale
 | 
					
						
							| 
									
										
										
										
											2008-02-17 19:48:00 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | #if PY_VERSION_HEX < 0x03000000
 | 
					
						
							|  |  |  | #define STRINGLIB_TOSTR          PyObject_Unicode
 | 
					
						
							| 
									
										
										
										
											2008-06-11 18:37:52 +00:00
										 |  |  | #define STRINGLIB_TOASCII        PyObject_Repr
 | 
					
						
							| 
									
										
										
										
											2008-02-17 19:48:00 +00:00
										 |  |  | #else
 | 
					
						
							| 
									
										
										
										
											2007-11-15 20:48:54 +00:00
										 |  |  | #define STRINGLIB_TOSTR          PyObject_Str
 | 
					
						
							| 
									
										
										
										
											2008-06-11 18:37:52 +00:00
										 |  |  | #define STRINGLIB_TOASCII        PyObject_ASCII
 | 
					
						
							| 
									
										
										
										
											2008-02-17 19:48:00 +00:00
										 |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											2007-08-25 02:26:07 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2007-10-16 06:31:30 +00:00
										 |  |  | #define STRINGLIB_WANT_CONTAINS_OBJ 1
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2007-08-28 09:45:15 +00:00
										 |  |  | /* STRINGLIB_CMP was defined as:
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2007-08-25 02:26:07 +00:00
										 |  |  | Py_LOCAL_INLINE(int) | 
					
						
							|  |  |  | STRINGLIB_CMP(const Py_UNICODE* str, const Py_UNICODE* other, Py_ssize_t len) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     if (str[0] != other[0]) | 
					
						
							|  |  |  |         return 1; | 
					
						
							|  |  |  |     return memcmp((void*) str, (void*) other, len * sizeof(Py_UNICODE)); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2007-08-28 09:45:15 +00:00
										 |  |  | but unfortunately that gives a error if the function isn't used in a file that | 
					
						
							|  |  |  | includes this file.  So, reluctantly convert it to a macro instead. */ | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define STRINGLIB_CMP(str, other, len) \
 | 
					
						
							|  |  |  |     (((str)[0] != (other)[0]) ? \ | 
					
						
							|  |  |  |      1 : \ | 
					
						
							|  |  |  |      memcmp((void*) (str), (void*) (other), (len) * sizeof(Py_UNICODE))) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2007-08-25 02:26:07 +00:00
										 |  |  | #endif /* !STRINGLIB_UNICODEDEFS_H */
 |