Skip to content

Fix Issue 21347 - array literal parser doesn't stop on missing comma #23772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thewilsonator merged 1 commit into from
Sep 3, 2026
+38 −10
Merged

Fix Issue 21347 - array literal parser doesn't stop on missing comma #23772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions compiler/src/dmd/parse.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9024,7 +9024,12 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
values.push(e);
if (token.value == TOK.rightBracket)
break;
check(TOK.comma);
if (token.value != TOK.comma)
{
check(TOK.comma);
break;
}
nextToken();
}
check(loc, TOK.rightBracket);

Expand Down Expand Up @@ -9441,7 +9446,12 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
arguments.push(index);
if (token.value == TOK.rightBracket)
break;
check(TOK.comma);
if (token.value != TOK.comma)
{
check(TOK.comma);
break;
}
nextToken();
}
check(TOK.rightBracket);
inBrackets--;
Expand Down
20 changes: 20 additions & 0 deletions compiler/test/fail_compilation/fail21347.d
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/* TEST_OUTPUT:
---
fail_compilation/fail21347.d(19): Error: expression expected, not `;`
fail_compilation/fail21347.d(20): Error: found `}` when expecting `,`
fail_compilation/fail21347.d(19): Error: found `End of File` when expecting `]`
fail_compilation/fail21347.d(19): Error: found `End of File` when expecting `)`
fail_compilation/fail21347.d(21): Error: found `End of File` when expecting `;` following expression
fail_compilation/fail21347.d(19): expression: `[(__error)]`
fail_compilation/fail21347.d(21): Error: matching `}` expected following compound statement, not `End of File`
fail_compilation/fail21347.d(18): unmatched `{`
---
*/

// https://github.com/dlang/dmd/issues/21347
// diagnostic: Parser never stops looking for ',' on array literal syntax error

void test21347()
{
([;
}
14 changes: 6 additions & 8 deletions compiler/test/fail_compilation/fail315.d
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
/*
TEST_OUTPUT:
---
fail_compilation/fail315.d-mixin-17(17): Error: found `;` when expecting `,`
fail_compilation/fail315.d-mixin-17(17): Error: expression expected, not `}`
fail_compilation/fail315.d-mixin-17(17): Error: found `End of File` when expecting `,`
fail_compilation/fail315.d-mixin-17(17): Error: found `End of File` when expecting `]`
fail_compilation/fail315.d-mixin-17(17): Error: found `End of File` when expecting `;` following `return` statement
fail_compilation/fail315.d-mixin-17(17): Error: matching `}` expected following compound statement, not `End of File`
fail_compilation/fail315.d-mixin-17(17): unmatched `{`
fail_compilation/fail315.d(22): Error: template instance `fail315.foo!()` error instantiating
fail_compilation/fail315.d-mixin-15(15): Error: found `;` when expecting `,`
fail_compilation/fail315.d-mixin-15(15): Error: found `}` when expecting `]`
fail_compilation/fail315.d-mixin-15(15): Error: found `End of File` when expecting `;` following `return` statement
fail_compilation/fail315.d-mixin-15(15): Error: matching `}` expected following compound statement, not `End of File`
fail_compilation/fail315.d-mixin-15(15): unmatched `{`
fail_compilation/fail315.d(20): Error: template instance `fail315.foo!()` error instantiating
---
*/

Expand Down
Loading