Reconfigure Kotlin variable references for more versatility in the many ways they're used

Author: sschr15

plugins/kotlin/src/main/java/org/vineflower/kotlin/expr/KVarExprent.java

@@ -12,7 +12,14 @@
 import java.util.BitSet;
 
 public class KVarExprent extends VarExprent implements KExprent {
-  private boolean isExceptionType;
+  public enum DeclarationType {
+    DEFINITION,
+    USAGE,
+    FOR_LOOP_VARIABLE,
+    EXCEPTION_TYPE,
+  }
+
+  private DeclarationType declarationType;
 
   public KVarExprent(int index, VarType varType, VarProcessor processor, BitSet bytecode) {
     super(index, varType, processor, bytecode);
@@ -27,6 +34,11 @@ public KVarExprent(VarExprent ex) {
 //    this.setLVT(ex.getLVT());
     this.setEffectivelyFinal(ex.isEffectivelyFinal());
     this.setDefinition(ex.isDefinition());
+    if (ex instanceof KVarExprent kVarExprent) {
+      declarationType = kVarExprent.declarationType;
+    } else {
+      declarationType = ex.isDefinition() ? DeclarationType.DEFINITION : DeclarationType.USAGE;
+    }
   }
 
   @Override
@@ -46,8 +58,7 @@ public TextBuffer toJava(int indent) {
 
     buffer.addBytecodeMapping(bytecode);
 
-    boolean definition = isDefinition();
-    if (definition && !isExceptionType) {
+    if (declarationType == DeclarationType.DEFINITION) {
       VarProcessor processor = getProcessor();
 
       boolean isFinal = isEffectivelyFinal() ||
@@ -58,16 +69,16 @@ public TextBuffer toJava(int indent) {
 
     buffer.append(getName());
 
-    if (definition || isExceptionType) {
+    if (declarationType == DeclarationType.DEFINITION || declarationType == DeclarationType.EXCEPTION_TYPE) {
       buffer.append(": ");
       buffer.append(KTypes.getKotlinType(getDefinitionVarType()));
     }
 
     return buffer;
   }
 
-  public void setExceptionType(boolean isExceptionType) {
-    this.isExceptionType = isExceptionType;
+  public void setDeclarationType(DeclarationType declarationType) {
+    this.declarationType = declarationType;
   }
 
   @Override

plugins/kotlin/src/main/java/org/vineflower/kotlin/pass/ReplaceExprentsPass.java

@@ -34,7 +34,7 @@ private static boolean replace(Statement stat) {
       for (int i = 0; i < vars.size(); i++) {
         VarExprent expr = vars.get(i);
         KVarExprent map = new KVarExprent(expr);
-        map.setExceptionType(true);
+        map.setDeclarationType(KVarExprent.DeclarationType.EXCEPTION_TYPE);
         vars.set(i, map);
       }
 
@@ -60,7 +60,7 @@ private static boolean replace(Statement stat) {
       for (int i = 0; i < vars.size(); i++) {
         VarExprent expr = vars.get(i);
         KVarExprent map = new KVarExprent(expr);
-        map.setExceptionType(true);
+        map.setDeclarationType(KVarExprent.DeclarationType.EXCEPTION_TYPE);
         vars.set(i, map);
       }
     }

plugins/kotlin/src/main/java/org/vineflower/kotlin/pass/ReplaceStatsPass.java

@@ -3,10 +3,7 @@
 import org.jetbrains.java.decompiler.api.plugin.pass.Pass;
 import org.jetbrains.java.decompiler.api.plugin.pass.PassContext;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.*;
-import org.vineflower.kotlin.stat.KDoStatement;
-import org.vineflower.kotlin.stat.KIfStatement;
-import org.vineflower.kotlin.stat.KSequenceStatement;
-import org.vineflower.kotlin.stat.KSwitchStatement;
+import org.vineflower.kotlin.stat.*;
 
 public class ReplaceStatsPass implements Pass {
   @Override

plugins/kotlin/src/main/java/org/vineflower/kotlin/stat/KDoStatement.java

@@ -100,7 +100,7 @@ public TextBuffer toJava(int indent) {
       }
       case FOR_EACH -> {
         KVarExprent init = new KVarExprent((VarExprent) getInitExprent());
-        init.setExceptionType(true);
+        init.setDeclarationType(KVarExprent.DeclarationType.FOR_LOOP_VARIABLE);
 
         Exprent inc = KUtils.replaceExprent(getIncExprent());
         if (inc == null) {
@@ -131,7 +131,7 @@ public TextBuffer toJava(int indent) {
         ) {
           // Turn for loop into range
           varExpr = new KVarExprent(varExpr);
-          ((KVarExprent) varExpr).setExceptionType(true);
+          ((KVarExprent) varExpr).setDeclarationType(KVarExprent.DeclarationType.FOR_LOOP_VARIABLE);
 
           Exprent conditionExpr;
           if (condition.getLstOperands().get(1) instanceof ConstExprent c) {

plugins/kotlin/testData/results/pkg/TestForRange.dec

@@ -4,13 +4,13 @@ import kotlin.internal.ProgressionUtilKt
 
 public class TestForRange {
    public fun testInt() {
-      for (i: Int in 1..10) {// 5
+      for (i in 1..10) {// 5
          System.out.println(i);// 6
       }
    }// 8
 
    public fun testChar() {
-      for (c: Char in 'a'..'z') {// 11
+      for (c in 'a'..'z') {// 11
          System.out.println(c);// 12
       }
    }// 14
@@ -50,7 +50,7 @@ public class TestForRange {
    }// 26
 
    public fun testIntDownTo() {
-      for (i: Int in 10 downTo 1) {// 29
+      for (i in 10 downTo 1) {// 29
          System.out.println(i);// 30
       }
    }// 32
@@ -91,7 +91,7 @@ public class TestForRange {
    }// 44
 
    public fun testUntil() {
-      for (i: Int in 1..9) {// 47
+      for (i in 1..9) {// 47
          System.out.println(i);// 48
       }
    }// 50

plugins/kotlin/testData/results/pkg/TestFunVarargs.dec

@@ -4,13 +4,13 @@ import java.util.Arrays
 
 public class TestFunVarargs {
    public fun printAll(vararg messages: String) {
-      for (m: java.lang.String in messages) {// 5
+      for (m in messages) {// 5
          System.out.println(m);
       }
    }// 6
 
    public fun printAllArray(messages: Array<out String>) {
-      for (m: java.lang.String in messages) {// 9
+      for (m in messages) {// 9
          System.out.println(m);
       }
    }// 10

plugins/kotlin/testData/results/pkg/TestLabeledJumps.dec

@@ -2,8 +2,8 @@ package pkg
 
 public class TestLabeledJumps {
    public fun testContinue(tester: (Int) -> Boolean) {
-      label36@ for (i: Int in 1..100) {// 5
-         for (j: Int in 1..100) {// 6
+      label36@ for (i in 1..100) {// 5
+         for (j in 1..100) {// 6
             if (tester.invoke(j) as java.lang.Boolean) {// 7
                continue@label36
             }
@@ -16,8 +16,8 @@ public class TestLabeledJumps {
    }// 16
 
    public fun testBreak(tester: (Int) -> Boolean) {
-      label33@ for (i: Int in 1..100) {// 19
-         for (j: Int in 1..100) {// 20
+      label33@ for (i in 1..100) {// 19
+         for (j in 1..100) {// 20
             if (tester.invoke(j) as java.lang.Boolean) {// 21
                break@label33
             }

plugins/kotlin/testData/results/pkg/TestNonInlineLambda.dec

@@ -30,7 +30,7 @@ public open class TestNonInlineLambda {
    }// 26
 
    public fun testCaptureObjectIterationValue(x: Iterable<String>) {
-      for (i: java.lang.String in x) {// 29
+      for (i in x) {// 29
          this.execute(TestNonInlineLambda::testCaptureObjectIterationValue$lambda$3);// 30
       }
    }// 34