JS: fix automatic semicolon insertion in empty for-loop

tdewolff · Nov 16, 2023 · f48e531 · f48e531
1 parent 862a1dc
commit f48e531
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/js/parse.go b/js/parse.go
@@ -384,6 +384,8 @@ func (p *Parser) parseStmt(allowDeclaration bool) (stmt IStmt) {
 				body.List = p.parseStmtList("")
 			} else if p.tt != SemicolonToken {
 				body.List = []IStmt{p.parseStmt(false)}
+			} else {
+				p.next()
 			}
 			if init == nil {
 				varDecl := &VarDecl{TokenType: VarToken, Scope: p.scope, InFor: true}
@@ -408,6 +410,8 @@ func (p *Parser) parseStmt(allowDeclaration bool) (stmt IStmt) {
 				body.List = p.parseStmtList("")
 			} else if p.tt != SemicolonToken {
 				body.List = []IStmt{p.parseStmt(false)}
+			} else {
+				p.next()
 			}
 			if varDecl, ok := init.(*VarDecl); ok {
 				varDecl.InForInOf = true
@@ -424,6 +428,8 @@ func (p *Parser) parseStmt(allowDeclaration bool) (stmt IStmt) {
 				body.List = p.parseStmtList("")
 			} else if p.tt != SemicolonToken {
 				body.List = []IStmt{p.parseStmt(false)}
+			} else {
+				p.next()
 			}
 			if varDecl, ok := init.(*VarDecl); ok {
 				varDecl.InForInOf = true

diff --git a/js/parse_test.go b/js/parse_test.go
@@ -402,8 +402,10 @@ func TestParse(t *testing.T) {
 		{"function f(){return /*comment*/ a}", "Decl(function f Params() Stmt({ Stmt(return a) }))"},
 		{"function f(){return /*com\nment*/ a}", "Decl(function f Params() Stmt({ Stmt(return) Stmt(a) }))"},
 		{"function f(){return //comment\n a}", "Decl(function f Params() Stmt({ Stmt(return) Stmt(a) }))"},
-		{"a?.b\n`c`", "Stmt((a?.b)`c`)"},
+		{"if(a)while(true)\n;else;", "Stmt(if a Stmt(while true Stmt()) else Stmt())"},
+		{"if(a)for(;;)\n;else;", "Stmt(if a Stmt(for ; ; Stmt({ })) else Stmt())"},
 
+		{"a?.b\n`c`", "Stmt((a?.b)`c`)"},
 		{"() => { const v=6; x={v} }", "Stmt(Params() => Stmt({ Decl(const Binding(v = 6)) Stmt(x={v}) }))"},
 		{`([]=l=>{let{e}={e}})`, `Stmt(([]=(Params(Binding(l)) => Stmt({ Decl(let Binding({ Binding(e) } = {e})) }))))`}, // go-fuzz
 	}