Skip to content

Fix mis-parsing else: in switch() statements #2710

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
wixoaGit merged 2 commits into from
Sep 18, 2026
Merged

Fix mis-parsing else: in switch() statements #2710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90447ae
Fix mis-parsing `else:` in `switch()` statements
Sep 18, 2026
06b42d2
Update DMCompiler/Compiler/DM/DMParser.cs
wixoaGit Sep 18, 2026
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
10 changes: 10 additions & 0 deletions Content.Tests/DMProject/Tests/Statements/Switch/else_colon.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// RETURN TRUE

/proc/RunTest()
var/foo = 5
switch(foo)
if(2)
return FALSE
else:
return TRUE
return FALSE
2 changes: 2 additions & 0 deletions DMCompiler/Compiler/DM/DMParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
}

if (path.IsOperator) {
List<DMASTProcStatement> procStatements = procBlock.Statements.ToList();

Check warning on line 269 in DMCompiler/Compiler/DM/DMParser.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest) 

Dereference of a possibly null reference.
Location tokenLoc = procBlock.Location;
//add ". = src" as the first expression in the operator
DMASTProcStatementExpression assignEqSrc = new DMASTProcStatementExpression(tokenLoc,
Expand Down Expand Up @@ -1547,6 +1547,8 @@

return new DMASTProcStatementSwitch.SwitchCaseValues(expressions.ToArray(), body);
} else if (Check(TokenType.DM_Else)) {
Whitespace();
Check(TokenType.DM_Colon); // Someone wrote "else:" instead of "else"
Comment thread
wixoaGit marked this conversation as resolved.
Whitespace();
var loc = Current().Location;
if (Current().Type == TokenType.DM_If) {
Expand Down
Loading