Fix for body parsing (#2454)

Author: wixoaGit

DMCompiler/Compiler/DM/DMParser.cs

@@ -1233,7 +1233,7 @@ private DMASTProcStatement For() {
             if (Check(TokenType.DM_RightParenthesis)) {
                 ExtraColonPeriod();
 
-                return new DMASTProcStatementInfLoop(loc, GetForBody(loc));
+                return new DMASTProcStatementInfLoop(loc, GetForBody());
             }
 
             _allowVarDeclExpression = true;
@@ -1255,7 +1255,7 @@ private DMASTProcStatement For() {
                     Consume(TokenType.DM_RightParenthesis, "Expected ')' in for after to expression");
                     ExtraColonPeriod();
 
-                    return new DMASTProcStatementFor(loc, new DMASTExpressionInRange(loc, assign.LHS, assign.RHS, endRange, step), null, null, dmTypes, GetForBody(loc));
+                    return new DMASTProcStatementFor(loc, new DMASTExpressionInRange(loc, assign.LHS, assign.RHS, endRange, step), null, null, dmTypes, GetForBody());
                 } else {
                     Emit(WarningCode.BadExpression, "Expected = before to in for");
                     return new DMASTInvalidProcStatement(loc);
@@ -1269,20 +1269,20 @@ private DMASTProcStatement For() {
                 Consume(TokenType.DM_RightParenthesis, "Expected ')' in for after expression 2");
                 ExtraColonPeriod();
 
-                return new DMASTProcStatementFor(loc, new DMASTExpressionIn(loc, expr1, listExpr), null, null, dmTypes, GetForBody(loc));
+                return new DMASTProcStatementFor(loc, new DMASTExpressionIn(loc, expr1, listExpr), null, null, dmTypes, GetForBody());
             }
 
             if (!Check(ForSeparatorTypes)) {
                 Consume(TokenType.DM_RightParenthesis, "Expected ')' in for after expression 1");
                 ExtraColonPeriod();
 
-                return new DMASTProcStatementFor(loc, expr1, null, null, dmTypes, GetForBody(loc));
+                return new DMASTProcStatementFor(loc, expr1, null, null, dmTypes, GetForBody());
             }
 
             if (Check(TokenType.DM_RightParenthesis)) {
                 ExtraColonPeriod();
 
-                return new DMASTProcStatementFor(loc, expr1, null, null, dmTypes, GetForBody(loc));
+                return new DMASTProcStatementFor(loc, expr1, null, null, dmTypes, GetForBody());
             }
 
             Whitespace();
@@ -1299,13 +1299,13 @@ private DMASTProcStatement For() {
                 Consume(TokenType.DM_RightParenthesis, "Expected ')' in for after expression 2");
                 ExtraColonPeriod();
 
-                return new DMASTProcStatementFor(loc, expr1, expr2, null, dmTypes, GetForBody(loc));
+                return new DMASTProcStatementFor(loc, expr1, expr2, null, dmTypes, GetForBody());
             }
 
             if (Check(TokenType.DM_RightParenthesis)) {
                 ExtraColonPeriod();
 
-                return new DMASTProcStatementFor(loc, expr1, expr2, null, dmTypes, GetForBody(loc));
+                return new DMASTProcStatementFor(loc, expr1, expr2, null, dmTypes, GetForBody());
             }
 
             Whitespace();
@@ -1321,30 +1321,19 @@ private DMASTProcStatement For() {
             Consume(TokenType.DM_RightParenthesis, "Expected ')' in for after expression 3");
             ExtraColonPeriod();
 
-            return new DMASTProcStatementFor(loc, expr1, expr2, expr3, dmTypes, GetForBody(loc));
+            return new DMASTProcStatementFor(loc, expr1, expr2, expr3, dmTypes, GetForBody());
 
-            DMASTProcBlockInner GetForBody(Location forLocation) {
+            DMASTProcBlockInner GetForBody() {
                 Whitespace();
-                Newline();
 
                 DMASTProcBlockInner? body = ProcBlock();
-                if (body == null) {
-                    var loc = Current().Location;
-                    DMASTProcStatement? statement;
-                    if (Check(TokenType.DM_Semicolon)) {
-                        statement = new DMASTProcStatementExpression(loc, new DMASTConstantNull(loc));
-                    } else {
-                        statement = ProcStatement();
-                        if (statement == null) {
-                            Compiler.Emit(WarningCode.MissingBody, forLocation, "Expected body or statement");
-                            statement = new DMASTInvalidProcStatement(loc);
-                        }
-                    }
-
-                    body = new DMASTProcBlockInner(loc, statement);
-                }
+                if (body != null)
+                    return body;
 
-                return body;
+                var statement = ProcStatement();
+                return statement != null
+                    ? new DMASTProcBlockInner(loc, statement)
+                    : new DMASTProcBlockInner(CurrentLoc);
             }
         }