baraba/bux-lang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

selfhost: for-in support for Channel<T>; fix break/continue C codegen

Browse Source 
- lib/Channel.bux: add Channel_Recv_Ok<T> for use in for-in desugaring
- hir_lower.bux: Channel for-in desugars to while+recv_ok pattern
- c_backend.bux: emit 'break;' / 'continue;' with semicolon, fix missing
  semicolon when break/continue inside if-block
- bootstrap/hir_lower.nim: skip generic methods in vtable generation to
  avoid referencing non-existent monomorphized C functions
This commit is contained in:
dimgigov
2026-06-10 13:46:06 +03:00
parent 7d6cf7f511
commit 0b887b92d3
4 changed files with 110 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootstrap/hir_lower.nim
+3
View File
@@ -1717,6 +1717,9 @@ proc lowerModule*(module: Module, sema: Sema): HirModule =
var found = false
for avail in methods:
if avail.name == req.declFuncName:
# Skip generic methods — they have no concrete C function to put in vtable
if avail.decl.declFuncTypeParams.len > 0:
break
found = true
methodNames.add(req.declFuncName)
break
lib/Channel.bux
+4
View File
@@ -24,6 +24,10 @@ func Channel_Recv<T>(ch: *Channel<T>) -> T {
return result;
}
func Channel_Recv_Ok<T>(ch: *Channel<T>, out: *T) -> bool {
return bux_channel_recv(ch.handle, out as *void) != 0;
}
func Channel_Close<T>(ch: *Channel<T>) {
bux_channel_close(ch.handle);
}
src/c_backend.bux
+3 -3
View File
@@ -438,11 +438,11 @@ func CBE_EmitExpr(cbe: *CEmitter, node: *HirNode) {
// Break / Continue
if kind == hBreak {
StringBuilder_Append(&cbe.sb, "break");
StringBuilder_Append(&cbe.sb, "break;");
return;
}
if kind == hContinue {
StringBuilder_Append(&cbe.sb, "continue");
StringBuilder_Append(&cbe.sb, "continue;");
return;
}
@@ -609,7 +609,7 @@ func CBE_EmitExpr(cbe: *CEmitter, node: *HirNode) {
}
CBE_EmitExpr(cbe, child);
// Add semicolon for statements that need it
if child.kind != hBlock && child.kind != hIf && child.kind != hWhile && child.kind != hLoop {
if child.kind != hBlock && child.kind != hIf && child.kind != hWhile && child.kind != hLoop && child.kind != hBreak && child.kind != hContinue {
StringBuilder_Append(&cbe.sb, ";");
}
StringBuilder_Append(&cbe.sb, "\n");
src/hir_lower.bux
+100 -1
View File
@@ -1420,9 +1420,10 @@ func Lcx_LowerStmt(ctx: *LowerCtx, stmt: *Stmt) -> *HirNode {
// Handle already-monomorphized types like Array_int, Iter_string
var isArray: bool = String_Eq(collTypeName, "Array");
var isIter: bool = String_Eq(collTypeName, "Iter");
var isChannel: bool = String_Eq(collTypeName, "Channel");
// Also check for mangled names like Array_int, Iter_string
if !isArray && !isIter {
if !isArray && !isIter && !isChannel {
if String_StartsWith(collTypeName, "Array_") {
isArray = true;
let prefixLen: uint = 6; // len("Array_")
@@ -1439,10 +1440,108 @@ func Lcx_LowerStmt(ctx: *LowerCtx, stmt: *Stmt) -> *HirNode {
elemTypeName = bux_str_slice(collTypeName, prefixLen, totalLen - prefixLen);
elemTypeKind = Lcx_ResolveTypeKindFromName(elemTypeName);
}
} else if String_StartsWith(collTypeName, "Channel_") {
isChannel = true;
let prefixLen: uint = 8; // len("Channel_")
let totalLen: uint = bux_strlen(collTypeName);
if totalLen > prefixLen {
elemTypeName = bux_str_slice(collTypeName, prefixLen, totalLen - prefixLen);
elemTypeKind = Lcx_ResolveTypeKindFromName(elemTypeName);
}
}
}
if !String_Eq(elemTypeName, "") {
if isChannel {
// Channel-based for: for x in ch { body }
// Desugar to:
// while true {
// let x: T;
// if !Channel_Recv_Ok_T(&ch, &x) { break; }
// body
// }
let recvOkFuncName: String = Lcx_MangleName("Channel_Recv_Ok", elemTypeName, "", 1);
let genRecvOk: *Decl = Lcx_FindGenericFunc(ctx, "Channel_Recv_Ok");
if genRecvOk != null as *Decl {
Lcx_GenerateFuncInstance(ctx, genRecvOk, elemTypeName, "", 1);
}
let bodyBlock: *HirNode = Lcx_LowerBlock(ctx, body, -1);
// alloca for x
let xAlloca: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode;
xAlloca.kind = hAlloca;
xAlloca.line = line;
xAlloca.column = col;
xAlloca.strValue = varName;
xAlloca.typeName = elemTypeName;
xAlloca.typeKind = elemTypeKind;
// call Channel_Recv_Ok_T(&ch, &x)
let recvOkCall: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode;
recvOkCall.kind = hCall;
recvOkCall.strValue = recvOkFuncName;
let addrCh: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode;
addrCh.kind = hUnary;
addrCh.intValue = tkAmp;
if iterExpr.kind == ekIdent {
let chVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode;
chVar.kind = hVar;
chVar.strValue = iterExpr.strValue;
addrCh.child1 = chVar;
} else {
addrCh.child1 = Lcx_LowerExpr(ctx, iterExpr);
}
let addrX: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode;
addrX.kind = hUnary;
addrX.intValue = tkAmp;
let xVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode;
xVar.kind = hVar;
xVar.strValue = varName;
addrX.child1 = xVar;
recvOkCall.child1 = addrCh;
recvOkCall.child2 = addrX;
// if !recvOk { break; }
let notRecvOk: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode;
notRecvOk.kind = hUnary;
notRecvOk.intValue = tkBang;
notRecvOk.child1 = recvOkCall;
let breakNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode;
breakNode.kind = hBreak;
let ifNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode;
ifNode.kind = hIf;
ifNode.child1 = notRecvOk;
ifNode.child2 = breakNode;
// Build while body block: ifNode -> bodyBlock
let whileBody: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode;
whileBody.kind = hBlock;
whileBody.child1 = xAlloca;
xAlloca.child3 = ifNode;
if bodyBlock != null as *HirNode && bodyBlock.kind == hBlock {
ifNode.child3 = bodyBlock.child1;
} else if bodyBlock != null as *HirNode {
ifNode.child3 = bodyBlock;
}
// while true
let trueLit: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode;
trueLit.kind = hLit;
trueLit.intValue = tkBoolLiteral;
trueLit.strValue = "true";
let whileNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode;
whileNode.kind = hWhile;
whileNode.child1 = trueLit;
whileNode.child2 = whileBody;
let blockNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode;
blockNode.kind = hBlock;
blockNode.line = line;
blockNode.column = col;
blockNode.child1 = whileNode;
return blockNode;
}
if isArray || isIter {
let iterVarName: String = String_Concat("__iter_", varName);
let iterTypeName: String = Lcx_MangleName("Iter", elemTypeName, "", 1);