lib/ascii: add strlower_buf/strupper_buf (#11)
Restore Hare's two-tier delegation: strlower/strupper alloc a buffer then delegate to strlower_buf/strupper_buf, which fold ASCII case into a caller-provided buffer. Too-small buffer returns nomem via the `let nm: nomem` value form. ref/hare/ascii/string.ha:21,43. Regen w6c/wwdump/smoke combined.ww — all three embed lib/ascii.
This commit is contained in:
@@ -35,7 +35,45 @@ fn checkfold(in: str, lo: str, up: str) void = {
|
||||
signalled = 105; checkfold("aB1z", "ab1z", "AB1Z");
|
||||
};
|
||||
|
||||
// checkbuf — strlower_buf/strupper_buf into an exactly-sized buf.
|
||||
fn checkbuf(in: str, lo: str, up: str) void = {
|
||||
let lstore: [16]u8; let lbuf: []u8 = lstore[0:16]; lbuf.len = 0;
|
||||
match (ascii.strlower_buf(in, lbuf)) {
|
||||
case let got: str => { if (got != lo) { fail(); }; };
|
||||
case nomem => { fail(); };
|
||||
};
|
||||
let ustore: [16]u8; let ubuf: []u8 = ustore[0:16]; ubuf.len = 0;
|
||||
match (ascii.strupper_buf(in, ubuf)) {
|
||||
case let got: str => { if (got != up) { fail(); }; };
|
||||
case nomem => { fail(); };
|
||||
};
|
||||
};
|
||||
|
||||
@test fn strfold_buf_cases() void = {
|
||||
signalled = 110; checkbuf("ABC", "abc", "ABC");
|
||||
signalled = 111; checkbuf("aB1z", "ab1z", "AB1Z");
|
||||
signalled = 112; checkbuf("", "", "");
|
||||
// non-ASCII pins UTF-8 multibyte passthrough through the _buf path
|
||||
// directly (all bytes >=0x80, untouched by the byte-wise fold).
|
||||
signalled = 113; checkbuf("こ", "こ", "こ");
|
||||
// cap exactly == s.len must succeed — pins the `<` boundary in the
|
||||
// buf.cap check (a `<=` off-by-one would wrongly return nomem here).
|
||||
signalled = 114;
|
||||
let exact: [3]u8; let ebuf: []u8 = exact[0:3]; ebuf.len = 0;
|
||||
match (ascii.strlower_buf("ABC", ebuf)) {
|
||||
case let got: str => { if (got != "abc") { fail(); }; };
|
||||
case nomem => { fail(); };
|
||||
};
|
||||
signalled = 115;
|
||||
let small: [2]u8; let sbuf: []u8 = small[0:2]; sbuf.len = 0;
|
||||
match (ascii.strlower_buf("ABC", sbuf)) {
|
||||
case let got: str => { fail(); };
|
||||
case nomem => void;
|
||||
};
|
||||
};
|
||||
|
||||
export fn main() i32 = {
|
||||
signalled = 1; strfold_cases();
|
||||
signalled = 2; strfold_buf_cases();
|
||||
return 0;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user