mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-05 04:06:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

char32: inline wcs*() wrappers

Browse source
This commit is contained in:
Daniel Eklöf 2022-01-10 21:06:44 +01:00
parent e0227266ca
commit dc42b41b62
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 70 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

108
char32.c
View file

@ -33,24 +33,12 @@ _Static_assert(
#error "wchar_t does not use UTF-32" #error "wchar_t does not use UTF-32"
#endif #endif
size_t
c32len(const char32_t *s)
{
return wcslen((const wchar_t *)s);
}
UNITTEST UNITTEST
{ {
xassert(c32len(U"") == 0); xassert(c32len(U"") == 0);
xassert(c32len(U"foobar") == 6); xassert(c32len(U"foobar") == 6);
} }
int
c32cmp(const char32_t *s1, const char32_t *s2)
{
return wcscmp((const wchar_t *)s1, (const wchar_t *)s2);
}
UNITTEST UNITTEST
{ {
xassert(c32cmp(U"foobar", U"foobar") == 0); xassert(c32cmp(U"foobar", U"foobar") == 0);
@ -60,12 +48,6 @@ UNITTEST
xassert(c32cmp(U"b", U"a") > 0); xassert(c32cmp(U"b", U"a") > 0);
} }
char32_t *
c32ncpy(char32_t *dst, const char32_t *src, size_t n)
{
return (char32_t *)wcsncpy((wchar_t *)dst, (const wchar_t *)src, n);
}
UNITTEST UNITTEST
{ {
char32_t copy[16]; char32_t copy[16];
@ -83,12 +65,6 @@ UNITTEST
xassert(memcmp(&copy[6], zeroes, sizeof(zeroes)) == 0); xassert(memcmp(&copy[6], zeroes, sizeof(zeroes)) == 0);
} }
char32_t *
c32cpy(char32_t *dst, const char32_t *src)
{
return (char32_t *)wcscpy((wchar_t *)dst, (const wchar_t *)src);
}
UNITTEST UNITTEST
{ {
char32_t copy[16]; char32_t copy[16];
@ -110,18 +86,6 @@ UNITTEST
xassert(memcmp(&copy[7], fives, sizeof(fives)) == 0); xassert(memcmp(&copy[7], fives, sizeof(fives)) == 0);
} }
char32_t *
c32chr(const char32_t *s, char32_t c)
{
return (char32_t *)wcschr((const wchar_t *)s, c);
}
int
c32casecmp(const char32_t *s1, const char32_t *s2)
{
return wcscasecmp((const wchar_t *)s1, (const wchar_t *)s2);
}
UNITTEST UNITTEST
{ {
xassert(c32casecmp(U"foobar", U"FOOBAR") == 0); xassert(c32casecmp(U"foobar", U"FOOBAR") == 0);
@ -131,12 +95,6 @@ UNITTEST
xassert(c32casecmp(U"B", U"a") > 0); xassert(c32casecmp(U"B", U"a") > 0);
} }
int
c32ncasecmp(const char32_t *s1, const char32_t *s2, size_t n)
{
return wcsncasecmp((const wchar_t *)s1, (const wchar_t *)s2, n);
}
UNITTEST UNITTEST
{ {
xassert(c32ncasecmp(U"foo", U"FOObar", 3) == 0); xassert(c32ncasecmp(U"foo", U"FOObar", 3) == 0);
@ -146,12 +104,6 @@ UNITTEST
xassert(c32ncasecmp(U"BB", U"a", 1) > 0); xassert(c32ncasecmp(U"BB", U"a", 1) > 0);
} }
char32_t *
c32ncat(char32_t *dst, const char32_t *src, size_t n)
{
return (char32_t *)wcsncat((wchar_t *)dst, (const wchar_t *)src, n);
}
UNITTEST UNITTEST
{ {
char32_t dst[32] = U"foobar"; char32_t dst[32] = U"foobar";
@ -161,12 +113,6 @@ UNITTEST
xassert(c32cmp(dst, U"foobar12345678") == 0); xassert(c32cmp(dst, U"foobar12345678") == 0);
} }
char32_t *
c32cat(char32_t *dst, const char32_t *src)
{
return (char32_t *)wcscat((wchar_t *)dst, (const wchar_t *)src);
}
UNITTEST UNITTEST
{ {
char32_t dst[32] = U"foobar"; char32_t dst[32] = U"foobar";
@ -176,12 +122,6 @@ UNITTEST
xassert(c32cmp(dst, U"foobar12345678") == 0); xassert(c32cmp(dst, U"foobar12345678") == 0);
} }
char32_t *
c32dup(const char32_t *s)
{
return (char32_t *)wcsdup((const wchar_t *)s);
}
UNITTEST UNITTEST
{ {
char32_t *c = c32dup(U"foobar"); char32_t *c = c32dup(U"foobar");
@ -273,12 +213,6 @@ UNITTEST
xassert(c32[1] == 0x55555555); xassert(c32[1] == 0x55555555);
} }
size_t
mbstoc32(char32_t *dst, const char *src, size_t len)
{
return mbsntoc32(dst, src, strlen(src) + 1, len);
}
UNITTEST UNITTEST
{ {
const char input[] = "foobarzoo"; const char input[] = "foobarzoo";
@ -461,45 +395,3 @@ UNITTEST
xassert(ac32tombs(NULL) == NULL); xassert(ac32tombs(NULL) == NULL);
setlocale(LC_CTYPE, "C"); setlocale(LC_CTYPE, "C");
} }
char32_t
toc32lower(char32_t c)
{
return (char32_t)towlower((wint_t)c);
}
char32_t
toc32upper(char32_t c)
{
return (char32_t)towupper((wint_t)c);
}
bool
isc32space(char32_t c32)
{
return iswspace((wint_t)c32);
}
bool
isc32print(char32_t c32)
{
return iswprint((wint_t)c32);
}
bool
isc32graph(char32_t c32)
{
return iswgraph((wint_t)c32);
}
int
c32width(char32_t c)
{
return wcwidth((wchar_t)c);
}
int
c32swidth(const char32_t *s, size_t n)
{
return wcswidth((const wchar_t *)s, n);
}

90
char32.h
View file

@ -4,32 +4,82 @@
#include <uchar.h> #include <uchar.h>
#include <stddef.h> #include <stddef.h>
#include <stdarg.h> #include <stdarg.h>
#include <string.h>
#include <wchar.h>
#include <wctype.h>
size_t c32len(const char32_t *s); static inline size_t c32len(const char32_t *s) {
int c32cmp(const char32_t *s1, const char32_t *s2); return wcslen((const wchar_t *)s);
}
char32_t *c32ncpy(char32_t *dst, const char32_t *src, size_t n); static inline int c32cmp(const char32_t *s1, const char32_t *s2) {
char32_t *c32cpy(char32_t *dst, const char32_t *src); return wcscmp((const wchar_t *)s1, (const wchar_t *)s2);
char32_t *c32ncat(char32_t *dst, const char32_t *src, size_t n); }
char32_t *c32cat(char32_t *dst, const char32_t *src);
char32_t *c32dup(const char32_t *s);
char32_t *c32chr(const char32_t *s, char32_t c); static inline char32_t *c32ncpy(char32_t *dst, const char32_t *src, size_t n) {
return (char32_t *)wcsncpy((wchar_t *)dst, (const wchar_t *)src, n);
}
int c32casecmp(const char32_t *s1, const char32_t *s2); static inline char32_t *c32cpy(char32_t *dst, const char32_t *src) {
int c32ncasecmp(const char32_t *s1, const char32_t *s2, size_t n); return (char32_t *)wcscpy((wchar_t *)dst, (const wchar_t *)src);
}
static inline char32_t *c32ncat(char32_t *dst, const char32_t *src, size_t n) {
return (char32_t *)wcsncat((wchar_t *)dst, (const wchar_t *)src, n);
}
static inline char32_t *c32cat(char32_t *dst, const char32_t *src) {
return (char32_t *)wcscat((wchar_t *)dst, (const wchar_t *)src);
}
static inline char32_t *c32dup(const char32_t *s) {
return (char32_t *)wcsdup((const wchar_t *)s);
}
static inline char32_t *c32chr(const char32_t *s, char32_t c) {
return (char32_t *)wcschr((const wchar_t *)s, c);
}
static inline int c32casecmp(const char32_t *s1, const char32_t *s2) {
return wcscasecmp((const wchar_t *)s1, (const wchar_t *)s2);
}
static inline int c32ncasecmp(const char32_t *s1, const char32_t *s2, size_t n) {
return wcsncasecmp((const wchar_t *)s1, (const wchar_t *)s2, n);
}
static inline char32_t toc32lower(char32_t c) {
return (char32_t)towlower((wint_t)c);
}
static inline char32_t toc32upper(char32_t c) {
return (char32_t)towupper((wint_t)c);
}
static inline bool isc32space(char32_t c32) {
return iswspace((wint_t)c32);
}
static inline bool isc32print(char32_t c32) {
return iswprint((wint_t)c32);
}
static inline bool isc32graph(char32_t c32) {
return iswgraph((wint_t)c32);
}
static inline int c32width(char32_t c) {
return wcwidth((wchar_t)c);
}
static inline int c32swidth(const char32_t *s, size_t n) {
return wcswidth((const wchar_t *)s, n);
}
size_t mbsntoc32(char32_t *dst, const char *src, size_t nms, size_t len); size_t mbsntoc32(char32_t *dst, const char *src, size_t nms, size_t len);
size_t mbstoc32(char32_t *dst, const char *src, size_t len);
char32_t *ambstoc32(const char *src); char32_t *ambstoc32(const char *src);
char *ac32tombs(const char32_t *src); char *ac32tombs(const char32_t *src);
char32_t toc32lower(char32_t c); static inline size_t mbstoc32(char32_t *dst, const char *src, size_t len) {
char32_t toc32upper(char32_t c); return mbsntoc32(dst, src, strlen(src) + 1, len);
}
bool isc32space(char32_t c32);
bool isc32print(char32_t c32);
bool isc32graph(char32_t c32);
int c32width(char32_t c);
int c32swidth(const char32_t *s, size_t n);