Cope with extra tokens after proc statements (#2116)

OpenDreamProject · Dec 11, 2024 · 2a55a1c · 2a55a1c
2 parents e2b4289 + 782bc7d
commit 2a55a1c
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 2 deletions.
diff --git a/Content.Tests/DMProject/Tests/Statements/extra_token_pragma.dm b/Content.Tests/DMProject/Tests/Statements/extra_token_pragma.dm
@@ -0,0 +1,6 @@
+// COMPILE ERROR OD3205
+#pragma ExtraToken error
+
+/proc/RunTest()
+	if(1).
+		ASSERT(TRUE)
diff --git a/...ken Tests/Statements/If/thing_after_if.dm → ...Tests/Statements/thing_after_statement.dm b/...ken Tests/Statements/If/thing_after_if.dm → ...Tests/Statements/thing_after_statement.dm
@@ -8,3 +8,7 @@
 		ASSERT(TRUE)
 	else
 		ASSERT(FALSE)
+	for(var/i in 1 to 1):
+		ASSERT(TRUE)
+	for(var/i in 1 to 1).
+		ASSERT(TRUE)
diff --git a/DMCompiler/Compiler/CompilerError.cs b/DMCompiler/Compiler/CompilerError.cs
@@ -74,6 +74,7 @@ public enum WarningCode {
     AssignmentInConditional = 3202,
     PickWeightedSyntax = 3203,
     AmbiguousInOrder = 3204,
+    ExtraToken = 3205,
     RuntimeSearchOperator = 3300,
 
     // 4000 - 4999 are reserved for runtime configuration. (TODO: Runtime doesn't know about configs yet!)

diff --git a/DMCompiler/Compiler/DM/DMParser.cs b/DMCompiler/Compiler/DM/DMParser.cs
@@ -1125,8 +1125,10 @@ private DMASTProcStatementIf If() {
 
             BracketWhitespace();
             ConsumeRightParenthesis();
-            Whitespace();
-            Check(TokenType.DM_Colon);
+            if (Check(TokenType.DM_Colon) || Check(TokenType.DM_Period)) {
+                Emit(WarningCode.ExtraToken, loc, "Extra token at end of proc statement");
+            }
+
             Whitespace();
 
             DMASTProcStatement? procStatement = ProcStatement();
@@ -1165,6 +1167,10 @@ private DMASTProcStatement For() {
             Whitespace();
 
             if (Check(TokenType.DM_RightParenthesis)) {
+                if (Check(TokenType.DM_Colon) || Check(TokenType.DM_Period)) {
+                    Emit(WarningCode.ExtraToken, loc, "Extra token at end of proc statement");
+                }
+
                 return new DMASTProcStatementInfLoop(loc, GetForBody(loc));
             }
 
@@ -1185,6 +1191,10 @@ private DMASTProcStatement For() {
                 if (expr1 is DMASTAssign assign) {
                     ExpressionTo(out var endRange, out var step);
                     Consume(TokenType.DM_RightParenthesis, "Expected ')' in for after to expression");
+                    if (Check(TokenType.DM_Colon) || Check(TokenType.DM_Period)) {
+                        Emit(WarningCode.ExtraToken, loc, "Extra token at end of proc statement");
+                    }
+
                     return new DMASTProcStatementFor(loc, new DMASTExpressionInRange(loc, assign.LHS, assign.RHS, endRange, step), null, null, dmTypes, GetForBody(loc));
                 } else {
                     Emit(WarningCode.BadExpression, "Expected = before to in for");
@@ -1197,15 +1207,27 @@ private DMASTProcStatement For() {
                 DMASTExpression? listExpr = Expression();
                 Whitespace();
                 Consume(TokenType.DM_RightParenthesis, "Expected ')' in for after expression 2");
+                if (Check(TokenType.DM_Colon) || Check(TokenType.DM_Period)) {
+                    Emit(WarningCode.ExtraToken, loc, "Extra token at end of proc statement");
+                }
+
                 return new DMASTProcStatementFor(loc, new DMASTExpressionIn(loc, expr1, listExpr), null, null, dmTypes, GetForBody(loc));
             }
 
             if (!Check(ForSeparatorTypes)) {
                 Consume(TokenType.DM_RightParenthesis, "Expected ')' in for after expression 1");
+                if (Check(TokenType.DM_Colon) || Check(TokenType.DM_Period)) {
+                    Emit(WarningCode.ExtraToken, loc, "Extra token at end of proc statement");
+                }
+
                 return new DMASTProcStatementFor(loc, expr1, null, null, dmTypes, GetForBody(loc));
             }
 
             if (Check(TokenType.DM_RightParenthesis)) {
+                if (Check(TokenType.DM_Colon) || Check(TokenType.DM_Period)) {
+                    Emit(WarningCode.ExtraToken, loc, "Extra token at end of proc statement");
+                }
+
                 return new DMASTProcStatementFor(loc, expr1, null, null, dmTypes, GetForBody(loc));
             }
 
@@ -1221,10 +1243,18 @@ private DMASTProcStatement For() {
 
             if (!Check(ForSeparatorTypes)) {
                 Consume(TokenType.DM_RightParenthesis, "Expected ')' in for after expression 2");
+                if (Check(TokenType.DM_Colon) || Check(TokenType.DM_Period)) {
+                    Emit(WarningCode.ExtraToken, loc, "Extra token at end of proc statement");
+                }
+
                 return new DMASTProcStatementFor(loc, expr1, expr2, null, dmTypes, GetForBody(loc));
             }
 
             if (Check(TokenType.DM_RightParenthesis)) {
+                if (Check(TokenType.DM_Colon) || Check(TokenType.DM_Period)) {
+                    Emit(WarningCode.ExtraToken, loc, "Extra token at end of proc statement");
+                }
+
                 return new DMASTProcStatementFor(loc, expr1, expr2, null, dmTypes, GetForBody(loc));
             }
 
@@ -1239,6 +1269,10 @@ private DMASTProcStatement For() {
             }
 
             Consume(TokenType.DM_RightParenthesis, "Expected ')' in for after expression 3");
+            if (Check(TokenType.DM_Colon) || Check(TokenType.DM_Period)) {
+                Emit(WarningCode.ExtraToken, loc, "Extra token at end of proc statement");
+            }
+
             return new DMASTProcStatementFor(loc, expr1, expr2, expr3, dmTypes, GetForBody(loc));
 
             DMASTProcBlockInner GetForBody(Location forLocation) {

diff --git a/DMCompiler/DMStandard/DefaultPragmaConfig.dm b/DMCompiler/DMStandard/DefaultPragmaConfig.dm
@@ -52,4 +52,5 @@
 #pragma AssignmentInConditional warning
 #pragma PickWeightedSyntax disabled
 #pragma AmbiguousInOrder warning
+#pragma ExtraToken warning
 #pragma RuntimeSearchOperator disabled