Hare's canonical runtime allocator is rt::malloc with linker symbol
rt.malloc (ref/hare/rt/malloc.ha:27,78). ww kept the dot→underscore
Plan 9 convention (CLAUDE.md rule 4) so the linker symbol becomes
rt_malloc; the lib/rt exported function name becomes malloc; ww
callers say rt.malloc(...).
The language builtin keyword stays `alloc(T)!` — unchanged from Hare
(ref/hare/hare/lex/token.ha:21 ltok::ALLOC, parse/expr.ha:398
builtin()). The rename only touches the lowered linker symbol and the
exported function name behind it; the user-facing syntax for
heap-allocation is identical to Hare.
Surface:
- rt/alloc.s: TEXT rt_alloc → TEXT rt_malloc, labels updated
- lib/rt/malloc.ww: @symbol("rt_malloc") fn malloc(...) (was rt_alloc/alloc)
- rt/ensure.ww: local FFI decl + call site updated to malloc; `!` dropped
on the direct FFI call (rt_malloc returns *void, not a tagged union)
- 18 .ww callers: rt.alloc(...) → rt.malloc(...)
- cstage cmd/wcc/check.c + wwstage selfhost/cmd/wcc/check.ww
alloc-builtin suppression gate routes through ffi_resolve("malloc")
for the lowering; the user-shadow check still keys on the BUILTIN
KEYWORD "alloc" since that is what `alloc(...)` parses as. Adding
"malloc" to the user-shadow check was unnecessary and was reverted
during pre-commit review.
- cstage cmd/w6c/cgen.c: 2× ffi_resolve("alloc") → ffi_resolve("malloc")
- wwstage cgenexpr/cgenstmt: 2× ffiresolve(c, "alloc") → ffiresolve(c, "malloc")
- Test fixtures (700_e2e, 758_cgalloc_str_field, 990_selfhost, 992_w6l_ww,
selfhost/test/tagged_ptr_ret.ww): updated inline ww sources to the new
decl + call form
This is commit 2 of 3 in the lib/rt extraction (#38). Commit 3 closes
the OOM contract — return type becomes nullable *void and the builtin
lowering null-checks + propagates nomem.
Verified 132/132 + 995_self_rebuild byte-identity (5 wwstage tools
round-trip identical) + make clean cold rebuild.
143 lines
3.4 KiB
Plaintext
143 lines
3.4 KiB
Plaintext
// path — filesystem path manipulation. UTF-8 paths, '/' separator.
|
|
// Mirrors Hare's path:: surface. ww doesn't yet ship the stack-buffer
|
|
// path::buffer; the functions here all take a `str` and return a
|
|
// borrowed view (basename / dirname) or a fresh owned str (join).
|
|
|
|
package path;
|
|
|
|
import rt;
|
|
|
|
def SEP: u8 = 47u8; // '/'
|
|
|
|
// abs — `p` is an absolute path (starts with '/').
|
|
export fn abs(p: str) bool = {
|
|
if (p.len == 0) { return false; };
|
|
return p[0] == SEP;
|
|
};
|
|
|
|
// dirname — directory component of `p`, POSIX-style. Returns a
|
|
// borrowed view of `p` (or the static "." / "/" strings). Mirrors
|
|
// Hare's path::dirname.
|
|
export fn dirname(p: str) str = {
|
|
if (p.len == 0) { return "."; };
|
|
// Strip trailing separators.
|
|
let n: i32 = p.len;
|
|
for (n > 0) {
|
|
if (p[n - 1] != SEP) { break; };
|
|
n -= 1;
|
|
};
|
|
if (n == 0) { return "/"; };
|
|
// Last separator in the trimmed prefix.
|
|
let i: i32 = n - 1;
|
|
for (i >= 0) {
|
|
if (p[i] == SEP) { break; };
|
|
i -= 1;
|
|
};
|
|
if (i < 0) { return "."; };
|
|
// Strip trailing separators on the directory part too.
|
|
for (i > 0) {
|
|
if (p[i - 1] != SEP) { break; };
|
|
i -= 1;
|
|
};
|
|
if (i == 0) { return "/"; };
|
|
let r: str;
|
|
r.ptr = p.ptr;
|
|
r.len = i;
|
|
return r;
|
|
};
|
|
|
|
// basename — final path component of `p`, POSIX-style. Returns a
|
|
// borrowed view of `p` (or "." / "/" sentinel strings). Mirrors
|
|
// Hare's path::basename.
|
|
export fn basename(p: str) str = {
|
|
if (p.len == 0) { return "."; };
|
|
let n: i32 = p.len;
|
|
for (n > 0) {
|
|
if (p[n - 1] != SEP) { break; };
|
|
n -= 1;
|
|
};
|
|
if (n == 0) { return "/"; };
|
|
let i: i32 = n - 1;
|
|
for (i >= 0) {
|
|
if (p[i] == SEP) { break; };
|
|
i -= 1;
|
|
};
|
|
let r: str;
|
|
r.ptr = p.ptr + ((i + 1): u64);
|
|
r.len = n - (i + 1);
|
|
return r;
|
|
};
|
|
|
|
// extension — the final ".ext" suffix of `basename(p)`, including
|
|
// the dot, or "" if none. Returns a borrowed view of `p`. Mirrors
|
|
// Hare's path::extension.
|
|
export fn extension(p: str) str = {
|
|
let b: str = basename(p);
|
|
let i: i32 = b.len - 1;
|
|
for (i > 0) {
|
|
if (b[i] == 46u8) { // '.'
|
|
let r: str;
|
|
r.ptr = b.ptr + (i: u64);
|
|
r.len = b.len - i;
|
|
return r;
|
|
};
|
|
i -= 1;
|
|
};
|
|
let empty: str;
|
|
empty.ptr = nil;
|
|
empty.len = 0;
|
|
return empty;
|
|
};
|
|
|
|
// join — concatenate two path components with a single '/' separator.
|
|
// Returns owned str (release via os.free). If `b` is absolute, the
|
|
// result is `b`. Mirrors Hare's path::buffer init+push, narrowed to
|
|
// two-arg join (no variadic).
|
|
export fn join(a: str, b: str) str = {
|
|
if (abs(b)) {
|
|
let buf: *u8 = rt.malloc(b.len: u64): *u8;
|
|
let i: i32 = 0;
|
|
for (i < b.len) { buf[i] = b[i]; i += 1; };
|
|
let r: str;
|
|
r.ptr = buf;
|
|
r.len = b.len;
|
|
return r;
|
|
};
|
|
if (a.len == 0) {
|
|
let buf: *u8 = rt.malloc(b.len: u64): *u8;
|
|
let i: i32 = 0;
|
|
for (i < b.len) { buf[i] = b[i]; i += 1; };
|
|
let r: str;
|
|
r.ptr = buf;
|
|
r.len = b.len;
|
|
return r;
|
|
};
|
|
if (b.len == 0) {
|
|
let buf: *u8 = rt.malloc(a.len: u64): *u8;
|
|
let i: i32 = 0;
|
|
for (i < a.len) { buf[i] = a[i]; i += 1; };
|
|
let r: str;
|
|
r.ptr = buf;
|
|
r.len = a.len;
|
|
return r;
|
|
};
|
|
// Trim trailing '/' from a; b never starts with '/' here (checked
|
|
// above via abs(b)).
|
|
let an: i32 = a.len;
|
|
for (an > 0) {
|
|
if (a[an - 1] != SEP) { break; };
|
|
an -= 1;
|
|
};
|
|
let total: i32 = an + 1 + b.len;
|
|
let buf: *u8 = rt.malloc(total: u64): *u8;
|
|
let i: i32 = 0;
|
|
for (i < an) { buf[i] = a[i]; i += 1; };
|
|
buf[an] = SEP;
|
|
let j: i32 = 0;
|
|
for (j < b.len) { buf[an + 1 + j] = b[j]; j += 1; };
|
|
let r: str;
|
|
r.ptr = buf;
|
|
r.len = total;
|
|
return r;
|
|
};
|