Skip to content

Allow nested generic specialization keys #1266

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 11 commits into from
Aug 29, 2026
Merged

Allow nested generic specialization keys #1266

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fa0eba3
Allow nested generic specialization keys
Frotty Aug 29, 2026
15c16ef
Normalize nested specialization bindings
Frotty Aug 29, 2026
214566c
Isolate Lua generic static storage
Frotty Aug 29, 2026
d181a14
Track erased generic static ownership
Frotty Aug 29, 2026
94adc34
Materialize statics for erased instantiations
Frotty Aug 29, 2026
48c2f77
Preserve generic static initializer order
Frotty Aug 29, 2026
9861d7a
Specialize static-owning generic factories
Frotty Aug 29, 2026
bd05ff7
Handle inherited generic static storage
Frotty Aug 29, 2026
408e1c9
Register erased generic helper statics
Frotty Aug 29, 2026
cdc2a90
Collect fixed generic method operations
Frotty Aug 29, 2026
5d41865
Preserve implicit generic reachability
Frotty Aug 29, 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
4 changes: 0 additions & 4 deletions ...urstscript/src/main/java/de/peeeq/wurstscript/translation/imtranslation/GenericTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package de.peeeq.wurstscript.translation.imtranslation;

import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import de.peeeq.wurstscript.jassIm.*;

Expand All @@ -16,9 +15,6 @@ class GenericTypes {


public GenericTypes(List<ImTypeArgument> typeArguments) {
for (ImTypeArgument ta : typeArguments) {
Preconditions.checkArgument(!EliminateGenerics.isGenericType(ta.getType()), "Type arguments must not be generic: " + typeArguments);
}
this.typeArguments = ImmutableList.copyOf(typeArguments);
Comment thread
Frotty marked this conversation as resolved.
}

Expand Down
216 changes: 216 additions & 0 deletions de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/LuaBackendAuditTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,6 +934,222 @@ public void tupleSpecializedInterfaceDispatchDoesNotRootErasedStaticInitializer(
);
}

@Test
public void nestedConcreteGenericStaticStorageCompilesInLua() {
test().testLua(true).executeProg().lines(
"package Test",
"native testSuccess()",
"tuple pair(int x, int y)",
"class List<T:>",
" static T array store",
" int size",
" construct()",
" function add(T value)",
" store[size] = value",
" size++",
" function get(int index) returns T",
" return store[index]",
"class Item",
" int value",
" construct(int value)",
" this.value = value",
"init",
" let nested = new List<List<Item>>()",
" nested.add(new List<Item>())",
" nested.get(0).add(new Item(7))",
" let pairs = new List<pair>()",
" pairs.add(pair(2, 3))",
" if nested.get(0).get(0).value == 7 and pairs.get(0).x == 2",
" testSuccess()"
);
}

@Test
public void randomizedNestedGenericTupleClassShapesMatchAllBackends() {
record Shape(String type, String value, int constructions) {}

Random random = new Random(0x6E3571A9L);
List<String> declarations = new ArrayList<>();
List<Shape> shapes = new ArrayList<>();
for (int i = 0; i < 18; i++) {
int first = random.nextInt(17) + 1;
int second = random.nextInt(17) + 1;
Shape shape = i % 2 == 0
? new Shape("int", Integer.toString(first), 0)
: new Shape("pair", "pair(" + first + ", " + second + ")",
0);
int depth = 2 + random.nextInt(3);
for (int d = 0; d < depth; d++) {
switch ((i + d + random.nextInt(3)) % 3) {
case 0 -> shape = new Shape("Box<" + shape.type() + ">",
"new Box<" + shape.type() + ">(" + shape.value() + ")",
shape.constructions() + 1);
case 1 -> shape = new Shape("Child<" + shape.type() + ">",
"new Child<" + shape.type() + ">(" + shape.value() + ")",
shape.constructions() + 1);
case 2 -> {
String tupleName = "Wrapped" + i + "_" + d;
int tag = random.nextInt(11) + 1;
declarations.add("tuple " + tupleName + "(" + shape.type()
+ " value, int tag)");
shape = new Shape(tupleName,
tupleName + "(" + shape.value() + ", " + tag + ")",
shape.constructions());
}
}
}
shapes.add(shape);
}

List<String> source = new ArrayList<>();
source.add("package Test");
source.add("native testSuccess()");
source.add("tuple pair(int x, int y)");
source.add("int constructions");
source.add("int writes");
source.add("interface Marker<T:>");
source.add("class Box<T:> implements Marker<T>");
source.add(" T value");
source.add(" construct(T value)");
source.add(" this.value = value");
source.add(" constructions++");
source.add("class Child<T:> extends Box<T>");
source.add(" construct(T value)");
source.add(" super(value)");
source.add("class Vault<T:>");
source.add(" static T value");
source.add(" static function set(T newValue)");
source.add(" value = newValue");
source.add(" writes++");
source.addAll(declarations);
source.add("init");
int expectedConstructions = 0;
for (Shape shape : shapes) {
source.add(" Vault<" + shape.type() + ">.set(" + shape.value() + ")");
expectedConstructions += shape.constructions();
}
source.add(" if writes == " + shapes.size()
+ " and constructions == " + expectedConstructions);
source.add(" testSuccess()");

test().testLua(true).executeProg().lines(source.toArray(new String[0]));
Comment thread
Frotty marked this conversation as resolved.
}

