added wint_t and <wctype.h>. Along with <cwchar> and <cwctype>

Author: ZERICO2005

src/libc/header_test.c

@@ -26,5 +26,6 @@
 #include <tgmath.h>
 #include <time.h>
 #include <wchar.h>
+#include <wctype.h>
 
 /* Tests for conflicts */

src/libc/include/__wchar_def.h

@@ -0,0 +1,36 @@
+#ifndef _WCHAR_DEF_H
+#define _WCHAR_DEF_H
+
+#include <cdefs.h>
+
+#ifndef _WCHAR_T_DEFINED
+#define _WCHAR_T_DEFINED
+#ifndef __cplusplus
+typedef __WCHAR_TYPE__ wchar_t;
+#endif /* __cplusplus */
+#endif /* _WCHAR_T_DEFINED */
+
+#ifndef _WINT_T_DEFINED
+#define _WINT_T_DEFINED
+typedef __WINT_TYPE__ wint_t;
+#endif /* _WINT_T_DEFINED */
+
+#ifndef _WCHAR_LIMITS_DEFINED
+#define _WCHAR_LIMITS_DEFINED
+#define           WCHAR_MIN                      (~__WCHAR_MAX__)
+#define           WCHAR_MAX                        __WCHAR_MAX__
+#define           WCHAR_WIDTH                      __WCHAR_WIDTH__
+#endif /* _WCHAR_LIMITS_DEFINED */
+
+#ifndef _WINT_LIMITS_DEFINED
+#define _WINT_LIMITS_DEFINED
+#define            WINT_MIN                       (~__WINT_MAX__)
+#define            WINT_MAX                         __WINT_MAX__
+#define            WINT_WIDTH                       __WINT_WIDTH__
+#endif /* _WINT_LIMITS_DEFINED */
+
+#ifndef WEOF
+#define WEOF -1
+#endif
+
+#endif /* _WCHAR_DEF_H */

src/libc/include/stdint.h

@@ -166,15 +166,18 @@ typedef       __UINTPTR_TYPE__                     uintptr_t;
 #define            SIZE_MAX                         __SIZE_MAX__
 #define            SIZE_WIDTH                       __SIZE_WIDTH__
 
-#define            WINT_MIN                       (~__WINT_MAX__)
-#define            WINT_MAX                         __WINT_MAX__
-#define            WINT_WIDTH                       __WINT_WIDTH__
-
 #ifndef _WCHAR_LIMITS_DEFINED
 #define _WCHAR_LIMITS_DEFINED
 #define           WCHAR_MIN                      (~__WCHAR_MAX__)
 #define           WCHAR_MAX                        __WCHAR_MAX__
 #define           WCHAR_WIDTH                      __WCHAR_WIDTH__
-#endif
+#endif /* _WCHAR_LIMITS_DEFINED */
+
+#ifndef _WINT_LIMITS_DEFINED
+#define _WINT_LIMITS_DEFINED
+#define            WINT_MIN                       (~__WINT_MAX__)
+#define            WINT_MAX                         __WINT_MAX__
+#define            WINT_WIDTH                       __WINT_WIDTH__
+#endif /* _WINT_LIMITS_DEFINED */
 
 #endif/*_STDINT_H*/

src/libc/include/wchar.h

@@ -1,25 +1,7 @@
 #ifndef _WCHAR_H
 #define _WCHAR_H
 
-#include <cdefs.h>
-
-#ifndef _WCHAR_T_DEFINED
-#define _WCHAR_T_DEFINED
-#ifndef __cplusplus
-typedef __WCHAR_TYPE__ wchar_t;
-#endif /* __cplusplus */
-#endif /* _WCHAR_T_DEFINED */
-
-#ifndef _WCHAR_LIMITS_DEFINED
-#define _WCHAR_LIMITS_DEFINED
-#define WCHAR_WIDTH __WCHAR_WIDTH__
-#define WCHAR_MIN (~__WCHAR_MAX__)
-#define WCHAR_MAX   __WCHAR_MAX__
-#endif
-
-#ifndef WEOF
-#define WEOF -1
-#endif
+#include <__wchar_def.h>
 
 __BEGIN_DECLS
 

src/libc/include/wctype.h

@@ -0,0 +1,38 @@
+#ifndef _WCTYPE_H
+#define _WCTYPE_H
+
+#include <__wchar_def.h>
+
+__BEGIN_DECLS
+
+int iswalnum(wint_t wc);
+
+int iswalpha(wint_t wc);
+
+int iswblank(wint_t wc);
+
+int iswcntrl(wint_t wc);
+
+int iswdigit(wint_t wc);
+
+int iswgraph(wint_t wc);
+
+int iswlower(wint_t wc);
+
+int iswprint(wint_t wc);
+
+int iswpunct(wint_t wc);
+
+int iswspace(wint_t wc);
+
+int iswupper(wint_t wc);
+
+int iswxdigit(wint_t wc);
+
+wint_t towlower(wint_t wc);
+
+wint_t towupper(wint_t wc);
+
+__END_DECLS
+
+#endif /* _WCTYPE_H */

src/libcxx/header_test.cpp

@@ -22,6 +22,8 @@
 #include <cstring>
 #include <ctime>
 #include <ctgmath>
+#include <cwchar>
+#include <cwctype>
 #include <cxxabi.h>
 #include <exception>
 #include <initializer_list>
@@ -64,5 +66,6 @@
 #include <tgmath.h>
 #include <time.h>
 #include <wchar.h>
+#include <wctype.h>
 
 // tests for conflicts

src/libcxx/include/cwchar

@@ -0,0 +1,34 @@
+// -*- C++ -*-
+#ifndef _EZCXX_CWCHAR
+#define _EZCXX_CWCHAR
+
+#include <wchar.h>
+
+#pragma clang system_header
+
+namespace std {
+using ::wint_t;
+
+using ::wmemcpy;
+using ::wmemmove;
+using ::wmemset;
+using ::wmemcmp;
+using ::wmemchr;
+using ::wcscpy;
+using ::wcsncpy;
+using ::wcscat;
+using ::wcsncat;
+using ::wcschr;
+using ::wcsrchr;
+using ::wcspbrk;
+using ::wcsstr;
+using ::wcstok;
+using ::wcscspn;
+using ::wcsspn;
+using ::wcslen;
+using ::wcsnlen;
+using ::wcscmp;
+using ::wcsncmp;
+} // namespace std
+
+#endif // _EZCXX_CWCHAR

src/libcxx/include/cwctype

@@ -0,0 +1,28 @@
+// -*- C++ -*-
+#ifndef _EZCXX_CWCTYPE
+#define _EZCXX_CWCTYPE
+
+#include <wctype.h>
+
+#pragma clang system_header
+
+namespace std {
+using ::wint_t;
+
+using ::iswalnum;
+using ::iswalpha;
+using ::iswblank;
+using ::iswcntrl;
+using ::iswdigit;
+using ::iswgraph;
+using ::iswlower;
+using ::iswprint;
+using ::iswpunct;
+using ::iswspace;
+using ::iswupper;
+using ::iswxdigit;
+using ::towlower;
+using ::towupper;
+} // namespace std
+
+#endif // _EZCXX_CWCTYPE