review

OpenDreamProject · Dec 8, 2024 · 93d52ba · 93d52ba
1 parent 85efc53
commit 93d52ba
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/Content.Tests/DMProject/Tests/Statements/For/reuse_decl_const2.dm b/Content.Tests/DMProject/Tests/Statements/For/reuse_decl_const2.dm
@@ -0,0 +1,18 @@
+// COMPILE ERROR OD0501
+
+/datum
+	var/const/idx = 0
+	var/c = 0
+	proc/do_loop()
+		for (idx in list(1,2,3))
+			c += idx
+
+/proc/RunTest()
+	var/datum/d = new
+	d.do_loop()
+
+	var/const/idx = 0
+	var/c = 0
+	for (idx in list(1,2,3))
+		c += idx
+
diff --git a/DMCompiler/DM/Builders/DMProcBuilder.cs b/DMCompiler/DM/Builders/DMProcBuilder.cs
@@ -487,13 +487,12 @@ public void ProcessStatementFor(DMASTProcStatementFor statementFor) {
                                 outputExpr = exprRange.Value;
                             }
 
-                            if (outputExpr is DMASTIdentifier identifier &&
-                                dmObject.GetVariable(identifier.Identifier) is { IsConst: true }) {
-                                compiler.Emit(WarningCode.WriteToConstant, outputExpr.Location, "Cannot change constant value");
-                            }
-
                             var outputVar = _exprBuilder.Create(outputExpr);
 
+                            if (outputVar is Local { LocalVar: DMProc.LocalConstVariable } or Field { IsConst: true }) {
+                                compiler.Emit(WarningCode.WriteToConstant, outputExpr.Location, $"Cannot change constant value");
+                            }
+
                             var start = _exprBuilder.Create(exprRange.StartRange);
                             var end = _exprBuilder.Create(exprRange.EndRange);
                             var step = exprRange.Step != null
@@ -525,7 +524,10 @@ public void ProcessStatementFor(DMASTProcStatementFor statementFor) {
 
                             if (outputVar is Local outputLocal) {
                                 outputLocal.LocalVar.ExplicitValueType = statementFor.DMTypes;
-                            }
+                                if(outputLocal.LocalVar is DMProc.LocalConstVariable)
+                                    compiler.Emit(WarningCode.WriteToConstant, outputExpr.Location, $"Cannot change constant value");
+                            } else if (outputVar is Field { IsConst: true })
+                                compiler.Emit(WarningCode.WriteToConstant, outputExpr.Location, "Cannot change constant value");
 
                             ProcessStatementForList(list, outputVar, statementFor.DMTypes, statementFor.Body);
                             break;

diff --git a/DMCompiler/DM/Expressions/LValue.cs b/DMCompiler/DM/Expressions/LValue.cs
@@ -122,6 +122,7 @@ public override void EmitPushInitial(ExpressionContext ctx) {
 
 // Identifier of field
 internal sealed class Field(Location location, DMVariable variable, DMComplexValueType valType) : LValue(location, variable.Type) {
+    public bool IsConst { get; } = variable.IsConst;
     public override DMComplexValueType ValType => valType;
 
     public override void EmitPushInitial(ExpressionContext ctx) {