@Test
public void randomizedClassInterfaceModuleDispatchMatchesAllBackends() {
Random random = new Random(0xD15A7C4L);
List<String> source = new ArrayList<>();
Collections.addAll(source,
"package Test",
"native testSuccess()",
"int destroyed",
"interface Primary",
" function score() returns int",
"interface Secondary",
" function bonus() returns int",
"module Payload",
" int moduleValue",
" function payload() returns int",
" return moduleValue * 3",
" ondestroy",
" destroyed++",
"class Root implements Primary",
" use Payload",
" int base",
" construct(int base)",
" this.base = base",
" moduleValue = base + 1",
" override function score() returns int",
" return base + payload()",
"class Alpha extends Root implements Secondary",
" construct(int base)",
" super(base)",
" override function score() returns int",
" return super.score() + 11",
" override function bonus() returns int",
" return base * 5 + 1",
"class AlphaLeaf extends Alpha",
" construct(int base)",
" super(base)",
" override function score() returns int",
" return super.score() * 2",
" override function bonus() returns int",
" return super.bonus() + 5",
"class Beta extends Root implements Secondary",
" construct(int base)",
" super(base)",
" override function score() returns int",
" return super.score() - 7",
" override function bonus() returns int",
" return base * 7 + 2",
"module ScoreContract",
" abstract function score() returns int",
"module StandaloneScore",
" use ScoreContract",
" use Payload",
" override function score() returns int",
" return moduleValue * 9 + 4",
"class ModuleOnly implements Primary",
" use StandaloneScore",
" construct(int base)",
" moduleValue = base",
"function viaPrimary(Primary value) returns int",
" return value.score()",
"function viaSecondary(Secondary value) returns int",
" return value.bonus()",
"init",
" int checksum = 0");

int expected = 0;
int objectCount = 40;
for (int i = 0; i < objectCount; i++) {
int value = random.nextInt(30) + 1;
int kind = random.nextInt(5);
String className;
int score;
Integer bonus = null;
switch (kind) {
case 0 -> {
className = "Root";
score = 4 * value + 3;
}
case 1 -> {
className = "Alpha";
score = 4 * value + 14;
bonus = value * 5 + 1;
}
case 2 -> {
className = "AlphaLeaf";
score = (4 * value + 14) * 2;
bonus = value * 5 + 6;
}
case 3 -> {
className = "Beta";
score = 4 * value - 4;
bonus = value * 7 + 2;
}
default -> {
className = "ModuleOnly";
score = value * 9 + 4;
}
}
source.add(" let object" + i + " = new " + className + "(" + value + ")");
source.add(" Primary primary" + i + " = object" + i);
source.add(" checksum += viaPrimary(primary" + i + ")");
expected += score;
if (bonus != null) {
source.add(" Secondary secondary" + i + " = object" + i);
source.add(" checksum += viaSecondary(secondary" + i + ")");
expected += bonus;
}
source.add(" destroy object" + i);
}
source.add(" if checksum == " + expected + " and destroyed == " + objectCount);
source.add(" testSuccess()");

test().testLua(true).executeProg().lines(source.toArray(new String[0]));
}

@Test
public void tupleSpecializedStaticInitializerCycleDoesNotRootErasedCopy() throws IOException {
test().testLua(true).executeProg().lines(
Expand Down
Loading