*** empty log message ***

ase/utl/ctype.c

@@ -1,27 +1,149 @@
 /*
- * $Id: ctype.c,v 1.1 2007-02-20 14:47:33 bacon Exp $
+ * $Id: ctype.c,v 1.2 2007-02-23 08:17:51 bacon Exp $
  */
 
 #include <ase/utl/ctype.h>
 
-#if defined(ASE_CHAR_IS_MCHAR) && defined(isupper)
+#if defined(ASE_CHAR_IS_MCHAR)
 
-	int ase_isupper (int c) { return isupper (c); }
-	int ase_islower (int c) { return islower (c); }
-	int ase_isalpha (int c) { return isalpha (c); }
-	int ase_isdigit (int c) { return isdigit (c); }
-	int ase_isxdigit (int c) { return isxdigit (c); }
-	int ase_isalnum (int c) { return isalnum (c); }
-	int ase_isspace (int c) { return isspace (c); }
-	int ase_isprint (int c) { return isprint (c); }
-	int ase_isgraph (int c) { return isgraph (c); }
-	int ase_iscntrl (int c) { return iscntrl (c); }
-	int ase_ispunct (int c) { return ispunct (c); }
+#include <ctype.h>
+
+ase_bool_t ase_isupper (ase_ccls_t* ccls, ase_cint_t c)  
+{ 
+	return isupper (c); 
+}
+
+ase_bool_t ase_islower (ase_ccls_t* ccls, ase_cint_t c)  
+{ 
+	return islower (c); 
+}
+
+ase_bool_t ase_isalpha (ase_ccls_t* ccls, ase_cint_t c)  
+{ 
+	return isalpha (c); 
+}
+
+ase_bool_t ase_isdigit (ase_ccls_t* ccls, ase_cint_t c)  
+{ 
+	return isdigit (c); 
+}
+
+ase_bool_t ase_isxdigit (ase_ccls_t* ccls, ase_cint_t c) 
+{ 
+	return isxdigit (c); 
+}
+
+ase_bool_t ase_isalnum (ase_ccls_t* ccls, ase_cint_t c)
+{ 
+	return isalnum (c); 
+}
+
+ase_bool_t ase_isspace (ase_ccls_t* ccls, ase_cint_t c)
+{ 
+	return isspace (c); 
+}
+
+ase_bool_t ase_isprint (ase_ccls_t* ccls, ase_cint_t c)
+{ 
+	return isprint (c); 
+}
+
+ase_bool_t ase_isgraph (ase_ccls_t* ccls, ase_cint_t c)
+{
+	return isgraph (c); 
+}
+
+ase_bool_t ase_iscntrl (ase_ccls_t* ccls, ase_cint_t c)
+{
+	return iscntrl (c);
+}
+
+ase_bool_t ase_ispunct (ase_ccls_t* ccls, ase_cint_t c)
+{
+	return ispunct (c);
+}
+
+ase_cint_t ase_toupper (ase_ccls_t* ccls, ase_cint_t c)
+{
+	return toupper (c);
+}
+
+ase_cint_t ase_tolower (ase_ccls_t* ccls, ase_cint_t c)
+{
+	return tolower (c);
+}
+
+#elif defined(ASE_CHAR_IS_WCHAR)
+
+#include <wctype.h>
+
+ase_bool_t ase_isupper (ase_ccls_t* ccls, ase_cint_t c)  
+{ 
+	return iswupper (c); 
+}
+
+ase_bool_t ase_islower (ase_ccls_t* ccls, ase_cint_t c)  
+{ 
+	return iswlower (c); 
+}
+
+ase_bool_t ase_isalpha (ase_ccls_t* ccls, ase_cint_t c)  
+{ 
+	return iswalpha (c); 
+}
+
+ase_bool_t ase_isdigit (ase_ccls_t* ccls, ase_cint_t c)  
+{ 
+	return iswdigit (c); 
+}
+
+ase_bool_t ase_isxdigit (ase_ccls_t* ccls, ase_cint_t c) 
+{ 
+	return iswxdigit (c); 
+}
+
+ase_bool_t ase_isalnum (ase_ccls_t* ccls, ase_cint_t c)
+{ 
+	return iswalnum (c); 
+}
+
+ase_bool_t ase_isspace (ase_ccls_t* ccls, ase_cint_t c)
+{ 
+	return iswspace (c); 
+}
+
+ase_bool_t ase_isprint (ase_ccls_t* ccls, ase_cint_t c)
+{ 
+	return iswprint (c); 
+}
+
+ase_bool_t ase_isgraph (ase_ccls_t* ccls, ase_cint_t c)
+{
+	return iswgraph (c); 
+}
+
+ase_bool_t ase_iscntrl (ase_ccls_t* ccls, ase_cint_t c)
+{
+	return iswcntrl (c);
+}
+
+ase_bool_t ase_ispunct (ase_ccls_t* ccls, ase_cint_t c)
+{
+	return iswpunct (c);
+}
+
+ase_cint_t ase_toupper (ase_ccls_t* ccls, ase_cint_t c)
+{
+	return towupper (c);
+}
+
+ase_cint_t ase_tolower (ase_ccls_t* ccls, ase_cint_t c)
+{
+	return towlower (c);
+}
+
+#else
+
+#error unsupported character type
 
 #endif
