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

fix: infinite-loop guards in match/struct-init parsers

Browse Source
This commit is contained in:
dimgigov
2026-05-31 20:29:59 +03:00
parent dee9a3614c
commit 535e446b47
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_selfhost/src/parser.bux
+4
View File
@@ -368,6 +368,7 @@ func parserParsePostfix(p: *Parser) -> *Expr {
while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile {
while parserCheck(p, tkNewLine) { discard parserAdvance(p); } while parserCheck(p, tkNewLine) { discard parserAdvance(p); }
if parserCheck(p, tkRBrace) || parserPeek(p, 0) == tkEndOfFile { break; } if parserCheck(p, tkRBrace) || parserPeek(p, 0) == tkEndOfFile { break; }
let sip: int = p.pos;
let fName: LexToken = parserExpect(p, tkIdent, "expected field name"); let fName: LexToken = parserExpect(p, tkIdent, "expected field name");
discard parserExpect(p, tkColon, "expected ':'"); discard parserExpect(p, tkColon, "expected ':'");
let fValue: *Expr = parserParseExpr(p); let fValue: *Expr = parserParseExpr(p);
@@ -383,6 +384,7 @@ func parserParsePostfix(p: *Parser) -> *Expr {
} }
fieldCount = fieldCount + 1; fieldCount = fieldCount + 1;
parserMatch(p, tkComma); parserMatch(p, tkComma);
if p.pos == sip { discard parserAdvance(p); }
} }
discard parserExpect(p, tkRBrace, "expected '}'"); discard parserExpect(p, tkRBrace, "expected '}'");
let e: *Expr = parserMakeExpr(ekStructInit, siLine, siCol); let e: *Expr = parserMakeExpr(ekStructInit, siLine, siCol);
@@ -614,10 +616,12 @@ func parserParseStmt(p: *Parser) -> *Stmt {
// Skip match body (simplified — just parse arms as empty) // Skip match body (simplified — just parse arms as empty)
while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile {
if parserCheck(p, tkNewLine) { discard parserAdvance(p); continue; } if parserCheck(p, tkNewLine) { discard parserAdvance(p); continue; }
let mp: int = p.pos;
discard parserParseExpr(p); // pattern discard parserParseExpr(p); // pattern
if parserMatch(p, tkFatArrow) { if parserMatch(p, tkFatArrow) {
discard parserParseExpr(p); // body discard parserParseExpr(p); // body
} }
if p.pos == mp { discard parserAdvance(p); }
} }
discard parserExpect(p, tkRBrace, "expected '}' to close match"); discard parserExpect(p, tkRBrace, "expected '}' to close match");
let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt;
src_bux/parser.bux
+4
View File
@@ -368,6 +368,7 @@ func parserParsePostfix(p: *Parser) -> *Expr {
while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile {
while parserCheck(p, tkNewLine) { discard parserAdvance(p); } while parserCheck(p, tkNewLine) { discard parserAdvance(p); }
if parserCheck(p, tkRBrace) || parserPeek(p, 0) == tkEndOfFile { break; } if parserCheck(p, tkRBrace) || parserPeek(p, 0) == tkEndOfFile { break; }
let sip: int = p.pos;
let fName: LexToken = parserExpect(p, tkIdent, "expected field name"); let fName: LexToken = parserExpect(p, tkIdent, "expected field name");
discard parserExpect(p, tkColon, "expected ':'"); discard parserExpect(p, tkColon, "expected ':'");
let fValue: *Expr = parserParseExpr(p); let fValue: *Expr = parserParseExpr(p);
@@ -383,6 +384,7 @@ func parserParsePostfix(p: *Parser) -> *Expr {
} }
fieldCount = fieldCount + 1; fieldCount = fieldCount + 1;
parserMatch(p, tkComma); parserMatch(p, tkComma);
if p.pos == sip { discard parserAdvance(p); }
} }
discard parserExpect(p, tkRBrace, "expected '}'"); discard parserExpect(p, tkRBrace, "expected '}'");
let e: *Expr = parserMakeExpr(ekStructInit, siLine, siCol); let e: *Expr = parserMakeExpr(ekStructInit, siLine, siCol);
@@ -614,10 +616,12 @@ func parserParseStmt(p: *Parser) -> *Stmt {
// Skip match body (simplified — just parse arms as empty) // Skip match body (simplified — just parse arms as empty)
while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile {
if parserCheck(p, tkNewLine) { discard parserAdvance(p); continue; } if parserCheck(p, tkNewLine) { discard parserAdvance(p); continue; }
let mp: int = p.pos;
discard parserParseExpr(p); // pattern discard parserParseExpr(p); // pattern
if parserMatch(p, tkFatArrow) { if parserMatch(p, tkFatArrow) {
discard parserParseExpr(p); // body discard parserParseExpr(p); // body
} }
if p.pos == mp { discard parserAdvance(p); }
} }
discard parserExpect(p, tkRBrace, "expected '}' to close match"); discard parserExpect(p, tkRBrace, "expected '}' to close match");
let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt;