more opts

Author: Frotty

de.peeeq.wurstscript/build.gradle

@@ -106,7 +106,7 @@ dependencies {
     implementation 'commons-lang:commons-lang:2.6'
     implementation 'com.github.albfernandez:juniversalchardet:2.4.0'
     implementation 'com.github.inwc3:jmpq3:29b55f2c32'
-    implementation 'com.github.inwc3:wc3libs:bab65b961b'
+    implementation 'com.github.inwc3:wc3libs:cc49c8e63c'
     implementation('com.github.wurstscript:wurstsetup:393cf5ea39') {
         exclude group: 'org.eclipse.jgit', module: 'org.eclipse.jgit'
         exclude group: 'org.eclipse.jgit', module: 'org.eclipse.jgit.ssh.apache'

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

@@ -551,7 +551,7 @@ private void executeCompiletimeFunction(ImFunction f) {
                 if (!f.getBody().isEmpty()) {
                     interpreter.getGlobalState().setLastStatement(f.getBody().get(0));
                 }
-                WLogger.debug("running " + functionFlag + " function " + f.getName());
+                WLogger.debug(() -> "running " + functionFlag + " function " + f.getName());
                 interpreter.runVoidFunc(f, null);
                 successTests.add(f);
             } catch (TestSuccessException e) {

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

@@ -535,12 +535,14 @@ public JassProg transformProgToJass() {
         }
 
         beginPhase(13, "flatten");
-        optimizer.removeGarbage();
+        boolean garbageChanged = optimizer.removeGarbage();
         imProg.flatten(imTranslator);
 
         // Re-run to avoid #883
-        optimizer.removeGarbage();
-        imProg.flatten(imTranslator);
+        if (garbageChanged) {
+            optimizer.removeGarbage();
+            imProg.flatten(imTranslator);
+        }
 
         printDebugImProg("./test-output/im " + stage++ + "_afterremoveGarbage1.im");
         timeTaker.endPhase();
@@ -561,7 +563,7 @@ public JassProg transformProgToJass() {
         // translate flattened intermediate lang to jass:
 
         beginPhase(14, "translate to jass");
-        getImTranslator().calculateCallRelationsAndUsedVariables();
+        getImTranslator().calculateCallRelationsAndReadVariables();
         ImToJassTranslator translator =
             new ImToJassTranslator(getImProg(), getImTranslator().getCalledFunctions(), getImTranslator().getMainFunc(), getImTranslator().getConfFunc());
         prog = translator.translate();
@@ -952,12 +954,14 @@ public LuaCompilationUnit transformProgToLua() {
 
         printDebugImProg("./test-output/lua/im " + stage++ + "_afterlocalopts.im");
 
-        optimizer.removeGarbage();
+        boolean garbageChanged = optimizer.removeGarbage();
         imProg.flatten(imTranslator);
 
         // Re-run to avoid #883
-        optimizer.removeGarbage();
-        imProg.flatten(imTranslator);
+        if (garbageChanged) {
+            optimizer.removeGarbage();
+            imProg.flatten(imTranslator);
+        }
 
         printDebugImProg("./test-output/lua/im " + stage++ + "_afterremoveGarbage1.im");
 

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/JassInterpreter.java

@@ -60,7 +60,7 @@ public static ILconst getDefaultValue(String type) {
 
     public ILconst executeFunction(String name, ILconst... arguments) {
         if (trace) {
-            WLogger.trace(name + "( " + Utils.join(arguments, ", ") + ")");
+            WLogger.trace(() -> name + "( " + Utils.join(arguments, ", ") + ")");
         }
 
         ExecutableJassFunction func = searchFunction(name);
@@ -99,13 +99,13 @@ ILconst executeJassFunction(JassFunction func, ILconst... arguments) {
             this.executeStatements(localVarMap, body);
         } catch (ReturnException e) {
             if (trace) {
-                WLogger.trace("end function " + func.getName() + " returns " + e.getVal());
+                WLogger.trace(() -> "end function " + func.getName() + " returns " + e.getVal());
             }
             return e.getVal();
         }
 
         if (trace) {
-            WLogger.trace("end function " + func.getName());
+            WLogger.trace(() -> "end function " + func.getName());
         }
         return null;
     }

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/providers/ForceProvider.java

@@ -44,7 +44,6 @@ public void DestroyForce(IlConstHandle force) {
     public void ForForce(IlConstHandle force, ILconstFuncRef funcRef) {
         // TODO take force param into account
         // For now this simply executes the supplied function.
-        WLogger.trace("for force call");
         interpreter.runFuncRef(funcRef, null);
     }
 }

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/providers/GroupProvider.java

@@ -52,11 +52,9 @@ public ILconst FirstOfGroup(IlConstHandle group) {
     }
 
     public void ForGroup(IlConstHandle group, ILconstFuncRef funcRef) {
-        WLogger.trace("for group call");
         LinkedHashSet<IlConstHandle> groupList = (LinkedHashSet<IlConstHandle>) group.getObj();
         groupList.forEach((IlConstHandle u) -> {
             enumUnitStack.push(u);
-            WLogger.trace("for group call itr: " + funcRef.getFuncName());
             interpreter.runFuncRef(funcRef, null);
             enumUnitStack.pop();
         });

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/ConfigProvider.java

@@ -143,7 +143,7 @@ private void refreshCacheAsync() {
                 }
             })
             .exceptionally(e -> {
-                WLogger.trace("Background config refresh failed (this is normal if client is busy): " + e.getMessage());
+                WLogger.trace(() -> "Background config refresh failed (this is normal if client is busy): " + e.getMessage());
                 return null;
             });
     }

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/ModelManagerImpl.java

@@ -371,7 +371,6 @@ private WurstCompilerJassImpl getCompiler(WurstGui gui) {
     }
 
     private void updateModel(CompilationUnit cu, WurstGui gui) {
-        WLogger.trace("update model with " + cu.getCuInfo().getFile());
         parseErrors.put(wFile(cu), new ArrayList<>(gui.getErrorsAndWarnings()));
 
         WurstModel model2 = model;
@@ -534,7 +533,7 @@ private CompilationUnit replaceCompilationUnit(WFile filename, String contents,
                 CompilationUnit existing = getCompilationUnit(filename);
                 if (existing != null) {
                     // no change
-                    WLogger.trace("CU " + filename + " was unchanged.");
+                    WLogger.trace(() -> "CU " + filename + " was unchanged.");
                     return existing;
                 }
                 // Stale hash cache after remove/move; CU is gone, so reparse.
@@ -544,7 +543,7 @@ private CompilationUnit replaceCompilationUnit(WFile filename, String contents,
             }
         }
 
-        WLogger.trace("replace CU " + filename);
+        WLogger.trace(() -> "replace CU " + filename);
         WurstGui gui = new WurstGuiLogger();
         WurstCompilerJassImpl c = getCompiler(gui);
         CompilationUnit cu = c.parse(filename.toString(), new StringReader(contents));

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/WLogger.java

@@ -14,6 +14,7 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.util.Iterator;
+import java.util.function.Supplier;
 
 
 public abstract class WLogger {
@@ -28,6 +29,16 @@ public static void trace(String msg) {
         instance.trace(msg);
     }
 
+    public static void trace(String format, Object... args) {
+        instance.trace(format, args);
+    }
+
+    public static void trace(Supplier<String> msgSupplier) {
+        if (instance.isTraceEnabled()) {
+            instance.trace(msgSupplier.get());
+        }
+    }
+
     public static void info(String msg) {
         instance.info(msg);
     }
@@ -36,6 +47,24 @@ public static void debug(String s) {
         instance.debug(s);
     }
 
+    public static void debug(String format, Object... args) {
+        instance.debug(format, args);
+    }
+
+    public static void debug(Supplier<String> msgSupplier) {
+        if (instance.isDebugEnabled()) {
+            instance.debug(msgSupplier.get());
+        }
+    }
+
+    public static boolean isTraceEnabled() {
+        return instance.isTraceEnabled();
+    }
+
+    public static boolean isDebugEnabled() {
+        return instance.isDebugEnabled();
+    }
+
     public static void setLevel(Level level) {
         instance.setLevel(level);
     }

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/WLoggerDefault.java

@@ -22,11 +22,21 @@ public void trace(String msg) {
         logger.trace(msg);
     }
 
+    @Override
+    public void trace(String format, Object... args) {
+        logger.trace(format, args);
+    }
+
     @Override
     public void debug(String s) {
         logger.debug(s);
     }
 
+    @Override
+    public void debug(String format, Object... args) {
+        logger.debug(format, args);
+    }
+
     /**
      * (non-Javadoc)
      *
@@ -109,4 +119,14 @@ public void setLevel(Level level) {
         }
     }
 
+    @Override
+    public boolean isTraceEnabled() {
+        return logger.isTraceEnabled();
+    }
+
+    @Override
+    public boolean isDebugEnabled() {
+        return logger.isDebugEnabled();
+    }
+
 }