-
-#if defined(ASE_CHAR_IS_MCHAR) && defined(toupper)
-	int ase_toupper (int c) { return toupper (c); }
-	int ase_tolower (int c) { return tolower (c); }
-#endif
-

ase/utl/ctype.h

@@ -8,69 +8,24 @@
 #include <ase/types.h>
 #include <ase/macros.h>
 
-#if defined(ASE_CHAR_IS_MCHAR) 
-	#include <ctype.h>
-	
-	#if !defined(isupper) 
-		#define ase_isupper  isupper
-		#define ase_islower  islower
-		#define ase_isalpha  isalpha
-		#define ase_isdigit  isdigit
-		#define ase_isxdigit isxdigit
-		#define ase_isalnum  isalnum
-		#define ase_isspace  isspace
-		#define ase_isprint  isprint
-		#define ase_isgraph  isgraph
-		#define ase_iscntrl  iscntrl
-		#define ase_ispunct  ispunct
-	#endif
-
-	#if !defined(toupper)
-		#define ase_toupper  toupper
-		#define ase_tolower  tolower
-	#endif
-
-#else
-	#include <wctype.h>
-
-	#define ase_isupper  iswupper
-	#define ase_islower  iswlower
-	#define ase_isalpha  iswalpha
-	#define ase_isdigit  iswdigit
-	#define ase_isxdigit iswxdigit
-	#define ase_isalnum  iswalnum
-	#define ase_isspace  iswspace
-	#define ase_isprint  iswprint
-	#define ase_isgraph  iswgraph
-	#define ase_iscntrl  iswcntrl
-	#define ase_ispunct  iswpunct
-
-	#define ase_toupper  towupper
-	#define ase_tolower  towlower
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if defined(ASE_CHAR_IS_MCHAR) && defined(isupper)
-	int ase_isupper (int c);
-	int ase_islower (int c);
-	int ase_isalpha (int c);
-	int ase_isdigit (int c);
-	int ase_isxdigit (int c);
-	int ase_isalnum (int c);
-	int ase_isspace (int c);
-	int ase_isprint (int c);
-	int ase_isgraph (int c);
-	int ase_iscntrl (int c);
-	int ase_ispunct (int c);
-#endif
+ase_bool_t ase_isupper  (ase_ccls_t* ccls, ase_cint_t c);
+ase_bool_t ase_islower  (ase_ccls_t* ccls, ase_cint_t c);
+ase_bool_t ase_isalpha  (ase_ccls_t* ccls, ase_cint_t c);
+ase_bool_t ase_isdigit  (ase_ccls_t* ccls, ase_cint_t c);
+ase_bool_t ase_isxdigit (ase_ccls_t* ccls, ase_cint_t c);
+ase_bool_t ase_isalnum  (ase_ccls_t* ccls, ase_cint_t c);
+ase_bool_t ase_isspace  (ase_ccls_t* ccls, ase_cint_t c);
+ase_bool_t ase_isprint  (ase_ccls_t* ccls, ase_cint_t c);
+ase_bool_t ase_isgraph  (ase_ccls_t* ccls, ase_cint_t c);
+ase_bool_t ase_iscntrl  (ase_ccls_t* ccls, ase_cint_t c);
+ase_bool_t ase_ispunct  (ase_ccls_t* ccls, ase_cint_t c);
 
-#if defined(ASE_CHAR_IS_MCHAR) && defined(toupper)
-	int ase_toupper (int c);
-	int ase_tolower (int c);
-#endif
+ase_cint_t ase_toupper  (ase_ccls_t* ccls, ase_cint_t c);
+ase_cint_t ase_tolower  (ase_ccls_t* ccls, ase_cint_t c);
 
 #ifdef __cplusplus
 }