fix build

Author: Frotty

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/WurstCompilerJassImpl.java

@@ -394,7 +394,7 @@ public JassProg transformProgToJass() {
         // eliminate
         beginPhase(2, "Eliminate generics");
         new EliminateGenerics(imTranslator2, imProg2).transform();
-        imTranslator2.clearClassManagementVars();
+        imTranslator2.clearStaleClassManagementVars();
         printDebugImProg("./test-output/im " + stage++ + "_genericsEliminated.im");
         timeTaker.endPhase();
         // eliminate classes

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/translation/imtranslation/ImTranslator.java

@@ -2102,29 +2102,21 @@ public Map<ImClass, ClassManagementVars> getClassManagementVars() {
         return classManagementVars;
     }
 
-    public void clearClassManagementVars() {
+    public void clearStaleClassManagementVars() {
         if (classManagementVars == null) {
             return;
         }
-        Set<ClassManagementVars> oldVars = Collections.newSetFromMap(new IdentityHashMap<>());
-        oldVars.addAll(classManagementVars.values());
-        for (ClassManagementVars vars : oldVars) {
-            removeClassManagementVar(vars.free);
-            removeClassManagementVar(vars.freeCount);
-            removeClassManagementVar(vars.maxIndex);
-            removeClassManagementVar(vars.typeId);
+        if (classManagementVars.keySet().stream().anyMatch(c -> !imProg.getClasses().contains(c))
+                || classManagementVars.values().stream().anyMatch(this::hasStaleClassManagementVars)) {
+            classManagementVars = null;
         }
-        classManagementVars = null;
     }
 
-    private void removeClassManagementVar(ImVar var) {
-        imProg.getGlobals().remove(var);
-        List<ImSet> inits = imProg.getGlobalInits().remove(var);
-        if (inits != null) {
-            for (ImSet init : inits) {
-                init.replaceBy(ImHelper.nullExpr());
-            }
-        }
+    private boolean hasStaleClassManagementVars(ClassManagementVars vars) {
+        return !imProg.getGlobals().contains(vars.free)
+            || !imProg.getGlobals().contains(vars.freeCount)
+            || !imProg.getGlobals().contains(vars.maxIndex)
+            || !imProg.getGlobals().contains(vars.typeId);
     }
 
     private Partitions<ImClass> buildClassPartitions() {

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/translation/imtranslation/UsedVariables.java

@@ -64,10 +64,8 @@ private void handleLExprReads(ImLExpr expr) {
             if (expr instanceof ImVarAccess) {
                 // Write only, skip
             } else if (expr instanceof ImMemberAccess) {
-                result.add(((ImMemberAccess) expr).getVar());
                 ((ImMemberAccess) expr).getReceiver().accept(this);
             } else if (expr instanceof ImVarArrayAccess) {
-                result.add(((ImVarArrayAccess) expr).getVar());
                 ((ImVarArrayAccess) expr).getIndexes().accept(this);
             } else if (expr instanceof ImTupleSelection) {
                 handleLExprReads((ImLExpr) ((ImTupleSelection) expr).getTupleExpr());