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

selfhost: graduate SK_* defs to skind enum

Browse Source
This commit is contained in:
Hojun-Cho
2026-05-12 04:52:42 +09:00
parent 408ea2a322
commit 077d0f95ed
6 changed files with 137 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/ww/sym.ww
View File

@@ -9,14 +9,16 @@ use typ;
use ast;
// Symbol kinds — must stay numerically aligned with cmd/wcc/ww.h Skind.
def SK_NONE: i32 = 0;
def SK_VAR: i32 = 1;
def SK_PARAM: i32 = 2;
def SK_DEF: i32 = 3;
def SK_TYPE: i32 = 4;
def SK_FN: i32 = 5;
def SK_USE: i32 = 6;
def SK_FIELD: i32 = 7;
type skind = enum i32 {
SK_NONE = 0,
SK_VAR = 1,
SK_PARAM = 2,
SK_DEF = 3,
SK_TYPE = 4,
SK_FN = 5,
SK_USE = 6,
SK_FIELD = 7,
};
type sym = struct {
name: str,

86
selfhost/cmd/w6c/main.combined.ww
View File

@@ -3672,14 +3672,16 @@ use typ;
use ast;
// Symbol kinds — must stay numerically aligned with cmd/wcc/ww.h Skind.
def SK_NONE: i32 = 0;
def SK_VAR: i32 = 1;
def SK_PARAM: i32 = 2;
def SK_DEF: i32 = 3;
def SK_TYPE: i32 = 4;
def SK_FN: i32 = 5;
def SK_USE: i32 = 6;
def SK_FIELD: i32 = 7;
type skind = enum i32 {
SK_NONE = 0,
SK_VAR = 1,
SK_PARAM = 2,
SK_DEF = 3,
SK_TYPE = 4,
SK_FN = 5,
SK_USE = 6,
SK_FIELD = 7,
};
type sym = struct {
name: str,
@@ -3815,31 +3817,31 @@ type checker = struct {
// seedprimitives — install the built-in type names so `i32`, `str`,
// etc. can be looked up like ordinary symbols.
fn seedprimitives(c: *checker) void = {
scopedefine(c.top, "void", SK_TYPE, c.tc.tyvoid, nil);
scopedefine(c.top, "bool", SK_TYPE, c.tc.tybool, nil);
scopedefine(c.top, "rune", SK_TYPE, c.tc.tyrune, nil);
scopedefine(c.top, "i8", SK_TYPE, c.tc.tyi8, nil);
scopedefine(c.top, "i16", SK_TYPE, c.tc.tyi16, nil);
scopedefine(c.top, "i32", SK_TYPE, c.tc.tyi32, nil);
scopedefine(c.top, "i64", SK_TYPE, c.tc.tyi64, nil);
scopedefine(c.top, "u8", SK_TYPE, c.tc.tyu8, nil);
scopedefine(c.top, "u16", SK_TYPE, c.tc.tyu16, nil);
scopedefine(c.top, "u32", SK_TYPE, c.tc.tyu32, nil);
scopedefine(c.top, "u64", SK_TYPE, c.tc.tyu64, nil);
scopedefine(c.top, "int", SK_TYPE, c.tc.tyint, nil);
scopedefine(c.top, "uint", SK_TYPE, c.tc.tyuint, nil);
scopedefine(c.top, "uintptr", SK_TYPE, c.tc.tyuintptr, nil);
scopedefine(c.top, "f32", SK_TYPE, c.tc.tyf32, nil);
scopedefine(c.top, "f64", SK_TYPE, c.tc.tyf64, nil);
scopedefine(c.top, "str", SK_TYPE, c.tc.tystr, nil);
scopedefine(c.top, "never", SK_TYPE, c.tc.tynever, nil);
scopedefine(c.top, "void", skind.SK_TYPE, c.tc.tyvoid, nil);
scopedefine(c.top, "bool", skind.SK_TYPE, c.tc.tybool, nil);
scopedefine(c.top, "rune", skind.SK_TYPE, c.tc.tyrune, nil);
scopedefine(c.top, "i8", skind.SK_TYPE, c.tc.tyi8, nil);
scopedefine(c.top, "i16", skind.SK_TYPE, c.tc.tyi16, nil);
scopedefine(c.top, "i32", skind.SK_TYPE, c.tc.tyi32, nil);
scopedefine(c.top, "i64", skind.SK_TYPE, c.tc.tyi64, nil);
scopedefine(c.top, "u8", skind.SK_TYPE, c.tc.tyu8, nil);
scopedefine(c.top, "u16", skind.SK_TYPE, c.tc.tyu16, nil);
scopedefine(c.top, "u32", skind.SK_TYPE, c.tc.tyu32, nil);
scopedefine(c.top, "u64", skind.SK_TYPE, c.tc.tyu64, nil);
scopedefine(c.top, "int", skind.SK_TYPE, c.tc.tyint, nil);
scopedefine(c.top, "uint", skind.SK_TYPE, c.tc.tyuint, nil);
scopedefine(c.top, "uintptr", skind.SK_TYPE, c.tc.tyuintptr, nil);
scopedefine(c.top, "f32", skind.SK_TYPE, c.tc.tyf32, nil);
scopedefine(c.top, "f64", skind.SK_TYPE, c.tc.tyf64, nil);
scopedefine(c.top, "str", skind.SK_TYPE, c.tc.tystr, nil);
scopedefine(c.top, "never", skind.SK_TYPE, c.tc.tynever, nil);
// `nil`, `true`, `false` are keywords — handled at the lex/parser
// level, no symbol needed.
// `len`, `alloc`, `free` are pseudo-builtins; scopedefine them so
// their use sites resolve. The actual semantics live in cgen.
scopedefine(c.top, "len", SK_FN, nil, nil);
scopedefine(c.top, "alloc", SK_FN, nil, nil);
scopedefine(c.top, "free", SK_FN, nil, nil);
scopedefine(c.top, "len", skind.SK_FN, nil, nil);
scopedefine(c.top, "alloc", skind.SK_FN, nil, nil);
scopedefine(c.top, "free", skind.SK_FN, nil, nil);
};
// installdecl — install the top-level decl's name into the top scope.
@@ -3849,11 +3851,11 @@ fn installdecl(c: *checker, d: *node) void = {
if (d == nil) { return; };
let k: i32 = d.kind;
let nm: str = d.str;
if (k == N_USE) { scopedefine(c.top, nm, SK_USE, nil, d); return; };
if (k == N_DEF) { scopedefine(c.top, nm, SK_DEF, nil, d); return; };
if (k == N_TYPEDECL) { scopedefine(c.top, nm, SK_TYPE, nil, d); return; };
if (k == N_FNDECL) { scopedefine(c.top, nm, SK_FN, nil, d); return; };
if (k == N_LET) { scopedefine(c.top, nm, SK_VAR, nil, d); return; };
if (k == N_USE) { scopedefine(c.top, nm, skind.SK_USE, nil, d); return; };
if (k == N_DEF) { scopedefine(c.top, nm, skind.SK_DEF, nil, d); return; };
if (k == N_TYPEDECL) { scopedefine(c.top, nm, skind.SK_TYPE, nil, d); return; };
if (k == N_FNDECL) { scopedefine(c.top, nm, skind.SK_FN, nil, d); return; };
if (k == N_LET) { scopedefine(c.top, nm, skind.SK_VAR, nil, d); return; };
};
// resolvewalk — recursive AST walk that, for every N_IDENT and
@@ -3938,7 +3940,7 @@ fn resolvewalk(c: *checker, n: *node) void = {
if (n.lhs != nil) { resolvewalk(c, n.lhs); };
let nm: str = n.str;
if (nm.len > 0) {
scopedefine(c.cur, nm, SK_VAR, nil, n);
scopedefine(c.cur, nm, skind.SK_VAR, nil, n);
};
if (n.body != nil) { resolvewalk(c, n.body); };
return;
@@ -3983,7 +3985,7 @@ fn resolvewalk(c: *checker, n: *node) void = {
if (k == N_LET) {
let nm: str = n.str;
if (nm.len > 0) {
scopedefine(c.cur, nm, SK_VAR, nil, n);
scopedefine(c.cur, nm, skind.SK_VAR, nil, n);
};
};
};
@@ -4013,7 +4015,7 @@ fn resolvealias(c: *checker, n: *node) *node = {
if (cur.kind != N_TNAME) { return cur; };
let s: *sym = scopelookup(c.cur, cur.str);
if (s == nil) { return cur; };
if (s.skind != SK_TYPE) { return cur; };
if (s.skind != skind.SK_TYPE) { return cur; };
let body: *node = nil;
if (s.decl != nil) { body = s.decl.lhs; };
if (body == nil) { return cur; };
@@ -4052,7 +4054,7 @@ fn varianterr(c: *checker, v: *node) bool = {
if (v.kind == N_TNAME) {
let s: *sym = scopelookup(c.cur, v.str);
if (s != nil) {
if (s.skind == SK_TYPE) {
if (s.skind == skind.SK_TYPE) {
if (s.decl != nil) {
if (s.decl.lhs != nil) {
if (s.decl.lhs.kind == N_TBANG) {
@@ -4150,7 +4152,7 @@ fn exprtype(c: *checker, e: *node) *node = {
if (nm.len == 0) { return nil; };
let s: *sym = scopelookup(c.cur, nm);
if (s == nil) { return nil; };
if (s.skind != SK_FN) { return nil; };
if (s.skind != skind.SK_FN) { return nil; };
if (s.decl == nil) { return nil; };
return s.decl.lhs; // fn-decl's lhs is the return type
};
@@ -4566,7 +4568,7 @@ fn exprtypeoftry(c: *checker, e: *node) *node = {
if (nm.len == 0) { return nil; };
let s: *sym = scopelookup(c.cur, nm);
if (s == nil) { return nil; };
if (s.skind != SK_FN) { return nil; };
if (s.skind != skind.SK_FN) { return nil; };
if (s.decl == nil) { return nil; };
return s.decl.lhs;
};
@@ -4628,7 +4630,7 @@ fn installparams(c: *checker, params: *node) void = {
if (p.kind == N_PARAM) {
let nm: str = p.str;
if (nm.len > 0) {
scopedefine(c.cur, nm, SK_PARAM, nil, p);
scopedefine(c.cur, nm, skind.SK_PARAM, nil, p);
};
};
p = p.next;
@@ -6568,7 +6570,7 @@ fn cgdot(c: *cgen, n: *node) void = {
};
};
// Module-qualified value reference: `mod.name` where `mod`
// is N_IDENT bound as SK_USE and the leaf isn't a local.
// is N_IDENT bound as skind.SK_USE and the leaf isn't a local.
// Treat as a SB symbol — `MOVQ leaf(SB), AX`. Same fallback
// the C cgen takes when bt is NULL/tyerr.
if (lhs != nil) {

2
selfhost/cmd/wcc/cgenexpr.ww
View File

@@ -861,7 +861,7 @@ fn cgdot(c: *cgen, n: *node) void = {
};
};
// Module-qualified value reference: `mod.name` where `mod`
// is N_IDENT bound as SK_USE and the leaf isn't a local.
// is N_IDENT bound as skind.SK_USE and the leaf isn't a local.
// Treat as a SB symbol — `MOVQ leaf(SB), AX`. Same fallback
// the C cgen takes when bt is NULL/tyerr.
if (lhs != nil) {

66
selfhost/cmd/wcc/check.ww
View File

@@ -36,31 +36,31 @@ type checker = struct {
// seedprimitives — install the built-in type names so `i32`, `str`,
// etc. can be looked up like ordinary symbols.
fn seedprimitives(c: *checker) void = {
scopedefine(c.top, "void", SK_TYPE, c.tc.tyvoid, nil);
scopedefine(c.top, "bool", SK_TYPE, c.tc.tybool, nil);
scopedefine(c.top, "rune", SK_TYPE, c.tc.tyrune, nil);
scopedefine(c.top, "i8", SK_TYPE, c.tc.tyi8, nil);
scopedefine(c.top, "i16", SK_TYPE, c.tc.tyi16, nil);
scopedefine(c.top, "i32", SK_TYPE, c.tc.tyi32, nil);
scopedefine(c.top, "i64", SK_TYPE, c.tc.tyi64, nil);
scopedefine(c.top, "u8", SK_TYPE, c.tc.tyu8, nil);
scopedefine(c.top, "u16", SK_TYPE, c.tc.tyu16, nil);
scopedefine(c.top, "u32", SK_TYPE, c.tc.tyu32, nil);
scopedefine(c.top, "u64", SK_TYPE, c.tc.tyu64, nil);
scopedefine(c.top, "int", SK_TYPE, c.tc.tyint, nil);
scopedefine(c.top, "uint", SK_TYPE, c.tc.tyuint, nil);
scopedefine(c.top, "uintptr", SK_TYPE, c.tc.tyuintptr, nil);
scopedefine(c.top, "f32", SK_TYPE, c.tc.tyf32, nil);
scopedefine(c.top, "f64", SK_TYPE, c.tc.tyf64, nil);
scopedefine(c.top, "str", SK_TYPE, c.tc.tystr, nil);
scopedefine(c.top, "never", SK_TYPE, c.tc.tynever, nil);
scopedefine(c.top, "void", skind.SK_TYPE, c.tc.tyvoid, nil);
scopedefine(c.top, "bool", skind.SK_TYPE, c.tc.tybool, nil);
scopedefine(c.top, "rune", skind.SK_TYPE, c.tc.tyrune, nil);
scopedefine(c.top, "i8", skind.SK_TYPE, c.tc.tyi8, nil);
scopedefine(c.top, "i16", skind.SK_TYPE, c.tc.tyi16, nil);
scopedefine(c.top, "i32", skind.SK_TYPE, c.tc.tyi32, nil);
scopedefine(c.top, "i64", skind.SK_TYPE, c.tc.tyi64, nil);
scopedefine(c.top, "u8", skind.SK_TYPE, c.tc.tyu8, nil);
scopedefine(c.top, "u16", skind.SK_TYPE, c.tc.tyu16, nil);
scopedefine(c.top, "u32", skind.SK_TYPE, c.tc.tyu32, nil);
scopedefine(c.top, "u64", skind.SK_TYPE, c.tc.tyu64, nil);
scopedefine(c.top, "int", skind.SK_TYPE, c.tc.tyint, nil);
scopedefine(c.top, "uint", skind.SK_TYPE, c.tc.tyuint, nil);
scopedefine(c.top, "uintptr", skind.SK_TYPE, c.tc.tyuintptr, nil);
scopedefine(c.top, "f32", skind.SK_TYPE, c.tc.tyf32, nil);
scopedefine(c.top, "f64", skind.SK_TYPE, c.tc.tyf64, nil);
scopedefine(c.top, "str", skind.SK_TYPE, c.tc.tystr, nil);
scopedefine(c.top, "never", skind.SK_TYPE, c.tc.tynever, nil);
// `nil`, `true`, `false` are keywords — handled at the lex/parser
// level, no symbol needed.
// `len`, `alloc`, `free` are pseudo-builtins; scopedefine them so
// their use sites resolve. The actual semantics live in cgen.
scopedefine(c.top, "len", SK_FN, nil, nil);
scopedefine(c.top, "alloc", SK_FN, nil, nil);
scopedefine(c.top, "free", SK_FN, nil, nil);
scopedefine(c.top, "len", skind.SK_FN, nil, nil);
scopedefine(c.top, "alloc", skind.SK_FN, nil, nil);
scopedefine(c.top, "free", skind.SK_FN, nil, nil);
};
// installdecl — install the top-level decl's name into the top scope.
@@ -70,11 +70,11 @@ fn installdecl(c: *checker, d: *node) void = {
if (d == nil) { return; };
let k: i32 = d.kind;
let nm: str = d.str;
if (k == N_USE) { scopedefine(c.top, nm, SK_USE, nil, d); return; };
if (k == N_DEF) { scopedefine(c.top, nm, SK_DEF, nil, d); return; };
if (k == N_TYPEDECL) { scopedefine(c.top, nm, SK_TYPE, nil, d); return; };
if (k == N_FNDECL) { scopedefine(c.top, nm, SK_FN, nil, d); return; };
if (k == N_LET) { scopedefine(c.top, nm, SK_VAR, nil, d); return; };
if (k == N_USE) { scopedefine(c.top, nm, skind.SK_USE, nil, d); return; };
if (k == N_DEF) { scopedefine(c.top, nm, skind.SK_DEF, nil, d); return; };
if (k == N_TYPEDECL) { scopedefine(c.top, nm, skind.SK_TYPE, nil, d); return; };
if (k == N_FNDECL) { scopedefine(c.top, nm, skind.SK_FN, nil, d); return; };
if (k == N_LET) { scopedefine(c.top, nm, skind.SK_VAR, nil, d); return; };
};
// resolvewalk — recursive AST walk that, for every N_IDENT and
@@ -159,7 +159,7 @@ fn resolvewalk(c: *checker, n: *node) void = {
if (n.lhs != nil) { resolvewalk(c, n.lhs); };
let nm: str = n.str;
if (nm.len > 0) {
scopedefine(c.cur, nm, SK_VAR, nil, n);
scopedefine(c.cur, nm, skind.SK_VAR, nil, n);
};
if (n.body != nil) { resolvewalk(c, n.body); };
return;
@@ -204,7 +204,7 @@ fn resolvewalk(c: *checker, n: *node) void = {
if (k == N_LET) {
let nm: str = n.str;
if (nm.len > 0) {
scopedefine(c.cur, nm, SK_VAR, nil, n);
scopedefine(c.cur, nm, skind.SK_VAR, nil, n);
};
};
};
@@ -234,7 +234,7 @@ fn resolvealias(c: *checker, n: *node) *node = {
if (cur.kind != N_TNAME) { return cur; };
let s: *sym = scopelookup(c.cur, cur.str);
if (s == nil) { return cur; };
if (s.skind != SK_TYPE) { return cur; };
if (s.skind != skind.SK_TYPE) { return cur; };
let body: *node = nil;
if (s.decl != nil) { body = s.decl.lhs; };
if (body == nil) { return cur; };
@@ -273,7 +273,7 @@ fn varianterr(c: *checker, v: *node) bool = {
if (v.kind == N_TNAME) {
let s: *sym = scopelookup(c.cur, v.str);
if (s != nil) {
if (s.skind == SK_TYPE) {
if (s.skind == skind.SK_TYPE) {
if (s.decl != nil) {
if (s.decl.lhs != nil) {
if (s.decl.lhs.kind == N_TBANG) {
@@ -371,7 +371,7 @@ fn exprtype(c: *checker, e: *node) *node = {
if (nm.len == 0) { return nil; };
let s: *sym = scopelookup(c.cur, nm);
if (s == nil) { return nil; };
if (s.skind != SK_FN) { return nil; };
if (s.skind != skind.SK_FN) { return nil; };
if (s.decl == nil) { return nil; };
return s.decl.lhs; // fn-decl's lhs is the return type
};
@@ -787,7 +787,7 @@ fn exprtypeoftry(c: *checker, e: *node) *node = {
if (nm.len == 0) { return nil; };
let s: *sym = scopelookup(c.cur, nm);
if (s == nil) { return nil; };
if (s.skind != SK_FN) { return nil; };
if (s.skind != skind.SK_FN) { return nil; };
if (s.decl == nil) { return nil; };
return s.decl.lhs;
};
@@ -849,7 +849,7 @@ fn installparams(c: *checker, params: *node) void = {
if (p.kind == N_PARAM) {
let nm: str = p.str;
if (nm.len > 0) {
scopedefine(c.cur, nm, SK_PARAM, nil, p);
scopedefine(c.cur, nm, skind.SK_PARAM, nil, p);
};
};
p = p.next;

86
selfhost/cmd/wwdump/main.combined.ww
View File

@@ -3672,14 +3672,16 @@ use typ;
use ast;
// Symbol kinds — must stay numerically aligned with cmd/wcc/ww.h Skind.
def SK_NONE: i32 = 0;
def SK_VAR: i32 = 1;
def SK_PARAM: i32 = 2;
def SK_DEF: i32 = 3;
def SK_TYPE: i32 = 4;
def SK_FN: i32 = 5;
def SK_USE: i32 = 6;
def SK_FIELD: i32 = 7;
type skind = enum i32 {
SK_NONE = 0,
SK_VAR = 1,
SK_PARAM = 2,
SK_DEF = 3,
SK_TYPE = 4,
SK_FN = 5,
SK_USE = 6,
SK_FIELD = 7,
};
type sym = struct {
name: str,
@@ -3815,31 +3817,31 @@ type checker = struct {
// seedprimitives — install the built-in type names so `i32`, `str`,
// etc. can be looked up like ordinary symbols.
fn seedprimitives(c: *checker) void = {
scopedefine(c.top, "void", SK_TYPE, c.tc.tyvoid, nil);
scopedefine(c.top, "bool", SK_TYPE, c.tc.tybool, nil);
scopedefine(c.top, "rune", SK_TYPE, c.tc.tyrune, nil);
scopedefine(c.top, "i8", SK_TYPE, c.tc.tyi8, nil);
scopedefine(c.top, "i16", SK_TYPE, c.tc.tyi16, nil);
scopedefine(c.top, "i32", SK_TYPE, c.tc.tyi32, nil);
scopedefine(c.top, "i64", SK_TYPE, c.tc.tyi64, nil);
scopedefine(c.top, "u8", SK_TYPE, c.tc.tyu8, nil);
scopedefine(c.top, "u16", SK_TYPE, c.tc.tyu16, nil);
scopedefine(c.top, "u32", SK_TYPE, c.tc.tyu32, nil);
scopedefine(c.top, "u64", SK_TYPE, c.tc.tyu64, nil);
scopedefine(c.top, "int", SK_TYPE, c.tc.tyint, nil);
scopedefine(c.top, "uint", SK_TYPE, c.tc.tyuint, nil);
scopedefine(c.top, "uintptr", SK_TYPE, c.tc.tyuintptr, nil);
scopedefine(c.top, "f32", SK_TYPE, c.tc.tyf32, nil);
scopedefine(c.top, "f64", SK_TYPE, c.tc.tyf64, nil);
scopedefine(c.top, "str", SK_TYPE, c.tc.tystr, nil);
scopedefine(c.top, "never", SK_TYPE, c.tc.tynever, nil);
scopedefine(c.top, "void", skind.SK_TYPE, c.tc.tyvoid, nil);
scopedefine(c.top, "bool", skind.SK_TYPE, c.tc.tybool, nil);
scopedefine(c.top, "rune", skind.SK_TYPE, c.tc.tyrune, nil);
scopedefine(c.top, "i8", skind.SK_TYPE, c.tc.tyi8, nil);
scopedefine(c.top, "i16", skind.SK_TYPE, c.tc.tyi16, nil);
scopedefine(c.top, "i32", skind.SK_TYPE, c.tc.tyi32, nil);
scopedefine(c.top, "i64", skind.SK_TYPE, c.tc.tyi64, nil);
scopedefine(c.top, "u8", skind.SK_TYPE, c.tc.tyu8, nil);
scopedefine(c.top, "u16", skind.SK_TYPE, c.tc.tyu16, nil);
scopedefine(c.top, "u32", skind.SK_TYPE, c.tc.tyu32, nil);
scopedefine(c.top, "u64", skind.SK_TYPE, c.tc.tyu64, nil);
scopedefine(c.top, "int", skind.SK_TYPE, c.tc.tyint, nil);
scopedefine(c.top, "uint", skind.SK_TYPE, c.tc.tyuint, nil);
scopedefine(c.top, "uintptr", skind.SK_TYPE, c.tc.tyuintptr, nil);
scopedefine(c.top, "f32", skind.SK_TYPE, c.tc.tyf32, nil);
scopedefine(c.top, "f64", skind.SK_TYPE, c.tc.tyf64, nil);
scopedefine(c.top, "str", skind.SK_TYPE, c.tc.tystr, nil);
scopedefine(c.top, "never", skind.SK_TYPE, c.tc.tynever, nil);
// `nil`, `true`, `false` are keywords — handled at the lex/parser
// level, no symbol needed.
// `len`, `alloc`, `free` are pseudo-builtins; scopedefine them so
// their use sites resolve. The actual semantics live in cgen.
scopedefine(c.top, "len", SK_FN, nil, nil);
scopedefine(c.top, "alloc", SK_FN, nil, nil);
scopedefine(c.top, "free", SK_FN, nil, nil);
scopedefine(c.top, "len", skind.SK_FN, nil, nil);
scopedefine(c.top, "alloc", skind.SK_FN, nil, nil);
scopedefine(c.top, "free", skind.SK_FN, nil, nil);
};
// installdecl — install the top-level decl's name into the top scope.
@@ -3849,11 +3851,11 @@ fn installdecl(c: *checker, d: *node) void = {
if (d == nil) { return; };
let k: i32 = d.kind;
let nm: str = d.str;
if (k == N_USE) { scopedefine(c.top, nm, SK_USE, nil, d); return; };
if (k == N_DEF) { scopedefine(c.top, nm, SK_DEF, nil, d); return; };
if (k == N_TYPEDECL) { scopedefine(c.top, nm, SK_TYPE, nil, d); return; };
if (k == N_FNDECL) { scopedefine(c.top, nm, SK_FN, nil, d); return; };
if (k == N_LET) { scopedefine(c.top, nm, SK_VAR, nil, d); return; };
if (k == N_USE) { scopedefine(c.top, nm, skind.SK_USE, nil, d); return; };
if (k == N_DEF) { scopedefine(c.top, nm, skind.SK_DEF, nil, d); return; };
if (k == N_TYPEDECL) { scopedefine(c.top, nm, skind.SK_TYPE, nil, d); return; };
if (k == N_FNDECL) { scopedefine(c.top, nm, skind.SK_FN, nil, d); return; };
if (k == N_LET) { scopedefine(c.top, nm, skind.SK_VAR, nil, d); return; };
};
// resolvewalk — recursive AST walk that, for every N_IDENT and
@@ -3938,7 +3940,7 @@ fn resolvewalk(c: *checker, n: *node) void = {
if (n.lhs != nil) { resolvewalk(c, n.lhs); };
let nm: str = n.str;
if (nm.len > 0) {
scopedefine(c.cur, nm, SK_VAR, nil, n);
scopedefine(c.cur, nm, skind.SK_VAR, nil, n);
};
if (n.body != nil) { resolvewalk(c, n.body); };
return;
@@ -3983,7 +3985,7 @@ fn resolvewalk(c: *checker, n: *node) void = {
if (k == N_LET) {
let nm: str = n.str;
if (nm.len > 0) {
scopedefine(c.cur, nm, SK_VAR, nil, n);
scopedefine(c.cur, nm, skind.SK_VAR, nil, n);
};
};
};
@@ -4013,7 +4015,7 @@ fn resolvealias(c: *checker, n: *node) *node = {
if (cur.kind != N_TNAME) { return cur; };
let s: *sym = scopelookup(c.cur, cur.str);
if (s == nil) { return cur; };
if (s.skind != SK_TYPE) { return cur; };
if (s.skind != skind.SK_TYPE) { return cur; };
let body: *node = nil;
if (s.decl != nil) { body = s.decl.lhs; };
if (body == nil) { return cur; };
@@ -4052,7 +4054,7 @@ fn varianterr(c: *checker, v: *node) bool = {
if (v.kind == N_TNAME) {
let s: *sym = scopelookup(c.cur, v.str);
if (s != nil) {
if (s.skind == SK_TYPE) {
if (s.skind == skind.SK_TYPE) {
if (s.decl != nil) {
if (s.decl.lhs != nil) {
if (s.decl.lhs.kind == N_TBANG) {
@@ -4150,7 +4152,7 @@ fn exprtype(c: *checker, e: *node) *node = {
if (nm.len == 0) { return nil; };
let s: *sym = scopelookup(c.cur, nm);
if (s == nil) { return nil; };
if (s.skind != SK_FN) { return nil; };
if (s.skind != skind.SK_FN) { return nil; };
if (s.decl == nil) { return nil; };
return s.decl.lhs; // fn-decl's lhs is the return type
};
@@ -4566,7 +4568,7 @@ fn exprtypeoftry(c: *checker, e: *node) *node = {
if (nm.len == 0) { return nil; };
let s: *sym = scopelookup(c.cur, nm);
if (s == nil) { return nil; };
if (s.skind != SK_FN) { return nil; };
if (s.skind != skind.SK_FN) { return nil; };
if (s.decl == nil) { return nil; };
return s.decl.lhs;
};
@@ -4628,7 +4630,7 @@ fn installparams(c: *checker, params: *node) void = {
if (p.kind == N_PARAM) {
let nm: str = p.str;
if (nm.len > 0) {
scopedefine(c.cur, nm, SK_PARAM, nil, p);
scopedefine(c.cur, nm, skind.SK_PARAM, nil, p);
};
};
p = p.next;
@@ -6568,7 +6570,7 @@ fn cgdot(c: *cgen, n: *node) void = {
};
};
// Module-qualified value reference: `mod.name` where `mod`
// is N_IDENT bound as SK_USE and the leaf isn't a local.
// is N_IDENT bound as skind.SK_USE and the leaf isn't a local.
// Treat as a SB symbol — `MOVQ leaf(SB), AX`. Same fallback
// the C cgen takes when bt is NULL/tyerr.
if (lhs != nil) {

10
selfhost/test/sym_link.ww
View File

@@ -16,24 +16,24 @@ export fn main() i32 = {
if (s == nil) { return 2; };
let n1: str = "foo";
let r1: *sym = scopedefine(s, n1, SK_VAR, nil, nil);
let r1: *sym = scopedefine(s, n1, skind.SK_VAR, nil, nil);
if (r1 == nil) { return 3; };
let n2: str = "bar";
let r2: *sym = scopedefine(s, n2, SK_TYPE, nil, nil);
let r2: *sym = scopedefine(s, n2, skind.SK_TYPE, nil, nil);
if (r2 == nil) { return 4; };
// Duplicate define in same scope must fail.
let r3: *sym = scopedefine(s, n1, SK_VAR, nil, nil);
let r3: *sym = scopedefine(s, n1, skind.SK_VAR, nil, nil);
if (r3 != nil) { return 5; };
let l1: *sym = scopelookup(s, n1);
if (l1 == nil) { return 6; };
if (l1.skind != SK_VAR) { return 7; };
if (l1.skind != skind.SK_VAR) { return 7; };
let l2: *sym = scopelookup(s, n2);
if (l2 == nil) { return 8; };
if (l2.skind != SK_TYPE) { return 9; };
if (l2.skind != skind.SK_TYPE) { return 9; };
// Not-found lookup returns nil.
let n3: str = "baz";