Fix empty braced object blocks and add null object statements (#2175)

OpenDreamProject · Jan 18, 2025 · 75b5cf2 · 75b5cf2
1 parent 487a30c
commit 75b5cf2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/DMCompiler/Compiler/DM/AST/DMAST.ObjectStatements.cs b/DMCompiler/Compiler/DM/AST/DMAST.ObjectStatements.cs
@@ -13,6 +13,9 @@ public abstract class DMASTStatement(Location location) : DMASTNode(location);
 /// <remarks>Emit an error code before creating!</remarks>
 public sealed class DMASTInvalidStatement(Location location) : DMASTStatement(location);
 
+/// Lone semicolon, statement containing nothing
+public sealed class DMASTNullStatement(Location location) : DMASTStatement(location);
+
 public sealed class DMASTObjectDefinition(Location location, DreamPath path, DMASTBlockInner? innerBlock)
     : DMASTStatement(location) {
     /// <summary> Unlike other Path variables stored by AST nodes, this path is guaranteed to be the real, absolute path of this object definition block. <br/>

diff --git a/DMCompiler/Compiler/DM/DMParser.cs b/DMCompiler/Compiler/DM/DMParser.cs
@@ -203,6 +203,11 @@ public DMASTFile File() {
         protected DMASTStatement? Statement() {
             var loc = CurrentLoc;
 
+            if (Current().Type == TokenType.DM_Semicolon) { // A lone semicolon creates a "null statement" (like C)
+                // Note that we do not consume the semicolon here
+                return new DMASTNullStatement(loc);
+            }
+
             DMASTPath? path = Path();
             if (path is null)
                 return null;
@@ -536,7 +541,7 @@ public DMASTFile File() {
                 Newline();
                 Consume(TokenType.DM_RightCurlyBracket, "Expected '}'");
 
-                return new DMASTBlockInner(loc, blockInner.ToArray());
+                return new DMASTBlockInner(loc, blockInner?.ToArray() ?? []);
             }
 
             return null;

diff --git a/DMCompiler/DM/Builders/DMCodeTreeBuilder.cs b/DMCompiler/DM/Builders/DMCodeTreeBuilder.cs
@@ -40,8 +40,9 @@ private void ProcessStatement(DMASTStatement statement, DreamPath currentType) {
         }
 
         switch (statement) {
-            case DMASTInvalidStatement:
-                break; // An error should have been emitted by whatever made this
+            case DMASTInvalidStatement: // An error should have been emitted by whatever made this
+            case DMASTNullStatement:
+                break;
             case DMASTObjectDefinition objectDefinition:
                 CodeTree.AddType(objectDefinition.Path);
                 if (objectDefinition.InnerBlock != null)