adds warning to scope weirdness, removes nullability marker from Expr…

…essionContext. Proc
OpenDreamProject · Feb 24, 2025 · cef6c73 · cef6c73
1 parent f0a290c
commit cef6c73
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/DMCompiler/DM/Builders/DMExpressionBuilder.cs b/DMCompiler/DM/Builders/DMExpressionBuilder.cs
@@ -647,6 +647,8 @@ private DMExpression BuildScopeIdentifier(DMASTScopeIdentifier scopeIdentifier,
             if (scopeMode is Normal && ctx.Proc != null) {
                 if (ctx.Proc.GetLocalVariable(identifier.Identifier) != null) {
                     // actually - it's referring to a local variable named "type" or "parent_type"... just do the usual thing
+                    Compiler.Emit(WarningCode.SoftReservedKeyword, identifier.Location,
+                        $"Using scope operator :: on a variable named \"type\" or \"parent_type\" is ambiguous. Consider changing the variable name from \"{identifier.Identifier}\".");
                     expression = BuildExpression(scopeIdentifier.Expression, inferredPath);
                 } else {
                     return BadExpression(WarningCode.BadExpression, identifier.Location,

diff --git a/DMCompiler/DM/DMExpression.cs b/DMCompiler/DM/DMExpression.cs
@@ -138,10 +138,10 @@ private void VerifyArgType(DMCompiler compiler, DMProc targetProc, int index, st
     }
 }
 
-internal readonly struct ExpressionContext(DMCompiler compiler, DMObject type, DMProc? proc) {
+internal readonly struct ExpressionContext(DMCompiler compiler, DMObject type, DMProc proc) {
     public readonly DMCompiler Compiler = compiler;
     public readonly DMObject Type = type;
-    public readonly DMProc? Proc = proc;
+    public readonly DMProc Proc = proc;
 
     public DMObjectTree ObjectTree => Compiler.DMObjectTree;
 }