From 1aeb7e2b426e7a94cdd4f83c4337f44c0f5a2ca8 Mon Sep 17 00:00:00 2001
From: Thomas Voss <mail@thomasvoss.com>
Date: Tue, 14 May 2024 23:59:05 +0200
Subject: Add encoding-generic macros
---
test/_brk-test.h | 10 +++++-----
test/_case-test.h | 22 +++++++++++-----------
test/norm-nfd-test.c | 10 +++++-----
test/wbrk-human-test.c | 10 +++++-----
4 files changed, 26 insertions(+), 26 deletions(-)
(limited to 'test')
diff --git a/test/_brk-test.h b/test/_brk-test.h
index 396138b..21a6a2b 100644
--- a/test/_brk-test.h
+++ b/test/_brk-test.h
@@ -15,8 +15,8 @@
#include <unicode/string.h>
#define TESTFILE STR(BRKTYPE) "brk.in"
-#define ITERFUNC CONCAT(CONCAT(u8, BRKTYPE), next)
-#define CNTFUNC CONCAT(CONCAT(u8, BRKTYPE), cnt)
+#define ITERFUNC CONCAT(CONCAT(ucs, BRKTYPE), next)
+#define CNTFUNC CONCAT(CONCAT(ucs, BRKTYPE), cnt)
static bool test(struct u8view, int);
@@ -68,12 +68,12 @@ test(struct u8view sv, int id)
rune op;
struct u8view sv_cpy = sv;
- while ((op = u8cut(nullptr, &sv_cpy, U"×÷", 2)) != MBEND) {
+ while ((op = ucscut(nullptr, &sv_cpy, U"×÷", 2)) != MBEND) {
rune ch;
sscanf(sv_cpy.p, "%" SCNxRUNE, &ch);
char8_t buf[U8_LEN_MAX];
- int w = rtou8(buf, sizeof(buf), ch);
+ int w = rtoucs(buf, sizeof(buf), ch);
total += w;
if (op == U'÷')
@@ -103,7 +103,7 @@ test(struct u8view sv, int id)
struct u8view it1, buf_cpy = buf;
for (size_t i = 0; ITERFUNC(&it1, &buf_cpy); i++) {
item it2 = items.buf[i];
- if (!u8eq(it1, ((struct u8view){it2.buf, it2.len}))) {
+ if (!ucseq(it1, ((struct u8view){it2.buf, it2.len}))) {
warn("case %d: expected %s ‘%.*s’ but got ‘%.*s’", id,
STR(BRKTYPE_LONG), (int)it2.len, it2.buf, SV_PRI_ARGS(it1));
rv = false;
diff --git a/test/_case-test.h b/test/_case-test.h
index 701d884..24a18f1 100644
--- a/test/_case-test.h
+++ b/test/_case-test.h
@@ -14,7 +14,7 @@
#include <unicode/string.h>
#define TESTFILE STR(CASETYPE) ".in"
-#define FUNC CONCAT(u8, CASETYPE)
+#define FUNC CONCAT(ucs, CASETYPE)
static bool test(const char8_t *, int);
@@ -54,22 +54,22 @@ test(const char8_t *line, int id)
{
struct u8view mapped, sv = {line, strlen(line)};
struct u8view before, after, flags;
- u8cut(&before, &sv, U";", 1);
- u8cut(&after, &sv, U";", 1);
- u8cut(&flags, &sv, U";", 1);
+ ucscut(&before, &sv, U";", 1);
+ ucscut(&after, &sv, U";", 1);
+ ucscut(&flags, &sv, U";", 1);
- enum caseflags cf = u8eq(flags, U8("ẞ")) ? CF_ẞ
- : u8eq(flags, U8("AZ")) ? CF_LANG_AZ
- : u8eq(flags, U8("LT")) ? CF_LANG_LT
- : u8eq(flags, U8("NL")) ? CF_LANG_NL
+ enum caseflags cf = ucseq(flags, U8("ẞ")) ? CF_ẞ
+ : ucseq(flags, U8("AZ")) ? CF_LANG_AZ
+ : ucseq(flags, U8("LT")) ? CF_LANG_LT
+ : ucseq(flags, U8("NL")) ? CF_LANG_NL
: 0;
arena a = mkarena(0);
- mapped.p = FUNC(&mapped.len, before, cf, alloc_arena, &(struct arena_ctx){
+ mapped.p = FUNC(&mapped.len, before, cf, alloc_arena, &((struct arena_ctx){
.a = &a,
- });
+ }));
- if (!u8eq(mapped, after)) {
+ if (!ucseq(mapped, after)) {
warn("case %d: expected ‘%.*s’ but got ‘%.*s’", id, SV_PRI_ARGS(after),
SV_PRI_ARGS(mapped));
arena_free(&a);
diff --git a/test/norm-nfd-test.c b/test/norm-nfd-test.c
index 02fde47..95bc8d5 100644
--- a/test/norm-nfd-test.c
+++ b/test/norm-nfd-test.c
@@ -60,7 +60,7 @@ test(struct u8view sv, int id)
};
struct u8view column;
- while (u8cut(&column, &sv, U";", 1) != MBEND) {
+ while (ucscut(&column, &sv, U";", 1) != MBEND) {
dynarr(char8_t) s = {
.alloc = alloc_arena,
.ctx = &ctx,
@@ -70,10 +70,10 @@ test(struct u8view sv, int id)
struct u8view cp;
do {
rune ch;
- _ = u8cut(&cp, &column, U" ", 1);
+ _ = ucscut(&cp, &column, U" ", 1);
sscanf(cp.p, "%" SCNxRUNE, &ch);
char8_t buf[U8_LEN_MAX];
- int w = rtou8(buf, sizeof(buf), ch);
+ int w = rtoucs(buf, sizeof(buf), ch);
DAEXTEND(&s, buf, w);
} while (_ != MBEND);
@@ -83,8 +83,8 @@ test(struct u8view sv, int id)
for (size_t i = 0; i < 5; i++) {
size_t base = i < 3 ? 2 : 4;
struct u8view normd = {};
- normd.p = u8norm_nfd(&normd.len, columns.buf[i], alloc_arena, &ctx);
- if (!u8eq(columns.buf[base], normd)) {
+ normd.p = ucsnorm_nfd(&normd.len, columns.buf[i], alloc_arena, &ctx);
+ if (!ucseq(columns.buf[base], normd)) {
warn("case %d: expected c%zu to be ‘%.*s’ but got ‘%.*s’", id,
i + 1, SV_PRI_ARGS(columns.buf[base]), SV_PRI_ARGS(normd));
rv = false;
diff --git a/test/wbrk-human-test.c b/test/wbrk-human-test.c
index 6f8bf7a..24a3513 100644
--- a/test/wbrk-human-test.c
+++ b/test/wbrk-human-test.c
@@ -47,26 +47,26 @@ bool
test(struct u8view sv, int id)
{
struct u8view src;
- u8cut(&src, &sv, U";", 1);
+ ucscut(&src, &sv, U";", 1);
struct u8view w;
dynarr(struct u8view) ws = {.alloc = alloc_heap};
- while (u8cut(&w, &sv, U"|", 1) != MBEND)
+ while (ucscut(&w, &sv, U"|", 1) != MBEND)
DAPUSH(&ws, w);
if (w.len > 0)
DAPUSH(&ws, w);
/* Assert the word count is correct */
size_t n;
- if ((n = u8wcnt_human(src)) != ws.len) {
+ if ((n = ucswcnt_human(src)) != ws.len) {
warn("case %d: expected %zu words but got %zu", id, ws.len, n);
return false;
}
/* Assert the individual words are correct */
- for (size_t i = 0; u8wnext_human(&w, &src) != 0; i++) {
- if (!u8eq(w, ws.buf[i])) {
+ for (size_t i = 0; ucswnext_human(&w, &src) != 0; i++) {
+ if (!ucseq(w, ws.buf[i])) {
warn("case %d: expected word %zu to be ‘%.*s’ but got ‘%.*s’", id,
i, SV_PRI_ARGS(ws.buf[i]), SV_PRI_ARGS(w));
return false;
--
cgit v1.2.3