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

selfhost: drop snake_case locals in dyn/dynout/obj + w6a + cgen + ww driver

Browse Source
This commit is contained in:
Hojun-Cho
2026-05-11 16:33:02 +09:00
parent c64e96cbd6
commit 97ca76d2bb
18 changed files with 1795 additions and 1795 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
selfhost/cmd/ww/main.combined.ww
View File

@@ -538,17 +538,17 @@ fn visitadd(c: *expctx, path: str) void = {
// Try <dir>/<name>.ww then <dir>/<name>/<name>.ww. Returns NUL-terminated
// arena-resident path if found, else nil.
fn locatein(a: *arena, dir: *u8, dir_len: u64, name: *u8, name_len: u64) *u8 = {
fn locatein(a: *arena, dir: *u8, dirlen: u64, name: *u8, namelen: u64) *u8 = {
// candidate 1: <dir>/<name>.ww
let buf: *u8 = amalloc(a, PATH_MAX): *u8;
let off: u64 = 0u64;
let i: u64 = 0u64;
for (i < dir_len) { buf[off + i] = dir[i]; i += 1u64; };
off += dir_len;
for (i < dirlen) { buf[off + i] = dir[i]; i += 1u64; };
off += dirlen;
buf[off] = 47u8; off += 1u64; // '/'
i = 0u64;
for (i < name_len) { buf[off + i] = name[i]; i += 1u64; };
off += name_len;
for (i < namelen) { buf[off + i] = name[i]; i += 1u64; };
off += namelen;
buf[off] = 46u8; off += 1u64; // '.'
buf[off] = 119u8; off += 1u64; // 'w'
buf[off] = 119u8; off += 1u64; // 'w'
@@ -559,16 +559,16 @@ fn locatein(a: *arena, dir: *u8, dir_len: u64, name: *u8, name_len: u64) *u8 = {
let buf2: *u8 = amalloc(a, PATH_MAX): *u8;
off = 0u64;
i = 0u64;
for (i < dir_len) { buf2[off + i] = dir[i]; i += 1u64; };
off += dir_len;
for (i < dirlen) { buf2[off + i] = dir[i]; i += 1u64; };
off += dirlen;
buf2[off] = 47u8; off += 1u64;
i = 0u64;
for (i < name_len) { buf2[off + i] = name[i]; i += 1u64; };
off += name_len;
for (i < namelen) { buf2[off + i] = name[i]; i += 1u64; };
off += namelen;
buf2[off] = 47u8; off += 1u64;
i = 0u64;
for (i < name_len) { buf2[off + i] = name[i]; i += 1u64; };
off += name_len;
for (i < namelen) { buf2[off + i] = name[i]; i += 1u64; };
off += namelen;
buf2[off] = 46u8; off += 1u64;
buf2[off] = 119u8; off += 1u64;
buf2[off] = 119u8; off += 1u64;
@@ -578,7 +578,7 @@ fn locatein(a: *arena, dir: *u8, dir_len: u64, name: *u8, name_len: u64) *u8 = {
};
// Walk a colon-separated dirlist, return first hit or nil.
fn locateimport(a: *arena, dirs: *u8, name: *u8, name_len: u64) *u8 = {
fn locateimport(a: *arena, dirs: *u8, name: *u8, namelen: u64) *u8 = {
let total: u64 = cstrlen(dirs);
let p: u64 = 0u64;
for (p < total) {
@@ -589,7 +589,7 @@ fn locateimport(a: *arena, dirs: *u8, name: *u8, name_len: u64) *u8 = {
};
let seglen: u64 = q - p;
if (seglen > 0u64) {
let hit: *u8 = locatein(a, dirs + p, seglen, name, name_len);
let hit: *u8 = locatein(a, dirs + p, seglen, name, namelen);
if (hit != nil) { return hit; };
};
p = q + 1u64;
@@ -599,8 +599,8 @@ fn locateimport(a: *arena, dirs: *u8, name: *u8, name_len: u64) *u8 = {
// ---- file slurp -------------------------------------------------------
fn readall(path_cs: *u8) (*u8, u64) = {
let fd: i32 = os.open(path_cs, os.O_RDONLY, 0i32);
fn readall(pathcs: *u8) (*u8, u64) = {
let fd: i32 = os.open(pathcs, os.O_RDONLY, 0i32);
if (fd < 0) { return nil, 0u64; };
let n: i64 = os.filesize(fd);
if (n < 0i64) { os.close(fd); return nil, 0u64; };
@@ -699,15 +699,15 @@ fn modulename(path: *u8, plen: u64) (*u8, u64) = {
return path + prev, last - prev;
};
fn expand(c: *expctx, path_cs: *u8) void = {
let plen: u64 = cstrlen(path_cs);
let pathstr: str = astrndup(c.a, path_cs, plen);
fn expand(c: *expctx, pathcs: *u8) void = {
let plen: u64 = cstrlen(pathcs);
let pathstr: str = astrndup(c.a, pathcs, plen);
if (visitseen(c, pathstr)) { return; };
visitadd(c, pathstr);
let bufp: *u8;
let blen: u64;
bufp, blen = readall(path_cs);
bufp, blen = readall(pathcs);
if (bufp == nil) {
os.write(2, "ww: cannot read source\n".ptr, 23u64);
return;
@@ -741,7 +741,7 @@ fn expand(c: *expctx, path_cs: *u8) void = {
// non-exported names by module.
let mp: *u8;
let mn: u64;
mp, mn = modulename(path_cs, plen);
mp, mn = modulename(pathcs, plen);
if (mn > 0u64) {
os.writefull(c.out, "// MODULE: ".ptr, 11u64);
os.writefull(c.out, mp, mn);

40
selfhost/cmd/ww/main.ww
View File

@@ -219,17 +219,17 @@ fn visitadd(c: *expctx, path: str) void = {
// Try <dir>/<name>.ww then <dir>/<name>/<name>.ww. Returns NUL-terminated
// arena-resident path if found, else nil.
fn locatein(a: *arena, dir: *u8, dir_len: u64, name: *u8, name_len: u64) *u8 = {
fn locatein(a: *arena, dir: *u8, dirlen: u64, name: *u8, namelen: u64) *u8 = {
// candidate 1: <dir>/<name>.ww
let buf: *u8 = amalloc(a, PATH_MAX): *u8;
let off: u64 = 0u64;
let i: u64 = 0u64;
for (i < dir_len) { buf[off + i] = dir[i]; i += 1u64; };
off += dir_len;
for (i < dirlen) { buf[off + i] = dir[i]; i += 1u64; };
off += dirlen;
buf[off] = 47u8; off += 1u64; // '/'
i = 0u64;
for (i < name_len) { buf[off + i] = name[i]; i += 1u64; };
off += name_len;
for (i < namelen) { buf[off + i] = name[i]; i += 1u64; };
off += namelen;
buf[off] = 46u8; off += 1u64; // '.'
buf[off] = 119u8; off += 1u64; // 'w'
buf[off] = 119u8; off += 1u64; // 'w'
@@ -240,16 +240,16 @@ fn locatein(a: *arena, dir: *u8, dir_len: u64, name: *u8, name_len: u64) *u8 = {
let buf2: *u8 = amalloc(a, PATH_MAX): *u8;
off = 0u64;
i = 0u64;
for (i < dir_len) { buf2[off + i] = dir[i]; i += 1u64; };
off += dir_len;
for (i < dirlen) { buf2[off + i] = dir[i]; i += 1u64; };
off += dirlen;
buf2[off] = 47u8; off += 1u64;
i = 0u64;
for (i < name_len) { buf2[off + i] = name[i]; i += 1u64; };
off += name_len;
for (i < namelen) { buf2[off + i] = name[i]; i += 1u64; };
off += namelen;
buf2[off] = 47u8; off += 1u64;
i = 0u64;
for (i < name_len) { buf2[off + i] = name[i]; i += 1u64; };
off += name_len;
for (i < namelen) { buf2[off + i] = name[i]; i += 1u64; };
off += namelen;
buf2[off] = 46u8; off += 1u64;
buf2[off] = 119u8; off += 1u64;
buf2[off] = 119u8; off += 1u64;
@@ -259,7 +259,7 @@ fn locatein(a: *arena, dir: *u8, dir_len: u64, name: *u8, name_len: u64) *u8 = {
};
// Walk a colon-separated dirlist, return first hit or nil.
fn locateimport(a: *arena, dirs: *u8, name: *u8, name_len: u64) *u8 = {
fn locateimport(a: *arena, dirs: *u8, name: *u8, namelen: u64) *u8 = {
let total: u64 = cstrlen(dirs);
let p: u64 = 0u64;
for (p < total) {
@@ -270,7 +270,7 @@ fn locateimport(a: *arena, dirs: *u8, name: *u8, name_len: u64) *u8 = {
};
let seglen: u64 = q - p;
if (seglen > 0u64) {
let hit: *u8 = locatein(a, dirs + p, seglen, name, name_len);
let hit: *u8 = locatein(a, dirs + p, seglen, name, namelen);
if (hit != nil) { return hit; };
};
p = q + 1u64;
@@ -280,8 +280,8 @@ fn locateimport(a: *arena, dirs: *u8, name: *u8, name_len: u64) *u8 = {
// ---- file slurp -------------------------------------------------------
fn readall(path_cs: *u8) (*u8, u64) = {
let fd: i32 = os.open(path_cs, os.O_RDONLY, 0i32);
fn readall(pathcs: *u8) (*u8, u64) = {
let fd: i32 = os.open(pathcs, os.O_RDONLY, 0i32);
if (fd < 0) { return nil, 0u64; };
let n: i64 = os.filesize(fd);
if (n < 0i64) { os.close(fd); return nil, 0u64; };
@@ -380,15 +380,15 @@ fn modulename(path: *u8, plen: u64) (*u8, u64) = {
return path + prev, last - prev;
};
fn expand(c: *expctx, path_cs: *u8) void = {
let plen: u64 = cstrlen(path_cs);
let pathstr: str = astrndup(c.a, path_cs, plen);
fn expand(c: *expctx, pathcs: *u8) void = {
let plen: u64 = cstrlen(pathcs);
let pathstr: str = astrndup(c.a, pathcs, plen);
if (visitseen(c, pathstr)) { return; };
visitadd(c, pathstr);
let bufp: *u8;
let blen: u64;
bufp, blen = readall(path_cs);
bufp, blen = readall(pathcs);
if (bufp == nil) {
os.write(2, "ww: cannot read source\n".ptr, 23u64);
return;
@@ -422,7 +422,7 @@ fn expand(c: *expctx, path_cs: *u8) void = {
// non-exported names by module.
let mp: *u8;
let mn: u64;
mp, mn = modulename(path_cs, plen);
mp, mn = modulename(pathcs, plen);
if (mn > 0u64) {
os.writefull(c.out, "// MODULE: ".ptr, 11u64);
os.writefull(c.out, mp, mn);