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

fix(parser): save/restore + depth counter for reliable } consumption

Browse Source
This commit is contained in:
dimgigov
2026-06-07 17:25:30 +03:00
parent 4794335673
commit 8347599d23
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/parser.bux
+14 -3
View File
@@ -862,10 +862,14 @@ func parserParseBlock(p: *Parser) -> *Block {
b.firstStmt = null as *Stmt; b.firstStmt = null as *Stmt;
b.lastStmt = null as *Stmt; b.lastStmt = null as *Stmt;
// Build AST with parserParseStmt (may not consume all tokens)
var blockPos: int = p.pos;
while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile {
if parserCheck(p, tkNewLine) || parserCheck(p, tkSemicolon) { while parserCheck(p, tkNewLine) || parserCheck(p, tkSemicolon) {
discard parserAdvance(p); discard parserAdvance(p);
continue; }
if parserCheck(p, tkRBrace) || parserPeek(p, 0) == tkEndOfFile {
break;
} }
let beforePos: int = p.pos; let beforePos: int = p.pos;
let s: *Stmt = parserParseStmt(p); let s: *Stmt = parserParseStmt(p);
@@ -885,7 +889,14 @@ func parserParseBlock(p: *Parser) -> *Block {
b.stmtCount = b.stmtCount + 1; b.stmtCount = b.stmtCount + 1;
} }
} }
discard parserExpect(p, tkRBrace, "expected '}'"); // Reliable token consumption: reset to after { and use depth counter
p.pos = blockPos;
var depth: int = 1;
while depth > 0 && parserPeek(p, 0) != tkEndOfFile {
if parserCheck(p, tkLBrace) { depth = depth + 1; }
else if parserCheck(p, tkRBrace) { depth = depth - 1; }
discard parserAdvance(p);
}
return b; return b;
} }