Skip to content

Fix jass string null translation #1110

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
merged 1 commit into from
Nov 13, 2025
Merged

Fix jass string null translation #1110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ....wurstscript/src/main/java/de/peeeq/wurstscript/translation/imtojass/ExprTranslation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public static JassExpr translate(ImNull e, ImToJassTranslator translator) {
} else if (typename.equals("boolean") || typename.equals("bool")) {
return JassExprBoolVal(false);
} else if (typename.equals("string")) {
return JassExprStringVal("");
return JassExprNull();
}
}

Expand Down
40 changes: 40 additions & 0 deletions de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/JurstTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import java.util.Collections;
import java.util.Map;

import static org.testng.AssertJUnit.assertFalse;
import static org.testng.AssertJUnit.assertTrue;

public class JurstTests extends WurstScriptTest {
Expand Down Expand Up @@ -340,6 +341,45 @@ public void testKeepTRVEHooked() throws IOException {
assertTrue(output.contains("real myVar"));
}

@Test
public void testStringNullCheckStaysNull() throws IOException {
String jassCode = Utils.string(
"globals",
" string array s__SaveCodes",
" integer PID",
" integer unitSaveID",
"endglobals",
"",
"function main takes nothing returns nothing",
" if s__SaveCodes[PID * 19 + unitSaveID] != null then",
" call BJDebugMsg(\"\")", // could be anything
" endif",
"endfunction"
);

String jurstCode = Utils.string(
"package test",
"endpackage"
);

testJurstWithJass(false, true, jassCode, jurstCode);

File out = new File("./test-output/JurstJassTest_inlopt.j");
String output = com.google.common.io.Files.toString(out, Charsets.UTF_8);

// Ensure the null check survives as a null check
assertTrue(
"Expected string null check to stay != null",
output.contains("s__SaveCodes[PID * 19 + unitSaveID] != null")
);

// And make sure we did NOT silently change it to empty string
assertFalse(
"String null check must not become != \"\"",
output.contains("s__SaveCodes[PID * 19 + unitSaveID] != \"\"")
);
}

private void testJurstWithJass(boolean executeProg, boolean withStdLib, String jass, String jurst) {
Map<String, String> inputs = ImmutableMap.of(
"example.j", jass,
Expand Down
Loading