Skip to content

Correctly detect loop assignment as variable read & make loop variable immutable #1165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Frotty merged 3 commits into from
Mar 11, 2026
Merged

Correctly detect loop assignment as variable read & make loop variable immutable #1165

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3039ddb
fix loop warnings
Frotty Mar 11, 2026
87b64cf
Merge branch 'master' into fix-loop-warnings
Frotty Mar 11, 2026
da79eae
build fixes
Frotty Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ....wurstscript/src/main/java/de/peeeq/wurstscript/jurst/AntlrJurstParseTreeTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,8 +782,8 @@ private WStatement transformForLoop(StmtForLoopContext s) {

private WStatement transformForRangeLoop(ForRangeLoopContext s) {
WPos source = source(s);
LocalVarDef loopVar = transformLocalVarDef(s.loopVar);
loopVar.setInitialExpr(transformExpr(s.start));
Expr start = transformExpr(s.start);
LocalVarDef loopVar = transformLocalVarDef(s.loopVar, start);
Expr to = transformExpr(s.end);
Expr step;
if (s.step == null) {
Expand All @@ -800,17 +800,17 @@ private WStatement transformForRangeLoop(ForRangeLoopContext s) {
throw error(s, "for range loop not implemented: " + text(s));
}

private LocalVarDef transformLocalVarDef(LocalVarDefInlineContext v) {
Modifiers modifiers = Ast.Modifiers();
private LocalVarDef transformLocalVarDef(LocalVarDefInlineContext v, OptExpr initialExpr) {
// Loop variables behave like let-variables for user code.
Modifiers modifiers = Ast.Modifiers(Ast.ModConstant(source(v)));
OptTypeExpr optTyp = transformOptionalType(v.typeExpr());
Identifier name = text(v.name);
OptExpr initialExpr = Ast.NoExpr();
return Ast.LocalVarDef(source(v), modifiers, optTyp, name, initialExpr);
}

private WStatement transformForIteratorLoop(ForIteratorLoopContext s) {
WPos source = source(s);
LocalVarDef loopVar = transformLocalVarDef(s.loopVar);
LocalVarDef loopVar = transformLocalVarDef(s.loopVar, Ast.NoExpr());
Expr in = transformExpr(s.iteratorExpr);
WStatements body = transformStatements(s.statementsBlock());
if (s.iterStyle.getType() == JurstParser.IN) {
Expand Down
12 changes: 6 additions & 6 deletions ...cript/src/main/java/de/peeeq/wurstscript/parser/antlr/AntlrWurstParseTreeTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -946,8 +946,8 @@ private WStatement transformForLoop(StmtForLoopContext s) {

private WStatement transformForRangeLoop(ForRangeLoopContext s) {
WPos source = source(s);
LocalVarDef loopVar = transformLocalVarDef(s.loopVar);
loopVar.setInitialExpr(transformExpr(s.start));
Expr start = transformExpr(s.start);
LocalVarDef loopVar = transformLocalVarDef(s.loopVar, start);
Expr to = transformExpr(s.end);
Expr step;
if (s.step == null) {
Expand All @@ -964,17 +964,17 @@ private WStatement transformForRangeLoop(ForRangeLoopContext s) {
throw error(s, "not implemented: " + text(s));
}

private LocalVarDef transformLocalVarDef(LocalVarDefInlineContext v) {
Modifiers modifiers = Ast.Modifiers();
private LocalVarDef transformLocalVarDef(LocalVarDefInlineContext v, OptExpr initialExpr) {
// Loop variables behave like let-variables for user code.
Modifiers modifiers = Ast.Modifiers(Ast.ModConstant(source(v)));
Comment thread
Frotty marked this conversation as resolved.
Outdated
OptTypeExpr optTyp = transformOptionalType(v.typeExpr());
Identifier name = text(v.name);
OptExpr initialExpr = Ast.NoExpr();
return Ast.LocalVarDef(source(v), modifiers, optTyp, name, initialExpr);
}

private WStatement transformForIteratorLoop(ForIteratorLoopContext s) {
WPos source = source(s);
LocalVarDef loopVar = transformLocalVarDef(s.loopVar);
LocalVarDef loopVar = transformLocalVarDef(s.loopVar, Ast.NoExpr());
Expr in = transformExpr(s.iteratorExpr);
WStatements body = transformStatements(s.statementsBlock());
if (s.iterStyle.getType() == WurstParser.IN) {
Expand Down
31 changes: 31 additions & 0 deletions de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/BugTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,6 +898,37 @@ public void unreadVarWarning3() { // #380
);
}

@Test
public void forRangeStartReadsParameter() {
CompilationResult result = test()
.setStopOnFirstError(false)
.executeProg(false)
.lines(
"package test",
"function foo(int bar)",
" for i = bar to 10",
" skip",
"endpackage"
);

Assert.assertTrue(
result.getGui().getWarningList().stream()
.noneMatch(w -> w.getMessage().contains("The parameter bar is never read")),
"Unexpected unused warning for parameter bar: " + result.getGui().getWarningList()
);
}

@Test
public void forRangeLoopVarIsImmutable() {
testAssertErrorsLines(false, "Cannot assign a new value to constant",
"package test",
"init",
" int stackPointer = 3",
" for i = 0 to stackPointer",
" i--",
"endpackage");
}


@Test
public void unreadVarWarningArrays() { // #813
Expand Down
Loading