more compiletime impls

Frotty · Frotty · commit 44dd2966a4a9 · 2026-04-09T23:29:43.000+02:00
diff --git a/de.peeeq.wurstscript/build.gradle b/de.peeeq.wurstscript/build.gradle
@@ -291,11 +291,17 @@ shadowJar {
 def fatJar = shadowJar.archiveFile.map { it.asFile }
 
 tasks.register('make_for_userdir', Copy) {
-    dependsOn 'shadowJar'
+    dependsOn 'shadowJar', 'make_for_userdir_wurst_compiler'
     from fatJar
     into "${System.properties['user.home']}/.wurst/"
 }
 
+tasks.register('make_for_userdir_wurst_compiler', Copy) {
+    dependsOn 'shadowJar'
+    from fatJar
+    into "${System.properties['user.home']}/.wurst/wurst-compiler/"
+}
+
 tasks.register('make_for_wurstpack', Copy) {
     dependsOn 'shadowJar'
     from fatJar
diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/CompilationProcess.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/CompilationProcess.java
@@ -82,7 +82,7 @@ public CompilationProcess(WurstGui gui, RunArgs runArgs) {
 
         if (runArgs.isRunTests()) {
             timeTaker.measure("Run tests",
-                    () -> runTests(compiler.getImTranslator(), compiler, runArgs.getTestTimeout()));
+                    () -> runTests(compiler.getImTranslator(), compiler, runArgs.getTestTimeout(), runArgs.getTestFilter()));
         }
 
         timeTaker.measure("Run compiletime functions", () ->compiler.runCompiletime(new WurstProjectConfigData(), isProd, false));
@@ -153,12 +153,12 @@ private File writeMapscript(CharSequence mapScript) {
         }
     }
 
-    private void runTests(ImTranslator translator, WurstCompilerJassImpl compiler, int testTimeout) {
+    private void runTests(ImTranslator translator, WurstCompilerJassImpl compiler, int testTimeout, Optional<String> testFilter) {
         PrintStream out = System.out;
         // tests
         gui.sendProgress("Running tests");
         System.out.println("Running tests");
-        RunTests runTests = new RunTests(Optional.empty(), 0, 0, Optional.empty(), testTimeout) {
+        RunTests runTests = new RunTests(Optional.empty(), 0, 0, Optional.empty(), testTimeout, testFilter) {
             @Override
             protected void print(String message) {
                 out.print(message);
diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/ReflectionNativeProvider.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/ReflectionNativeProvider.java
@@ -16,6 +16,7 @@ public class ReflectionNativeProvider implements NativesProvider {
     private final HashMap<String, NativeJassFunction> methodMap = new HashMap<>();
 
     public ReflectionNativeProvider(AbstractInterpreter interpreter) {
+        addProvider(new AbilityProvider(interpreter));
         addProvider(new GamecacheProvider(interpreter));
         addProvider(new ForceProvider(interpreter));
         addProvider(new HandleProvider(interpreter));
diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/mocks/PlayerMock.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/mocks/PlayerMock.java
@@ -4,9 +4,12 @@
 import de.peeeq.wurstscript.intermediatelang.ILconstInt;
 import de.peeeq.wurstscript.intermediatelang.ILconstNull;
 
+import java.util.HashMap;
+
 public class PlayerMock {
     public final ILconstInt id;
     public ILconst playerColor = ILconstNull.instance();
+    public final HashMap<Integer, ILconstInt> techMaxAllowed = new HashMap<>();
 
     public PlayerMock(ILconstInt p) {
         this.id = p;
diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/providers/AbilityProvider.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/providers/AbilityProvider.java
@@ -0,0 +1,19 @@
+package de.peeeq.wurstio.jassinterpreter.providers;
+
+import de.peeeq.wurstscript.intermediatelang.ILconstInt;
+import de.peeeq.wurstscript.intermediatelang.ILconstString;
+import de.peeeq.wurstscript.intermediatelang.interpreter.AbstractInterpreter;
+
+public class AbilityProvider extends Provider {
+    public AbilityProvider(AbstractInterpreter interpreter) {
+        super(interpreter);
+    }
+
+    public ILconstString BlzGetAbilityIcon(ILconstInt abilCode) {
+        return new ILconstString("");
+    }
+
+    public ILconstString BlzGetAbilityExtendedTooltip(ILconstInt abilCode, ILconstInt level) {
+        return new ILconstString("");
+    }
+}
diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/providers/ConversionProvider.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/providers/ConversionProvider.java
@@ -47,6 +47,14 @@ public IlConstHandle ConvertUnitState(ILconstInt i) {
         return new IlConstHandle("unitstate" + i, new LinkedHashSet<>());
     }
 
+    public IlConstHandle ConvertUnitIntegerField(ILconstInt i) {
+        return new IlConstHandle("unitintegerfield" + i, i.getVal());
+    }
+
+    public IlConstHandle ConvertUnitWeaponIntegerField(ILconstInt i) {
+        return new IlConstHandle("unitweaponintegerfield" + i, i.getVal());
+    }
+
     public IlConstHandle ConvertAIDifficulty(ILconstInt i) {
         return new IlConstHandle("aidifficulty" + i, new LinkedHashSet<>());
     }
diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/providers/ForceProvider.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/providers/ForceProvider.java
@@ -33,6 +33,9 @@ public void ForceClear(IlConstHandle force) {
     }
 
     public ILconstBool IsPlayerInForce(IlConstHandle player, IlConstHandle force) {
+        if (player == null || force == null) {
+            return ILconstBool.FALSE;
+        }
         LinkedHashSet<IlConstHandle> forceList = (LinkedHashSet<IlConstHandle>) force.getObj();
         return ILconstBool.instance(forceList.contains(player));
     }
diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/providers/OutputProvider.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/providers/OutputProvider.java
@@ -18,6 +18,18 @@ public OutputProvider(AbstractInterpreter interpreter) {
         super(interpreter);
     }
 
+    public void DisplayTextToForce(IlConstHandle force, ILconstString msg) {
+        outStream.println(msg.getVal());
+    }
+
+    public void DisplayTimedTextToForce(IlConstHandle force, ILconstReal duration, ILconstString msg) {
+        outStream.println(msg.getVal());
+    }
+
+    public void DisplayTextToPlayer(IlConstHandle player, ILconstReal x, ILconstReal y, ILconstString msg) {
+        outStream.println(msg.getVal());
+    }
+
     public void DisplayTimedTextToPlayer(IlConstHandle player, ILconstReal x, ILconstReal y, ILconstReal duration, ILconstString msg) {
         outStream.println(msg.getVal());
     }
diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/providers/PlayerProvider.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/providers/PlayerProvider.java
@@ -35,7 +35,7 @@ public ILconstInt GetPlayerNeutralAggressive() {
 
 
     public IlConstHandle GetLocalPlayer() {
-        return new IlConstHandle("Local Player", "local player");
+        return Player(ILconstInt.create(0));
     }
 
     public ILconstInt GetBJMaxPlayerSlots() {
@@ -53,4 +53,12 @@ public void SetPlayerColor(IlConstHandle player, IlConstHandle playercolor) {
     public ILconst GetPlayerColor(IlConstHandle player) {
         return ((PlayerMock) player.getObj()).playerColor;
     }
+
+    public void SetPlayerTechMaxAllowed(IlConstHandle player, ILconstInt techid, ILconstInt maximum) {
+        ((PlayerMock) player.getObj()).techMaxAllowed.put(techid.getVal(), maximum);
+    }
+
+    public ILconstInt GetPlayerTechMaxAllowed(IlConstHandle player, ILconstInt techid) {
+        return ((PlayerMock) player.getObj()).techMaxAllowed.getOrDefault(techid.getVal(), ILconstInt.create(0));
+    }
 }
diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/providers/UnitProvider.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/providers/UnitProvider.java
@@ -1,8 +1,11 @@
 package de.peeeq.wurstio.jassinterpreter.providers;
 
+import de.peeeq.wurstio.objectreader.ObjectHelper;
 import de.peeeq.wurstio.jassinterpreter.mocks.UnitMock;
+import de.peeeq.wurstscript.intermediatelang.ILconstBool;
 import de.peeeq.wurstscript.intermediatelang.ILconstInt;
 import de.peeeq.wurstscript.intermediatelang.ILconstReal;
+import de.peeeq.wurstscript.intermediatelang.ILconstString;
 import de.peeeq.wurstscript.intermediatelang.IlConstHandle;
 import de.peeeq.wurstscript.intermediatelang.interpreter.AbstractInterpreter;
 
@@ -23,11 +26,58 @@ public ILconstInt GetUnitTypeId(IlConstHandle unit) {
         return ((UnitMock)unit.getObj()).unitid;
     }
 
+    public ILconstString GetUnitName(IlConstHandle unit) {
+        if (unit == null) {
+            return new ILconstString("");
+        }
+        UnitMock unitMock = (UnitMock) unit.getObj();
+        return new ILconstString(ObjectHelper.objectIdIntToString(unitMock.unitid.getVal()));
+    }
+
+    public ILconstInt GetUnitGoldCost(ILconstInt unitid) {
+        return ILconstInt.create(0);
+    }
+
+    public ILconstInt GetUnitWoodCost(ILconstInt unitid) {
+        return ILconstInt.create(0);
+    }
+
+    public ILconstInt GetUnitPointValueByType(ILconstInt unitid) {
+        return ILconstInt.create(0);
+    }
+
+    public ILconstInt GetFoodUsed(ILconstInt unitid) {
+        return ILconstInt.create(0);
+    }
+
+    public ILconstInt GetUnitBuildTime(ILconstInt unitid) {
+        return ILconstInt.create(0);
+    }
+
+    public ILconstInt BlzGetUnitIntegerField(IlConstHandle whichUnit, IlConstHandle whichField) {
+        return ILconstInt.create(0);
+    }
+
+    public ILconstInt BlzGetUnitWeaponIntegerField(IlConstHandle whichUnit, IlConstHandle whichField, ILconstInt index) {
+        return ILconstInt.create(0);
+    }
+
+    public ILconstBool IsUnitType(IlConstHandle whichUnit, IlConstHandle whichUnitType) {
+        return ILconstBool.FALSE;
+    }
+
+    public void RemoveUnit(IlConstHandle unit) {
+        userDataMap.remove(unit);
+    }
+
     public ILconstInt GetUnitUserData(IlConstHandle unit) {
-        return userDataMap.get(unit);
+        return unit == null ? ILconstInt.create(0) : userDataMap.getOrDefault(unit, ILconstInt.create(0));
     }
 
     public void SetUnitUserData(IlConstHandle unit, ILconstInt userData) {
+        if (unit == null) {
+            return;
+        }
         userDataMap.put(unit, userData);
     }
 }
diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/RunTests.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/RunTests.java
@@ -22,6 +22,7 @@
 import de.peeeq.wurstscript.jassIm.ImProg;
 import de.peeeq.wurstscript.jassinterpreter.TestFailException;
 import de.peeeq.wurstscript.jassinterpreter.TestSuccessException;
+import de.peeeq.wurstscript.parser.WPos;
 import de.peeeq.wurstscript.translation.imtranslation.FunctionFlagEnum;
 import de.peeeq.wurstscript.translation.imtranslation.ImTranslator;
 import de.peeeq.wurstscript.utils.Utils;
@@ -45,6 +46,7 @@ public class RunTests extends UserRequest<Object> {
     private final int column;
     private final Optional<String> testName;
     private final int timeoutSeconds;
+    private final Optional<String> testFilter;
 
     private final List<ImFunction> successTests = Lists.newArrayList();
     private final List<TestFailure> failTests = Lists.newArrayList();
@@ -88,15 +90,20 @@ public String getMessageWithStackFrame() {
     }
 
     public RunTests(Optional<String> filename, int line, int column, Optional<String> testName) {
-        this(filename, line, column, testName, 20);
+        this(filename, line, column, testName, 20, Optional.empty());
     }
 
     public RunTests(Optional<String> filename, int line, int column, Optional<String> testName, int timeoutSeconds) {
+        this(filename, line, column, testName, timeoutSeconds, Optional.empty());
+    }
+
+    public RunTests(Optional<String> filename, int line, int column, Optional<String> testName, int timeoutSeconds, Optional<String> testFilter) {
         this.filename = filename.map(WFile::create);
         this.line = line;
         this.column = column;
         this.testName = testName;
         this.timeoutSeconds = timeoutSeconds;
+        this.testFilter = testFilter;
     }
 
 
@@ -176,6 +183,27 @@ public TestResult runTests(ImTranslator translator, ImProg imProg, Optional<Func
 
         WLogger.info("Ran compiletime functions");
 
+        if (testFilter.isPresent()) {
+            List<String> matched = new java.util.ArrayList<>();
+            for (ImFunction f : imProg.getFunctions()) {
+                if (f.hasFlag(FunctionFlagEnum.IS_TEST)) {
+                    String packageName = f.attrTrace().attrNearestPackage().tryGetNameDef().getName();
+                    String qualifiedName = packageName + "." + f.getName();
+                    if (qualifiedName.toLowerCase().contains(testFilter.get().toLowerCase())) {
+                        matched.add(qualifiedName);
+                    }
+                }
+            }
+            if (matched.isEmpty()) {
+                println("No tests match filter '" + testFilter.get() + "'.");
+            } else {
+                println("Filter '" + testFilter.get() + "' matched " + matched.size() + " test(s):");
+                for (String name : matched) {
+                    println("  " + name);
+                }
+            }
+        }
+
         // Use try-with-resources for automatic cleanup
         try (ScheduledExecutorService testScheduler = Executors.newSingleThreadScheduledExecutor()) {
 
@@ -189,9 +217,17 @@ public TestResult runTests(ImTranslator translator, ImProg imProg, Optional<Func
                     if (funcToTest.isPresent() && trace != funcToTest.get()) {
                         continue;
                     }
+                    if (testFilter.isPresent()) {
+                        String packageName = f.attrTrace().attrNearestPackage().tryGetNameDef().getName();
+                        String qualifiedName = packageName + "." + f.getName();
+                        if (!qualifiedName.toLowerCase().contains(testFilter.get().toLowerCase())) {
+                            continue;
+                        }
+                    }
 
-                    String message = "Running <" + f.attrTrace().attrNearestPackage().tryGetNameDef().getName() + ":"
-                        + f.attrTrace().attrErrorPos().getLine() + " - " + f.getName() + ">..";
+                    WPos source = f.attrTrace().attrSource();
+                    String file = new File(source.getFile()).toPath().normalize().toString();
+                    String message = "Running " + file + ":" + source.getLine() + " - " + f.getName() + "..";
                     println(message);
                     WLogger.info(message);
 
diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/RunArgs.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/RunArgs.java
@@ -6,6 +6,7 @@
 import java.io.File;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
@@ -22,6 +23,7 @@ public class RunArgs {
     private @Nullable String workspaceroot = null;
     private @Nullable String inputmap = null;
     private @Nullable int testTimeout = 20;
+    private @Nullable String testFilter = null;
     private final List<RunOption> options = Lists.newArrayList();
     private final List<File> libDirs = Lists.newArrayList();
     private final RunOption optionHelp;
@@ -88,6 +90,7 @@ public RunArgs(String... args) {
         // interpreter
         optionRuntests = addOption("runtests", "Run all test functions found in the scripts.");
         optionTestTimeout = addOptionWithArg("testTimeout", "Timeout in seconds after which tests will be cancelled and considered failed, if they did not yet succeed.", arg -> testTimeout = Integer.parseInt(arg));
+        addOptionWithArg("testFilter", "Only run tests whose qualified name (Package.function) contains this string (case-insensitive).", arg -> testFilter = arg);
         optionRunCompileTimeFunctions = addOption("runcompiletimefunctions", "Run all compiletime functions found in the scripts.");
         optionInjectCompiletimeObjects = addOption("injectobjects", "Injects the objects generated by compiletime functions into the map.");
         // optimization
@@ -346,6 +349,10 @@ public int getTestTimeout() {
         return testTimeout;
     }
 
+    public Optional<String> getTestFilter() {
+        return Optional.ofNullable(testFilter);
+    }
+
     public boolean isMeasureTimes() {
         return optionMeasureTimes.isSet;
     }
diff --git a/de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/InterpreterTests.java b/de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/InterpreterTests.java
@@ -51,4 +51,54 @@ public void arrayDefault() {
         );
     }
 
+    @Test
+    public void displayNativesAcceptNullForceAndLocalPlayer() {
+        test().withStdLib().executeProg(true).testLua(false).lines(
+            "package Test",
+            "init",
+            "    DisplayTextToForce(null, \"force\")",
+            "    DisplayTimedTextToForce(null, 1.0, \"timed force\")",
+            "    DisplayTextToPlayer(GetLocalPlayer(), 0.0, 0.0, \"player\")",
+            "    DisplayTimedTextToPlayer(GetLocalPlayer(), 0.0, 0.0, 1.0, \"timed player\")",
+            "    if GetPlayerId(GetLocalPlayer()) == 0",
+            "        testSuccess()"
+        );
+    }
+
+    @Test
+    public void setPlayerTechMaxAllowed() {
+        test().withStdLib().executeProg(true).testLua(false).lines(
+            "package Test",
+            "init",
+            "    SetPlayerTechMaxAllowed(Player(0), 'hfoo', 3)",
+            "    if GetPlayerTechMaxAllowed(Player(0), 'hfoo') == 3",
+            "        testSuccess()"
+        );
+    }
+
+    @Test
+    public void unitAndAbilityInfoNatives() {
+        test().withStdLib().executeProg(true).testLua(false).lines(
+            "package Test",
+            "native GetUnitBuildTime(integer unitid) returns integer",
+            "init",
+            "    let u = CreateUnit(Player(0), 'hfoo', 0.0, 0.0, 0.0)",
+            "    RemoveUnit(u)",
+            "    if GetUnitName(u) == \"hfoo\"",
+            "        if GetUnitUserData(u) == 0",
+            "            if GetUnitUserData(null) == 0",
+            "                if GetUnitGoldCost('hfoo') == 0",
+            "                    if GetUnitWoodCost('hfoo') == 0",
+            "                        if GetUnitPointValueByType('hfoo') == 0",
+            "                            if GetFoodUsed('hfoo') == 0",
+            "                                if GetUnitBuildTime('hfoo') == 0",
+            "                                    if BlzGetAbilityIcon('AHbz') == \"\"",
+            "                                        if BlzGetAbilityExtendedTooltip('AHbz', 1) == \"\"",
+            "                                            if BlzGetUnitIntegerField(u, ConvertUnitIntegerField('ubui')) == 0",
+            "                                                if BlzGetUnitWeaponIntegerField(u, ConvertUnitWeaponIntegerField('ua1b'), 0) == 0",
+            "                                                    if not IsUnitType(u, ConvertUnitType(3))",
+            "                                                        testSuccess()"
+        );
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,14 @@ public IlConstHandle ConvertUnitState(ILconstInt i) {`
`47`	`47`	`return new IlConstHandle("unitstate" + i, new LinkedHashSet<>());`
`48`	`48`	`}`
`49`	`49`
	`50`	`+ public IlConstHandle ConvertUnitIntegerField(ILconstInt i) {`
	`51`	`+ return new IlConstHandle("unitintegerfield" + i, i.getVal());`
	`52`	`+ }`
	`53`	`+`
	`54`	`+ public IlConstHandle ConvertUnitWeaponIntegerField(ILconstInt i) {`
	`55`	`+ return new IlConstHandle("unitweaponintegerfield" + i, i.getVal());`
	`56`	`+ }`
	`57`	`+`
`50`	`58`	`public IlConstHandle ConvertAIDifficulty(ILconstInt i) {`
`51`	`59`	`return new IlConstHandle("aidifficulty" + i, new LinkedHashSet<>());`
`52`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,9 @@ public void ForceClear(IlConstHandle force) {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public ILconstBool IsPlayerInForce(IlConstHandle player, IlConstHandle force) {`
	`36`	`+ if (player == null \|\| force == null) {`
	`37`	`+ return ILconstBool.FALSE;`
	`38`	`+ }`
`36`	`39`	`LinkedHashSet<IlConstHandle> forceList = (LinkedHashSet<IlConstHandle>) force.getObj();`
`37`	`40`	`return ILconstBool.instance(forceList.contains(player));`
`38`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public ILconstInt GetPlayerNeutralAggressive() {`
`35`	`35`
`36`	`36`
`37`	`37`	`public IlConstHandle GetLocalPlayer() {`
`38`		`- return new IlConstHandle("Local Player", "local player");`
	`38`	`+ return Player(ILconstInt.create(0));`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public ILconstInt GetBJMaxPlayerSlots() {`
`@@ -53,4 +53,12 @@ public void SetPlayerColor(IlConstHandle player, IlConstHandle playercolor) {`
`53`	`53`	`public ILconst GetPlayerColor(IlConstHandle player) {`
`54`	`54`	`return ((PlayerMock) player.getObj()).playerColor;`
`55`	`55`	`}`
	`56`	`+`
	`57`	`+ public void SetPlayerTechMaxAllowed(IlConstHandle player, ILconstInt techid, ILconstInt maximum) {`
	`58`	`+ ((PlayerMock) player.getObj()).techMaxAllowed.put(techid.getVal(), maximum);`
	`59`	`+ }`
	`60`	`+`
	`61`	`+ public ILconstInt GetPlayerTechMaxAllowed(IlConstHandle player, ILconstInt techid) {`
	`62`	`+ return ((PlayerMock) player.getObj()).techMaxAllowed.getOrDefault(techid.getVal(), ILconstInt.create(0));`
	`63`	`+ }`
`56`	`64`	`}`