Hojun-Cho/ww
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib: graduate bytes/strings find-funcs to (i32 | void)

Browse Source 
Replaces the -1 sentinel return on indexbyte/byteindex/rbyteindex/
index with Hare's optional-shaped tagged union. Callers `match` on
the result and bind the index from the i32 variant.

Two cgen fixes were needed first:

1. resolve_type for N_TTAGGED rounded value payload up to an 8-byte
   multiple. (i32 | void) was sized 12 — tag (8) + payload (4) —
   which made the reg-passing ABI compute size/8 = 1 word and drop
   the value word.

2. The call-arg push path special-cased struct and slice args but
   not tagged-return calls. A nested `f(g())` where g returns a
   tagged union pushed only AX (tag); the matching pop loaded a
   stale DX/SI for the value. Now pushes AX/DX[/CX] in order so
   the pop side drains tag → arg-reg[0], value(s) → arg-reg[1..].

strings.contains rewritten to match on the new tagged result. No
other callers existed in lib/ — bufio/io still use their own
shapes.
This commit is contained in:
Hojun-Cho
2026-05-12 01:49:00 +09:00
parent 41a82021a3
commit 1e2f55aed8
5 changed files with 64 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/bytes/bytes.ww
View File

@@ -10,13 +10,15 @@ export fn equal(a: []u8, b: []u8) bool = {
return i == b.len;
};
export fn indexbyte(s: []u8, c: u8) i32 = {
// indexbyte — first index of byte `c` in `s`. Hare-shaped optional:
// (i32 | void). void variant indicates "not found".
export fn indexbyte(s: []u8, c: u8) (i32 | void) = {
let i: i32 = 0;
for (i < s.len) {
if (s[i] == c) { return i; };
i += 1;
};
return -1;
return;
};
export fn copy(dst: []u8, src: []u8) i32 = {
@@ -30,12 +32,12 @@ export fn copy(dst: []u8, src: []u8) i32 = {
return n;
};
// index — first index of `sub` in `s`, or -1. Mirrors Hare's
// bytes::index (the []u8 needle variant; the u8 needle stays as
// indexbyte until we have union-arg dispatch). Empty `sub` matches at 0.
export fn index(s: []u8, sub: []u8) i32 = {
// index — first index of `sub` in `s`. Mirrors Hare's bytes::index
// (the []u8 needle variant; the u8 needle stays as indexbyte until we
// have union-arg dispatch). Empty `sub` matches at 0.
export fn index(s: []u8, sub: []u8) (i32 | void) = {
if (sub.len == 0) { return 0; };
if (sub.len > s.len) { return -1; };
if (sub.len > s.len) { return; };
let last: i32 = s.len - sub.len;
let i: i32 = 0;
for (i <= last) {
@@ -48,5 +50,5 @@ export fn index(s: []u8, sub: []u8) i32 = {
if (ok) { return i; };
i += 1;
};
return -1;
return;
};