[Python-checkins] CVS: python/dist/src/Include unicodeobject.h,2.11,2.12

[M.-A. Lemburg]

Update of /cvsroot/python/python/dist/src/Include
In directory slayer.i.sourceforge.net:/tmp/cvs-serv17679/Include

Modified Files:
	unicodeobject.h 
Log Message:
Modified the ISALPHA and ISALNUM macros to use the new lookup APIs
from unicodectype.c

Index: unicodeobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/unicodeobject.h,v
retrieving revision 2.11
retrieving revision 2.12
diff -C2 -r2.11 -r2.12
*** unicodeobject.h	2000/07/03 10:52:13	2.11
--- unicodeobject.h	2000/07/05 09:45:59	2.12
***************
*** 138,141 ****
--- 138,143 ----
  #define Py_UNICODE_TONUMERIC(ch) _PyUnicode_ToNumeric(ch)
  
+ #define Py_UNICODE_ISALPHA(ch) iswalpha(ch)
+ 
  #else
  
***************
*** 159,168 ****
  #define Py_UNICODE_TONUMERIC(ch) _PyUnicode_ToNumeric(ch)
  
! #endif
  
! #define Py_UNICODE_ISALPHA(ch) \
!        (Py_UNICODE_ISLOWER(ch) || \
!         Py_UNICODE_ISUPPER(ch) || \
!         Py_UNICODE_ISTITLE(ch))
  
  #define Py_UNICODE_ISALNUM(ch) \
--- 161,167 ----
  #define Py_UNICODE_TONUMERIC(ch) _PyUnicode_ToNumeric(ch)
  
! #define Py_UNICODE_ISALPHA(ch) _PyUnicode_IsAlpha(ch)
  
! #endif
  
  #define Py_UNICODE_ISALNUM(ch) \
***************
*** 869,872 ****
--- 868,875 ----
  
  extern DL_IMPORT(int) _PyUnicode_IsNumeric(
+     register const Py_UNICODE ch 	/* Unicode character */
+     );
+ 
+ extern DL_IMPORT(int) _PyUnicode_IsAlpha(
      register const Py_UNICODE ch 	/* Unicode character */
      );